From nobody Tue May 13 15:44:20 2025 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675414131; cv=none; d=zohomail.com; s=zohoarc; b=mz8w/FGKB+GTyrBWefrTtFbmie92bj3AM1dB8qJz8SC5fk7uhP38Zfem40EDS1hEB+gAJUnV6GHvXG4fKXKUeiP9dcrqT99OzJrS3HrQ1pPcjAXpA+OA2YMUhcHWkptafCinEpAssrLfH9v+e2UZhvlFf3euGMhlXjrUesMwo2o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675414131; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FadRhxC91jEW/S0LBkfnGru0iCYqByxf70DJPc+INTI=; b=Kp8CXWW+Q0Id7i28WTfEU9UJSD6M4SG5gH6bBr2+++/nr4l4i8ZJsDxRKm9T6/j2Xf++Ji+mNGeNOVRBwoM2SU9/WEHUv86QlM0Opd+RnCeqpOjF1Jyq0ou/Q/dvWCLTlct7qRITQ2N/ZWQLjgVj1GXWQ5Q5VHI9+e9UJKXyviU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675414131925484.3762559231051; Fri, 3 Feb 2023 00:48:51 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNriD-0008WO-17; Fri, 03 Feb 2023 03:46:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNrht-0008Mw-4m for qemu-devel@nongnu.org; Fri, 03 Feb 2023 03:46:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNrhm-0007VK-6q for qemu-devel@nongnu.org; Fri, 03 Feb 2023 03:46:04 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-638-bQjOSVOpMG-EoB9gTRaDIw-1; Fri, 03 Feb 2023 03:45:54 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1D3B638149B8; Fri, 3 Feb 2023 08:45:54 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EDF9C112132E; Fri, 3 Feb 2023 08:45:53 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0B56021E6887; Fri, 3 Feb 2023 09:45:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675413957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FadRhxC91jEW/S0LBkfnGru0iCYqByxf70DJPc+INTI=; b=NdEST/CKJNPkCsTbDNqHJ9uMuk6LFFq8JIJlIdZynVZvN37hBJQBG2XrjDC0W93Wa0UHjQ SpGHWgBm2ALvobEcZuScaJopf4lGjiZJ4iQcy/digI362s/4be4CFv9VhOOMaRzfaK0N/j nKKvrgtRxMXPxAp1zUgAA1ilQCRq+Sw= X-MC-Unique: bQjOSVOpMG-EoB9gTRaDIw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Subject: [PULL 34/35] monitor: Loosen coupling between misc.c and monitor.c slightly Date: Fri, 3 Feb 2023 09:45:48 +0100 Message-Id: <20230203084549.2622302-35-armbru@redhat.com> In-Reply-To: <20230203084549.2622302-1-armbru@redhat.com> References: <20230203084549.2622302-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675414132651100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Message-Id: <20230124121946.1139465-32-armbru@redhat.com> --- monitor/misc.c | 8 +------- monitor/monitor.c | 2 +- storage-daemon/qemu-storage-daemon.c | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/monitor/misc.c b/monitor/misc.c index 9ddf32da97..99317a8ff4 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -135,7 +135,7 @@ compare_mon_cmd(const void *a, const void *b) ((const HMPCommand *)b)->name); } =20 -static void sortcmdlist(void) +static void __attribute__((__constructor__)) sortcmdlist(void) { qsort(hmp_cmds, ARRAY_SIZE(hmp_cmds) - 1, sizeof(*hmp_cmds), @@ -176,9 +176,3 @@ void monitor_register_hmp_info_hrt(const char *name, } g_assert_not_reached(); } - -void monitor_init_globals(void) -{ - monitor_init_globals_core(); - sortcmdlist(); -} diff --git a/monitor/monitor.c b/monitor/monitor.c index 0a990633d8..ca233ab80f 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -719,7 +719,7 @@ static void monitor_qapi_event_init(void) qapi_event_throttle_equal); } =20 -void monitor_init_globals_core(void) +void monitor_init_globals(void) { monitor_qapi_event_init(); qemu_mutex_init(&monitor_lock); diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-sto= rage-daemon.c index da19498c66..0e9354faa6 100644 --- a/storage-daemon/qemu-storage-daemon.c +++ b/storage-daemon/qemu-storage-daemon.c @@ -299,7 +299,7 @@ static void process_options(int argc, char *argv[], boo= l pre_init_pass) case OPTION_DAEMONIZE: if (os_set_daemonize(true) < 0) { /* - * --daemonize is parsed before monitor_init_globals_core(= ), so + * --daemonize is parsed before monitor_init_globals(), so * error_report() does not work yet */ fprintf(stderr, "--daemonize not supported in this build\n= "); @@ -411,7 +411,7 @@ int main(int argc, char *argv[]) qemu_add_opts(&qemu_trace_opts); qcrypto_init(&error_fatal); bdrv_init(); - monitor_init_globals_core(); + monitor_init_globals(); init_qmp_commands(); =20 if (!trace_init_backends()) { --=20 2.39.0