monitor: Use getter/setter functions for cur_mon
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 <kwolf@redhat.com> Message-Id: <20201005155855.256490-4-kwolf@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
parent
87e6f4a4d6
commit
947e47448d
|
@ -1,5 +1,5 @@
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "monitor/monitor.h"
|
#include "qemu/qemu-print.h"
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "qemu/error-report.h"
|
#include "qemu/error-report.h"
|
||||||
#include "audio.h"
|
#include "audio.h"
|
||||||
|
@ -94,9 +94,9 @@ static void wav_capture_info (void *opaque)
|
||||||
WAVState *wav = opaque;
|
WAVState *wav = opaque;
|
||||||
char *path = wav->path;
|
char *path = wav->path;
|
||||||
|
|
||||||
monitor_printf (cur_mon, "Capturing audio(%d,%d,%d) to %s: %d bytes\n",
|
qemu_printf("Capturing audio(%d,%d,%d) to %s: %d bytes\n",
|
||||||
wav->freq, wav->bits, wav->nchannels,
|
wav->freq, wav->bits, wav->nchannels,
|
||||||
path ? path : "<not available>", wav->bytes);
|
path ? path : "<not available>", wav->bytes);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct capture_ops wav_capture_ops = {
|
static struct capture_ops wav_capture_ops = {
|
||||||
|
|
|
@ -1986,7 +1986,7 @@ void qmp_dump_guest_memory(bool paging, const char *file,
|
||||||
|
|
||||||
#if !defined(WIN32)
|
#if !defined(WIN32)
|
||||||
if (strstart(file, "fd:", &p)) {
|
if (strstart(file, "fd:", &p)) {
|
||||||
fd = monitor_get_fd(cur_mon, p, errp);
|
fd = monitor_get_fd(monitor_cur(), p, errp);
|
||||||
if (fd == -1) {
|
if (fd == -1) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -177,7 +177,7 @@ static void vhost_scsi_realize(DeviceState *dev, Error **errp)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vs->conf.vhostfd) {
|
if (vs->conf.vhostfd) {
|
||||||
vhostfd = monitor_fd_param(cur_mon, vs->conf.vhostfd, errp);
|
vhostfd = monitor_fd_param(monitor_cur(), vs->conf.vhostfd, errp);
|
||||||
if (vhostfd == -1) {
|
if (vhostfd == -1) {
|
||||||
error_prepend(errp, "vhost-scsi: unable to parse vhostfd: ");
|
error_prepend(errp, "vhost-scsi: unable to parse vhostfd: ");
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -143,7 +143,7 @@ static void vhost_vsock_device_realize(DeviceState *dev, Error **errp)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vsock->conf.vhostfd) {
|
if (vsock->conf.vhostfd) {
|
||||||
vhostfd = monitor_fd_param(cur_mon, vsock->conf.vhostfd, errp);
|
vhostfd = monitor_fd_param(monitor_cur(), vsock->conf.vhostfd, errp);
|
||||||
if (vhostfd == -1) {
|
if (vhostfd == -1) {
|
||||||
error_prepend(errp, "vhost-vsock: unable to parse vhostfd: ");
|
error_prepend(errp, "vhost-vsock: unable to parse vhostfd: ");
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
#include "qapi/qapi-types-misc.h"
|
#include "qapi/qapi-types-misc.h"
|
||||||
#include "qemu/readline.h"
|
#include "qemu/readline.h"
|
||||||
|
|
||||||
extern __thread Monitor *cur_mon;
|
|
||||||
typedef struct MonitorHMP MonitorHMP;
|
typedef struct MonitorHMP MonitorHMP;
|
||||||
typedef struct MonitorOptions MonitorOptions;
|
typedef struct MonitorOptions MonitorOptions;
|
||||||
|
|
||||||
|
@ -13,6 +12,8 @@ typedef struct MonitorOptions MonitorOptions;
|
||||||
|
|
||||||
extern QemuOptsList qemu_mon_opts;
|
extern QemuOptsList qemu_mon_opts;
|
||||||
|
|
||||||
|
Monitor *monitor_cur(void);
|
||||||
|
Monitor *monitor_set_cur(Monitor *mon);
|
||||||
bool monitor_cur_is_qmp(void);
|
bool monitor_cur_is_qmp(void);
|
||||||
|
|
||||||
void monitor_init_globals(void);
|
void monitor_init_globals(void);
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp)
|
void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp)
|
||||||
{
|
{
|
||||||
QIOChannel *ioc;
|
QIOChannel *ioc;
|
||||||
int fd = monitor_get_fd(cur_mon, fdname, errp);
|
int fd = monitor_get_fd(monitor_cur(), fdname, errp);
|
||||||
if (fd == -1) {
|
if (fd == -1) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -55,7 +55,7 @@ static gboolean fd_accept_incoming_migration(QIOChannel *ioc,
|
||||||
void fd_start_incoming_migration(const char *fdname, Error **errp)
|
void fd_start_incoming_migration(const char *fdname, Error **errp)
|
||||||
{
|
{
|
||||||
QIOChannel *ioc;
|
QIOChannel *ioc;
|
||||||
int fd = monitor_fd_param(cur_mon, fdname, errp);
|
int fd = monitor_fd_param(monitor_cur(), fdname, errp);
|
||||||
if (fd == -1) {
|
if (fd == -1) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1300,12 +1300,11 @@ cleanup:
|
||||||
|
|
||||||
static void monitor_read(void *opaque, const uint8_t *buf, int size)
|
static void monitor_read(void *opaque, const uint8_t *buf, int size)
|
||||||
{
|
{
|
||||||
MonitorHMP *mon;
|
MonitorHMP *mon = container_of(opaque, MonitorHMP, common);
|
||||||
Monitor *old_mon = cur_mon;
|
Monitor *old_mon;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
cur_mon = opaque;
|
old_mon = monitor_set_cur(&mon->common);
|
||||||
mon = container_of(cur_mon, MonitorHMP, common);
|
|
||||||
|
|
||||||
if (mon->rs) {
|
if (mon->rs) {
|
||||||
for (i = 0; i < size; i++) {
|
for (i = 0; i < size; i++) {
|
||||||
|
@ -1313,13 +1312,13 @@ static void monitor_read(void *opaque, const uint8_t *buf, int size)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (size == 0 || buf[size - 1] != 0) {
|
if (size == 0 || buf[size - 1] != 0) {
|
||||||
monitor_printf(cur_mon, "corrupted command\n");
|
monitor_printf(&mon->common, "corrupted command\n");
|
||||||
} else {
|
} else {
|
||||||
handle_hmp_command(mon, (char *)buf);
|
handle_hmp_command(mon, (char *)buf);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
cur_mon = old_mon;
|
monitor_set_cur(old_mon);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void monitor_event(void *opaque, QEMUChrEvent event)
|
static void monitor_event(void *opaque, QEMUChrEvent event)
|
||||||
|
|
|
@ -125,13 +125,12 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,
|
||||||
|
|
||||||
monitor_data_init(&hmp.common, false, true, false);
|
monitor_data_init(&hmp.common, false, true, false);
|
||||||
|
|
||||||
old_mon = cur_mon;
|
old_mon = monitor_set_cur(&hmp.common);
|
||||||
cur_mon = &hmp.common;
|
|
||||||
|
|
||||||
if (has_cpu_index) {
|
if (has_cpu_index) {
|
||||||
int ret = monitor_set_cpu(&hmp.common, cpu_index);
|
int ret = monitor_set_cpu(&hmp.common, cpu_index);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
cur_mon = old_mon;
|
monitor_set_cur(old_mon);
|
||||||
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index",
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index",
|
||||||
"a CPU number");
|
"a CPU number");
|
||||||
goto out;
|
goto out;
|
||||||
|
@ -139,7 +138,7 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,
|
||||||
}
|
}
|
||||||
|
|
||||||
handle_hmp_command(&hmp, command_line);
|
handle_hmp_command(&hmp, command_line);
|
||||||
cur_mon = old_mon;
|
monitor_set_cur(old_mon);
|
||||||
|
|
||||||
WITH_QEMU_LOCK_GUARD(&hmp.common.mon_lock) {
|
WITH_QEMU_LOCK_GUARD(&hmp.common.mon_lock) {
|
||||||
if (qstring_get_length(hmp.common.outbuf) > 0) {
|
if (qstring_get_length(hmp.common.outbuf) > 0) {
|
||||||
|
@ -297,7 +296,7 @@ static CPUState *mon_get_cpu_sync(Monitor *mon, bool synchronize)
|
||||||
|
|
||||||
CPUState *mon_get_cpu(void)
|
CPUState *mon_get_cpu(void)
|
||||||
{
|
{
|
||||||
return mon_get_cpu_sync(cur_mon, true);
|
return mon_get_cpu_sync(monitor_cur(), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
CPUArchState *mon_get_cpu_env(void)
|
CPUArchState *mon_get_cpu_env(void)
|
||||||
|
@ -1232,6 +1231,7 @@ static void hmp_acl_remove(Monitor *mon, const QDict *qdict)
|
||||||
|
|
||||||
void qmp_getfd(const char *fdname, Error **errp)
|
void qmp_getfd(const char *fdname, Error **errp)
|
||||||
{
|
{
|
||||||
|
Monitor *cur_mon = monitor_cur();
|
||||||
mon_fd_t *monfd;
|
mon_fd_t *monfd;
|
||||||
int fd, tmp_fd;
|
int fd, tmp_fd;
|
||||||
|
|
||||||
|
@ -1270,6 +1270,7 @@ void qmp_getfd(const char *fdname, Error **errp)
|
||||||
|
|
||||||
void qmp_closefd(const char *fdname, Error **errp)
|
void qmp_closefd(const char *fdname, Error **errp)
|
||||||
{
|
{
|
||||||
|
Monitor *cur_mon = monitor_cur();
|
||||||
mon_fd_t *monfd;
|
mon_fd_t *monfd;
|
||||||
int tmp_fd;
|
int tmp_fd;
|
||||||
|
|
||||||
|
@ -1356,7 +1357,7 @@ AddfdInfo *qmp_add_fd(bool has_fdset_id, int64_t fdset_id, bool has_opaque,
|
||||||
const char *opaque, Error **errp)
|
const char *opaque, Error **errp)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
Monitor *mon = cur_mon;
|
Monitor *mon = monitor_cur();
|
||||||
AddfdInfo *fdinfo;
|
AddfdInfo *fdinfo;
|
||||||
|
|
||||||
fd = qemu_chr_fe_get_msgfd(&mon->chr);
|
fd = qemu_chr_fe_get_msgfd(&mon->chr);
|
||||||
|
|
|
@ -66,13 +66,31 @@ MonitorList mon_list;
|
||||||
int mon_refcount;
|
int mon_refcount;
|
||||||
static bool monitor_destroyed;
|
static bool monitor_destroyed;
|
||||||
|
|
||||||
__thread Monitor *cur_mon;
|
static __thread Monitor *cur_monitor;
|
||||||
|
|
||||||
|
Monitor *monitor_cur(void)
|
||||||
|
{
|
||||||
|
return cur_monitor;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets a new current monitor and returns the old one.
|
||||||
|
*/
|
||||||
|
Monitor *monitor_set_cur(Monitor *mon)
|
||||||
|
{
|
||||||
|
Monitor *old_monitor = cur_monitor;
|
||||||
|
|
||||||
|
cur_monitor = mon;
|
||||||
|
return old_monitor;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Is the current monitor, if any, a QMP monitor?
|
* Is the current monitor, if any, a QMP monitor?
|
||||||
*/
|
*/
|
||||||
bool monitor_cur_is_qmp(void)
|
bool monitor_cur_is_qmp(void)
|
||||||
{
|
{
|
||||||
|
Monitor *cur_mon = monitor_cur();
|
||||||
|
|
||||||
return cur_mon && monitor_is_qmp(cur_mon);
|
return cur_mon && monitor_is_qmp(cur_mon);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -209,6 +227,8 @@ int monitor_printf(Monitor *mon, const char *fmt, ...)
|
||||||
*/
|
*/
|
||||||
int error_vprintf(const char *fmt, va_list ap)
|
int error_vprintf(const char *fmt, va_list ap)
|
||||||
{
|
{
|
||||||
|
Monitor *cur_mon = monitor_cur();
|
||||||
|
|
||||||
if (cur_mon && !monitor_cur_is_qmp()) {
|
if (cur_mon && !monitor_cur_is_qmp()) {
|
||||||
return monitor_vprintf(cur_mon, fmt, ap);
|
return monitor_vprintf(cur_mon, fmt, ap);
|
||||||
}
|
}
|
||||||
|
@ -217,6 +237,8 @@ int error_vprintf(const char *fmt, va_list ap)
|
||||||
|
|
||||||
int error_vprintf_unless_qmp(const char *fmt, va_list ap)
|
int error_vprintf_unless_qmp(const char *fmt, va_list ap)
|
||||||
{
|
{
|
||||||
|
Monitor *cur_mon = monitor_cur();
|
||||||
|
|
||||||
if (!cur_mon) {
|
if (!cur_mon) {
|
||||||
return vfprintf(stderr, fmt, ap);
|
return vfprintf(stderr, fmt, ap);
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,6 +69,7 @@ static bool qmp_caps_accept(MonitorQMP *mon, QMPCapabilityList *list,
|
||||||
void qmp_qmp_capabilities(bool has_enable, QMPCapabilityList *enable,
|
void qmp_qmp_capabilities(bool has_enable, QMPCapabilityList *enable,
|
||||||
Error **errp)
|
Error **errp)
|
||||||
{
|
{
|
||||||
|
Monitor *cur_mon = monitor_cur();
|
||||||
MonitorQMP *mon;
|
MonitorQMP *mon;
|
||||||
|
|
||||||
assert(monitor_is_qmp(cur_mon));
|
assert(monitor_is_qmp(cur_mon));
|
||||||
|
@ -119,6 +120,7 @@ static void query_commands_cb(const QmpCommand *cmd, void *opaque)
|
||||||
CommandInfoList *qmp_query_commands(Error **errp)
|
CommandInfoList *qmp_query_commands(Error **errp)
|
||||||
{
|
{
|
||||||
CommandInfoList *list = NULL;
|
CommandInfoList *list = NULL;
|
||||||
|
Monitor *cur_mon = monitor_cur();
|
||||||
MonitorQMP *mon;
|
MonitorQMP *mon;
|
||||||
|
|
||||||
assert(monitor_is_qmp(cur_mon));
|
assert(monitor_is_qmp(cur_mon));
|
||||||
|
|
|
@ -328,7 +328,7 @@ void qmp_add_client(const char *protocol, const char *fdname,
|
||||||
Chardev *s;
|
Chardev *s;
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
fd = monitor_get_fd(cur_mon, fdname, errp);
|
fd = monitor_get_fd(monitor_cur(), fdname, errp);
|
||||||
if (fd < 0) {
|
if (fd < 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -139,12 +139,9 @@ static void monitor_qmp_dispatch(MonitorQMP *mon, QObject *req)
|
||||||
QDict *rsp;
|
QDict *rsp;
|
||||||
QDict *error;
|
QDict *error;
|
||||||
|
|
||||||
old_mon = cur_mon;
|
old_mon = monitor_set_cur(&mon->common);
|
||||||
cur_mon = &mon->common;
|
|
||||||
|
|
||||||
rsp = qmp_dispatch(mon->commands, req, qmp_oob_enabled(mon));
|
rsp = qmp_dispatch(mon->commands, req, qmp_oob_enabled(mon));
|
||||||
|
monitor_set_cur(old_mon);
|
||||||
cur_mon = old_mon;
|
|
||||||
|
|
||||||
if (mon->commands == &qmp_cap_negotiation_commands) {
|
if (mon->commands == &qmp_cap_negotiation_commands) {
|
||||||
error = qdict_get_qdict(rsp, "error");
|
error = qdict_get_qdict(rsp, "error");
|
||||||
|
|
|
@ -727,7 +727,7 @@ int net_init_socket(const Netdev *netdev, const char *name,
|
||||||
if (sock->has_fd) {
|
if (sock->has_fd) {
|
||||||
int fd, ret;
|
int fd, ret;
|
||||||
|
|
||||||
fd = monitor_fd_param(cur_mon, sock->fd, errp);
|
fd = monitor_fd_param(monitor_cur(), sock->fd, errp);
|
||||||
if (fd == -1) {
|
if (fd == -1) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -700,7 +700,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
|
||||||
if (vhostfdname) {
|
if (vhostfdname) {
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
vhostfd = monitor_fd_param(cur_mon, vhostfdname, &err);
|
vhostfd = monitor_fd_param(monitor_cur(), vhostfdname, &err);
|
||||||
if (vhostfd == -1) {
|
if (vhostfd == -1) {
|
||||||
if (tap->has_vhostforce && tap->vhostforce) {
|
if (tap->has_vhostforce && tap->vhostforce) {
|
||||||
error_propagate(errp, err);
|
error_propagate(errp, err);
|
||||||
|
@ -808,7 +808,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
fd = monitor_fd_param(cur_mon, tap->fd, errp);
|
fd = monitor_fd_param(monitor_cur(), tap->fd, errp);
|
||||||
if (fd == -1) {
|
if (fd == -1) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
@ -862,7 +862,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < nfds; i++) {
|
for (i = 0; i < nfds; i++) {
|
||||||
fd = monitor_fd_param(cur_mon, fds[i], errp);
|
fd = monitor_fd_param(monitor_cur(), fds[i], errp);
|
||||||
if (fd == -1) {
|
if (fd == -1) {
|
||||||
ret = -1;
|
ret = -1;
|
||||||
goto free_fail;
|
goto free_fail;
|
||||||
|
|
|
@ -793,6 +793,6 @@ exit:
|
||||||
|
|
||||||
void qmp_inject_nmi(Error **errp)
|
void qmp_inject_nmi(Error **errp)
|
||||||
{
|
{
|
||||||
nmi_monitor_handle(monitor_get_cpu_index(cur_mon), errp);
|
nmi_monitor_handle(monitor_get_cpu_index(monitor_cur()), errp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,10 @@
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
#include "qapi/qapi-emit-events.h"
|
#include "qapi/qapi-emit-events.h"
|
||||||
|
|
||||||
__thread Monitor *cur_mon;
|
Monitor *monitor_cur(void)
|
||||||
|
{
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp)
|
void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp)
|
||||||
{
|
{
|
||||||
|
|
|
@ -52,6 +52,7 @@ static void test_fd_is_socket_good(void)
|
||||||
|
|
||||||
static int mon_fd = -1;
|
static int mon_fd = -1;
|
||||||
static const char *mon_fdname;
|
static const char *mon_fdname;
|
||||||
|
__thread Monitor *cur_mon;
|
||||||
|
|
||||||
int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp)
|
int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp)
|
||||||
{
|
{
|
||||||
|
@ -65,15 +66,14 @@ int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Syms of stubs in libqemuutil.a are discarded at .o file granularity.
|
* Syms of stubs in libqemuutil.a are discarded at .o file
|
||||||
* To replace monitor_get_fd() we must ensure everything in
|
* granularity. To replace monitor_get_fd() and monitor_cur(), we
|
||||||
* stubs/monitor.c is defined, to make sure monitor.o is discarded
|
* must ensure that we also replace any other symbol that is used in
|
||||||
|
* the binary and would be taken from the same stub object file,
|
||||||
* otherwise we get duplicate syms at link time.
|
* 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(); }
|
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) {}
|
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
static void test_socket_fd_pass_name_good(void)
|
static void test_socket_fd_pass_name_good(void)
|
||||||
|
|
|
@ -176,7 +176,7 @@ void trace_enable_events(const char *line_buf)
|
||||||
{
|
{
|
||||||
if (is_help_option(line_buf)) {
|
if (is_help_option(line_buf)) {
|
||||||
trace_list_events();
|
trace_list_events();
|
||||||
if (cur_mon == NULL) {
|
if (monitor_cur() == NULL) {
|
||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -171,7 +171,7 @@ static void print_loc(void)
|
||||||
int i;
|
int i;
|
||||||
const char *const *argp;
|
const char *const *argp;
|
||||||
|
|
||||||
if (!cur_mon && progname) {
|
if (!monitor_cur() && progname) {
|
||||||
fprintf(stderr, "%s:", progname);
|
fprintf(stderr, "%s:", progname);
|
||||||
sep = " ";
|
sep = " ";
|
||||||
}
|
}
|
||||||
|
@ -208,7 +208,7 @@ static void vreport(report_type type, const char *fmt, va_list ap)
|
||||||
GTimeVal tv;
|
GTimeVal tv;
|
||||||
gchar *timestr;
|
gchar *timestr;
|
||||||
|
|
||||||
if (error_with_timestamp && !cur_mon) {
|
if (error_with_timestamp && !monitor_cur()) {
|
||||||
g_get_current_time(&tv);
|
g_get_current_time(&tv);
|
||||||
timestr = g_time_val_to_iso8601(&tv);
|
timestr = g_time_val_to_iso8601(&tv);
|
||||||
error_printf("%s ", timestr);
|
error_printf("%s ", timestr);
|
||||||
|
@ -216,7 +216,7 @@ static void vreport(report_type type, const char *fmt, va_list ap)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Only prepend guest name if -msg guest-name and -name guest=... are set */
|
/* Only prepend guest name if -msg guest-name and -name guest=... are set */
|
||||||
if (error_with_guestname && error_guest_name && !cur_mon) {
|
if (error_with_guestname && error_guest_name && !monitor_cur()) {
|
||||||
error_printf("%s ", error_guest_name);
|
error_printf("%s ", error_guest_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
*/
|
*/
|
||||||
int qemu_vprintf(const char *fmt, va_list ap)
|
int qemu_vprintf(const char *fmt, va_list ap)
|
||||||
{
|
{
|
||||||
|
Monitor *cur_mon = monitor_cur();
|
||||||
if (cur_mon) {
|
if (cur_mon) {
|
||||||
return monitor_vprintf(cur_mon, fmt, ap);
|
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)
|
int qemu_vfprintf(FILE *stream, const char *fmt, va_list ap)
|
||||||
{
|
{
|
||||||
if (!stream) {
|
if (!stream) {
|
||||||
return monitor_vprintf(cur_mon, fmt, ap);
|
return monitor_vprintf(monitor_cur(), fmt, ap);
|
||||||
}
|
}
|
||||||
return vfprintf(stream, fmt, ap);
|
return vfprintf(stream, fmt, ap);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1092,6 +1092,7 @@ fail:
|
||||||
|
|
||||||
static int socket_get_fd(const char *fdstr, int num, Error **errp)
|
static int socket_get_fd(const char *fdstr, int num, Error **errp)
|
||||||
{
|
{
|
||||||
|
Monitor *cur_mon = monitor_cur();
|
||||||
int fd;
|
int fd;
|
||||||
if (num != 1) {
|
if (num != 1) {
|
||||||
error_setg_errno(errp, EINVAL, "socket_get_fd: too many connections");
|
error_setg_errno(errp, EINVAL, "socket_get_fd: too many connections");
|
||||||
|
|
Loading…
Reference in New Issue