From nobody Mon Feb 9 09:22:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1590680462; cv=none; d=zohomail.com; s=zohoarc; b=AeATImiUbtm0yoiiOqwuFwlYOXh+Lid9xsLoWgNh9Ts/MQMlN4wNAvC1NzwK4iPCBIb7dwRgChr+Nbiweg8ndi20tsd47JuP6RjV1cU2b/AdWBeNZlHwPI3LIf1Xf6PWBQoPcI11tainTgjzIF8QWJ9OQulqT/b+tfDNg4tscd4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590680462; 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=w1UUFRB/zGBi6YaDsUq4tRMmidAVx7J2pDG7x84C96U=; b=V18ZHRfonhJqyeFrN0v9uJQhMuw3SgnbsVv08zu/YZ3mfKiINfO0UZlyaNbjAxthOPqnzY5/QfkQDKjZAGcpYySoAmq8+LIAvoOMIEiU+IuA/+GWw5fl+Yeiz8/4oNABI44VgXEQmrJXuVIFUeXehZpUKvrVYfdsbS4NVqAw6JI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590680462106621.994577310231; Thu, 28 May 2020 08:41:02 -0700 (PDT) Received: from localhost ([::1]:36672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jeKeS-0001rJ-KL for importer@patchew.org; Thu, 28 May 2020 11:41:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeKbb-0003Xv-4Q for qemu-devel@nongnu.org; Thu, 28 May 2020 11:38:03 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:44724 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jeKbX-0003po-Jl for qemu-devel@nongnu.org; Thu, 28 May 2020 11:38:02 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-185-WQTAphhkPDKV3Y6YL7kwcA-1; Thu, 28 May 2020 11:37:56 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F2CB31937FF9; Thu, 28 May 2020 15:37:49 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-114-117.ams2.redhat.com [10.36.114.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB22B10013C0; Thu, 28 May 2020 15:37:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590680278; 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=w1UUFRB/zGBi6YaDsUq4tRMmidAVx7J2pDG7x84C96U=; b=g/p0EWQ/pKEqhyIZGqWb3MDDxjB9rCcL//7M1QQ4sFh7cAbC7HMIP0xRyEPib1jqL4IKT6 orGt/3BRjwGwN/qe3nM5Z3MUve41r6O2M6Jigi8PZnoIWu400TNYJ4kDAAWoTSBBg3W8kC 43GWyO1QUntv/n7yCkH6tYaDcB87mG0= X-MC-Unique: WQTAphhkPDKV3Y6YL7kwcA-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH v6 02/12] monitor: Use getter/setter functions for cur_mon Date: Thu, 28 May 2020 17:37:32 +0200 Message-Id: <20200528153742.274164-3-kwolf@redhat.com> In-Reply-To: <20200528153742.274164-1-kwolf@redhat.com> References: <20200528153742.274164-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=kwolf@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/28 03:11:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, marcandre.lureau@gmail.com, armbru@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" cur_mon really needs to be coroutine-local as soon as we move monitor command handlers to coroutines and let them yield. As a first step, just remove all direct accesses to cur_mon so that we can implement this in the getter function later. Signed-off-by: Kevin Wolf --- include/monitor/monitor.h | 3 ++- audio/wavcapture.c | 8 ++++---- dump/dump.c | 2 +- hw/scsi/vhost-scsi.c | 2 +- hw/virtio/vhost-vsock.c | 2 +- migration/fd.c | 4 ++-- monitor/hmp.c | 10 +++++----- monitor/misc.c | 14 +++++++++----- monitor/monitor.c | 15 ++++++++++++++- monitor/qmp-cmds-control.c | 2 ++ monitor/qmp-cmds.c | 2 +- monitor/qmp.c | 6 +++--- net/socket.c | 2 +- net/tap.c | 6 +++--- stubs/monitor-core.c | 5 ++++- tests/test-util-sockets.c | 22 +++++++++++----------- trace/control.c | 2 +- util/qemu-error.c | 4 ++-- util/qemu-print.c | 3 ++- util/qemu-sockets.c | 1 + 20 files changed, 70 insertions(+), 45 deletions(-) diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 0dcaefd4f9..43cc746078 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -5,7 +5,6 @@ #include "qapi/qapi-types-misc.h" #include "qemu/readline.h" =20 -extern __thread Monitor *cur_mon; typedef struct MonitorHMP MonitorHMP; typedef struct MonitorOptions MonitorOptions; =20 @@ -13,6 +12,8 @@ typedef struct MonitorOptions MonitorOptions; =20 extern QemuOptsList qemu_mon_opts; =20 +Monitor *monitor_cur(void); +void monitor_set_cur(Monitor *mon); bool monitor_cur_is_qmp(void); =20 void monitor_init_globals(void); diff --git a/audio/wavcapture.c b/audio/wavcapture.c index 8d7ce2eda1..e7dc97d16e 100644 --- a/audio/wavcapture.c +++ b/audio/wavcapture.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "monitor/monitor.h" +#include "qemu/qemu-print.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "audio.h" @@ -94,9 +94,9 @@ static void wav_capture_info (void *opaque) WAVState *wav =3D opaque; char *path =3D wav->path; =20 - monitor_printf (cur_mon, "Capturing audio(%d,%d,%d) to %s: %d bytes\n", - wav->freq, wav->bits, wav->nchannels, - path ? path : "", wav->bytes); + qemu_printf("Capturing audio(%d,%d,%d) to %s: %d bytes\n", + wav->freq, wav->bits, wav->nchannels, + path ? path : "", wav->bytes); } =20 static struct capture_ops wav_capture_ops =3D { diff --git a/dump/dump.c b/dump/dump.c index 248ea06370..36d26159a0 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -1989,7 +1989,7 @@ void qmp_dump_guest_memory(bool paging, const char *f= ile, =20 #if !defined(WIN32) if (strstart(file, "fd:", &p)) { - fd =3D monitor_get_fd(cur_mon, p, errp); + fd =3D monitor_get_fd(monitor_cur(), p, errp); if (fd =3D=3D -1) { return; } diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index c1b012aea4..3920825bd6 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -177,7 +177,7 @@ static void vhost_scsi_realize(DeviceState *dev, Error = **errp) } =20 if (vs->conf.vhostfd) { - vhostfd =3D monitor_fd_param(cur_mon, vs->conf.vhostfd, errp); + vhostfd =3D monitor_fd_param(monitor_cur(), vs->conf.vhostfd, errp= ); if (vhostfd =3D=3D -1) { error_prepend(errp, "vhost-scsi: unable to parse vhostfd: "); return; diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c index 4a228f5168..e72c9005b4 100644 --- a/hw/virtio/vhost-vsock.c +++ b/hw/virtio/vhost-vsock.c @@ -317,7 +317,7 @@ static void vhost_vsock_device_realize(DeviceState *dev= , Error **errp) } =20 if (vsock->conf.vhostfd) { - vhostfd =3D monitor_fd_param(cur_mon, vsock->conf.vhostfd, errp); + vhostfd =3D monitor_fd_param(monitor_cur(), vsock->conf.vhostfd, e= rrp); if (vhostfd =3D=3D -1) { error_prepend(errp, "vhost-vsock: unable to parse vhostfd: "); return; diff --git a/migration/fd.c b/migration/fd.c index 0a29ecdebf..6f2f50475f 100644 --- a/migration/fd.c +++ b/migration/fd.c @@ -26,7 +26,7 @@ void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Er= ror **errp) { QIOChannel *ioc; - int fd =3D monitor_get_fd(cur_mon, fdname, errp); + int fd =3D monitor_get_fd(monitor_cur(), fdname, errp); if (fd =3D=3D -1) { return; } @@ -55,7 +55,7 @@ static gboolean fd_accept_incoming_migration(QIOChannel *= ioc, void fd_start_incoming_migration(const char *fdname, Error **errp) { QIOChannel *ioc; - int fd =3D monitor_fd_param(cur_mon, fdname, errp); + int fd =3D monitor_fd_param(monitor_cur(), fdname, errp); if (fd =3D=3D -1) { return; } diff --git a/monitor/hmp.c b/monitor/hmp.c index d598dd02bb..f609fcf75b 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1301,11 +1301,11 @@ cleanup: static void monitor_read(void *opaque, const uint8_t *buf, int size) { MonitorHMP *mon; - Monitor *old_mon =3D cur_mon; + Monitor *old_mon =3D monitor_cur(); int i; =20 - cur_mon =3D opaque; - mon =3D container_of(cur_mon, MonitorHMP, common); + monitor_set_cur(opaque); + mon =3D container_of(monitor_cur(), MonitorHMP, common); =20 if (mon->rs) { for (i =3D 0; i < size; i++) { @@ -1313,13 +1313,13 @@ static void monitor_read(void *opaque, const uint8_= t *buf, int size) } } else { if (size =3D=3D 0 || buf[size - 1] !=3D 0) { - monitor_printf(cur_mon, "corrupted command\n"); + monitor_printf(&mon->common, "corrupted command\n"); } else { handle_hmp_command(mon, (char *)buf); } } =20 - cur_mon =3D old_mon; + monitor_set_cur(old_mon); } =20 static void monitor_event(void *opaque, QEMUChrEvent event) diff --git a/monitor/misc.c b/monitor/misc.c index bdf49e49e5..6cf7f60872 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -126,13 +126,13 @@ char *qmp_human_monitor_command(const char *command_l= ine, bool has_cpu_index, =20 monitor_data_init(&hmp.common, false, true, false); =20 - old_mon =3D cur_mon; - cur_mon =3D &hmp.common; + old_mon =3D monitor_cur(); + monitor_set_cur(&hmp.common); =20 if (has_cpu_index) { int ret =3D monitor_set_cpu(&hmp.common, cpu_index); if (ret < 0) { - cur_mon =3D old_mon; + monitor_set_cur(old_mon); error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index", "a CPU number"); goto out; @@ -140,7 +140,7 @@ char *qmp_human_monitor_command(const char *command_lin= e, bool has_cpu_index, } =20 handle_hmp_command(&hmp, command_line); - cur_mon =3D old_mon; + monitor_set_cur(old_mon); =20 qemu_mutex_lock(&hmp.common.mon_lock); if (qstring_get_length(hmp.common.outbuf) > 0) { @@ -258,6 +258,7 @@ static void monitor_init_qmp_commands(void) /* Set the current CPU defined by the user. Callers must hold BQL. */ int monitor_set_cpu(Monitor *mon, int cpu_index) { + Monitor *cur_mon =3D monitor_cur(); CPUState *cpu; =20 cpu =3D qemu_get_cpu(cpu_index); @@ -272,6 +273,7 @@ int monitor_set_cpu(Monitor *mon, int cpu_index) /* Callers must hold BQL. */ static CPUState *mon_get_cpu_sync(bool synchronize) { + Monitor *cur_mon =3D monitor_cur(); CPUState *cpu =3D NULL; =20 if (cur_mon->mon_cpu_path) { @@ -1232,6 +1234,7 @@ static void hmp_acl_remove(Monitor *mon, const QDict = *qdict) =20 void qmp_getfd(const char *fdname, Error **errp) { + Monitor *cur_mon =3D monitor_cur(); mon_fd_t *monfd; int fd, tmp_fd; =20 @@ -1272,6 +1275,7 @@ void qmp_getfd(const char *fdname, Error **errp) =20 void qmp_closefd(const char *fdname, Error **errp) { + Monitor *cur_mon =3D monitor_cur(); mon_fd_t *monfd; int tmp_fd; =20 @@ -1361,7 +1365,7 @@ AddfdInfo *qmp_add_fd(bool has_fdset_id, int64_t fdse= t_id, bool has_opaque, const char *opaque, Error **errp) { int fd; - Monitor *mon =3D cur_mon; + Monitor *mon =3D monitor_cur(); AddfdInfo *fdinfo; =20 fd =3D qemu_chr_fe_get_msgfd(&mon->chr); diff --git a/monitor/monitor.c b/monitor/monitor.c index 125494410a..182ba136b4 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -66,13 +66,24 @@ MonitorList mon_list; int mon_refcount; static bool monitor_destroyed; =20 -__thread Monitor *cur_mon; +static __thread Monitor *cur_monitor; + +Monitor *monitor_cur(void) +{ + return cur_monitor; +} + +void monitor_set_cur(Monitor *mon) +{ + cur_monitor =3D mon; +} =20 /** * Is the current monitor, if any, a QMP monitor? */ bool monitor_cur_is_qmp(void) { + Monitor *cur_mon =3D monitor_cur(); return cur_mon && monitor_is_qmp(cur_mon); } =20 @@ -209,6 +220,7 @@ int monitor_printf(Monitor *mon, const char *fmt, ...) */ int error_vprintf(const char *fmt, va_list ap) { + Monitor *cur_mon =3D monitor_cur(); if (cur_mon && !monitor_cur_is_qmp()) { return monitor_vprintf(cur_mon, fmt, ap); } @@ -217,6 +229,7 @@ int error_vprintf(const char *fmt, va_list ap) =20 int error_vprintf_unless_qmp(const char *fmt, va_list ap) { + Monitor *cur_mon =3D monitor_cur(); if (!cur_mon) { return vfprintf(stderr, fmt, ap); } diff --git a/monitor/qmp-cmds-control.c b/monitor/qmp-cmds-control.c index 8f04cfa6e6..a456762f6a 100644 --- a/monitor/qmp-cmds-control.c +++ b/monitor/qmp-cmds-control.c @@ -69,6 +69,7 @@ static bool qmp_caps_accept(MonitorQMP *mon, QMPCapabilit= yList *list, void qmp_qmp_capabilities(bool has_enable, QMPCapabilityList *enable, Error **errp) { + Monitor *cur_mon =3D monitor_cur(); MonitorQMP *mon; =20 assert(monitor_is_qmp(cur_mon)); @@ -119,6 +120,7 @@ static void query_commands_cb(const QmpCommand *cmd, vo= id *opaque) CommandInfoList *qmp_query_commands(Error **errp) { CommandInfoList *list =3D NULL; + Monitor *cur_mon =3D monitor_cur(); MonitorQMP *mon; =20 assert(monitor_is_qmp(cur_mon)); diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 864cbfa32e..c7bf6bb4dc 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -327,7 +327,7 @@ void qmp_add_client(const char *protocol, const char *f= dname, Chardev *s; int fd; =20 - fd =3D monitor_get_fd(cur_mon, fdname, errp); + fd =3D monitor_get_fd(monitor_cur(), fdname, errp); if (fd < 0) { return; } diff --git a/monitor/qmp.c b/monitor/qmp.c index d433ceae5b..5e9abd4711 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -139,12 +139,12 @@ static void monitor_qmp_dispatch(MonitorQMP *mon, QOb= ject *req) QDict *rsp; QDict *error; =20 - old_mon =3D cur_mon; - cur_mon =3D &mon->common; + old_mon =3D monitor_cur(); + monitor_set_cur(&mon->common); =20 rsp =3D qmp_dispatch(mon->commands, req, qmp_oob_enabled(mon)); =20 - cur_mon =3D old_mon; + monitor_set_cur(old_mon); =20 if (mon->commands =3D=3D &qmp_cap_negotiation_commands) { error =3D qdict_get_qdict(rsp, "error"); diff --git a/net/socket.c b/net/socket.c index c92354049b..93bee968a8 100644 --- a/net/socket.c +++ b/net/socket.c @@ -727,7 +727,7 @@ int net_init_socket(const Netdev *netdev, const char *n= ame, if (sock->has_fd) { int fd; =20 - fd =3D monitor_fd_param(cur_mon, sock->fd, errp); + fd =3D monitor_fd_param(monitor_cur(), sock->fd, errp); if (fd =3D=3D -1) { return -1; } diff --git a/net/tap.c b/net/tap.c index 6207f61f84..fd7d15936d 100644 --- a/net/tap.c +++ b/net/tap.c @@ -689,7 +689,7 @@ static void net_init_tap_one(const NetdevTapOptions *ta= p, NetClientState *peer, } =20 if (vhostfdname) { - vhostfd =3D monitor_fd_param(cur_mon, vhostfdname, &err); + vhostfd =3D monitor_fd_param(monitor_cur(), vhostfdname, &err); if (vhostfd =3D=3D -1) { if (tap->has_vhostforce && tap->vhostforce) { error_propagate(errp, err); @@ -789,7 +789,7 @@ int net_init_tap(const Netdev *netdev, const char *name, return -1; } =20 - fd =3D monitor_fd_param(cur_mon, tap->fd, &err); + fd =3D monitor_fd_param(monitor_cur(), tap->fd, &err); if (fd =3D=3D -1) { error_propagate(errp, err); return -1; @@ -836,7 +836,7 @@ int net_init_tap(const Netdev *netdev, const char *name, } =20 for (i =3D 0; i < nfds; i++) { - fd =3D monitor_fd_param(cur_mon, fds[i], &err); + fd =3D monitor_fd_param(monitor_cur(), fds[i], &err); if (fd =3D=3D -1) { error_propagate(errp, err); ret =3D -1; diff --git a/stubs/monitor-core.c b/stubs/monitor-core.c index 6cff1c4e1d..0cd2d864b2 100644 --- a/stubs/monitor-core.c +++ b/stubs/monitor-core.c @@ -3,7 +3,10 @@ #include "qemu-common.h" #include "qapi/qapi-emit-events.h" =20 -__thread Monitor *cur_mon; +Monitor *monitor_cur(void) +{ + return NULL; +} =20 void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp) { diff --git a/tests/test-util-sockets.c b/tests/test-util-sockets.c index 2ca1e99f17..36fabb5e46 100644 --- a/tests/test-util-sockets.c +++ b/tests/test-util-sockets.c @@ -53,27 +53,27 @@ static void test_fd_is_socket_good(void) static int mon_fd =3D -1; static const char *mon_fdname; =20 -int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp) -{ - g_assert(cur_mon); - g_assert(mon =3D=3D cur_mon); - if (mon_fd =3D=3D -1 || !g_str_equal(mon_fdname, fdname)) { - error_setg(errp, "No fd named %s", fdname); - return -1; - } - return dup(mon_fd); -} - /* Syms in libqemustub.a are discarded at .o file granularity. * To replace monitor_get_fd() we must ensure everything in * stubs/monitor.c is defined, to make sure monitor.o is discarded * otherwise we get duplicate syms at link time. */ __thread Monitor *cur_mon; +Monitor *monitor_cur(void) { return cur_mon; } int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap) { abort(); } void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp) {} void monitor_init_hmp(Chardev *chr, bool use_readline, Error **errp) {} =20 +int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp) +{ + g_assert(cur_mon); + g_assert(mon =3D=3D cur_mon); + if (mon_fd =3D=3D -1 || !g_str_equal(mon_fdname, fdname)) { + error_setg(errp, "No fd named %s", fdname); + return -1; + } + return dup(mon_fd); +} =20 static void test_socket_fd_pass_name_good(void) { diff --git a/trace/control.c b/trace/control.c index 2ffe000818..62993daf64 100644 --- a/trace/control.c +++ b/trace/control.c @@ -176,7 +176,7 @@ void trace_enable_events(const char *line_buf) { if (is_help_option(line_buf)) { trace_list_events(); - if (cur_mon =3D=3D NULL) { + if (monitor_cur() =3D=3D NULL) { exit(0); } } else { diff --git a/util/qemu-error.c b/util/qemu-error.c index dac7c7dc50..8d4ed723f5 100644 --- a/util/qemu-error.c +++ b/util/qemu-error.c @@ -169,7 +169,7 @@ static void print_loc(void) int i; const char *const *argp; =20 - if (!cur_mon && progname) { + if (!monitor_cur() && progname) { fprintf(stderr, "%s:", progname); sep =3D " "; } @@ -206,7 +206,7 @@ static void vreport(report_type type, const char *fmt, = va_list ap) GTimeVal tv; gchar *timestr; =20 - if (error_with_timestamp && !cur_mon) { + if (error_with_timestamp && !monitor_cur()) { g_get_current_time(&tv); timestr =3D g_time_val_to_iso8601(&tv); error_printf("%s ", timestr); diff --git a/util/qemu-print.c b/util/qemu-print.c index e79d6b8396..69ba612f56 100644 --- a/util/qemu-print.c +++ b/util/qemu-print.c @@ -20,6 +20,7 @@ */ int qemu_vprintf(const char *fmt, va_list ap) { + Monitor *cur_mon =3D monitor_cur(); if (cur_mon) { return monitor_vprintf(cur_mon, fmt, ap); } @@ -48,7 +49,7 @@ int qemu_printf(const char *fmt, ...) int qemu_vfprintf(FILE *stream, const char *fmt, va_list ap) { if (!stream) { - return monitor_vprintf(cur_mon, fmt, ap); + return monitor_vprintf(monitor_cur(), fmt, ap); } return vfprintf(stream, fmt, ap); } diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index b37d288866..40c18ba142 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -1092,6 +1092,7 @@ fail: =20 static int socket_get_fd(const char *fdstr, int num, Error **errp) { + Monitor *cur_mon =3D monitor_cur(); int fd; if (num !=3D 1) { error_setg_errno(errp, EINVAL, "socket_get_fd: too many connection= s"); --=20 2.25.4