openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: remove json argument from qemuMonitorOpen 

Always assume JSON monitor was requested, since all the callers
pass true anyway.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Ján Tomko 2019-06-14 20:08:00 +02:00
parent 466764346d
commit 7bf679aec6
4 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/qemu/qemu_monitor.c
View File

@ -809,7 +809,6 @@ static qemuMonitorPtr
qemuMonitorOpenInternal(virDomainObjPtr vm, qemuMonitorOpenInternal(virDomainObjPtr vm,
int fd, int fd,
bool hasSendFD, bool hasSendFD,
bool json,
qemuMonitorCallbacksPtr cb, qemuMonitorCallbacksPtr cb,
void *opaque) void *opaque)
{ {
@ -840,8 +839,7 @@ qemuMonitorOpenInternal(virDomainObjPtr vm,
mon->fd = fd; mon->fd = fd;
mon->hasSendFD = hasSendFD; mon->hasSendFD = hasSendFD;
mon->vm = virObjectRef(vm); mon->vm = virObjectRef(vm);
mon->json = json; mon->json = true;
if (json)
mon->waitGreeting = true; mon->waitGreeting = true;
mon->cb = cb; mon->cb = cb;
mon->callbackOpaque = opaque; mon->callbackOpaque = opaque;
@ -893,7 +891,6 @@ qemuMonitorOpenInternal(virDomainObjPtr vm,
* qemuMonitorOpen: * qemuMonitorOpen:
* @vm: domain object * @vm: domain object
* @config: monitor configuration * @config: monitor configuration
* @json: enable JSON on the monitor
* @timeout: number of seconds to add to default timeout * @timeout: number of seconds to add to default timeout
* @cb: monitor event handles * @cb: monitor event handles
* @opaque: opaque data for @cb * @opaque: opaque data for @cb
@ -909,7 +906,6 @@ qemuMonitorOpenInternal(virDomainObjPtr vm,
qemuMonitorPtr qemuMonitorPtr
qemuMonitorOpen(virDomainObjPtr vm, qemuMonitorOpen(virDomainObjPtr vm,
virDomainChrSourceDefPtr config, virDomainChrSourceDefPtr config,
bool json,
bool retry, bool retry,
unsigned long long timeout, unsigned long long timeout,
qemuMonitorCallbacksPtr cb, qemuMonitorCallbacksPtr cb,
@ -941,7 +937,7 @@ qemuMonitorOpen(virDomainObjPtr vm,
return NULL; return NULL;
} }
ret = qemuMonitorOpenInternal(vm, fd, hasSendFD, json, cb, opaque); ret = qemuMonitorOpenInternal(vm, fd, hasSendFD, cb, opaque);
if (!ret) if (!ret)
VIR_FORCE_CLOSE(fd); VIR_FORCE_CLOSE(fd);
return ret; return ret;
@ -951,11 +947,10 @@ qemuMonitorOpen(virDomainObjPtr vm,
qemuMonitorPtr qemuMonitorPtr
qemuMonitorOpenFD(virDomainObjPtr vm, qemuMonitorOpenFD(virDomainObjPtr vm,
int sockfd, int sockfd,
bool json,
qemuMonitorCallbacksPtr cb, qemuMonitorCallbacksPtr cb,
void *opaque) void *opaque)
{ {
return qemuMonitorOpenInternal(vm, sockfd, true, json, cb, opaque); return qemuMonitorOpenInternal(vm, sockfd, true, cb, opaque);
} }

2
src/qemu/qemu_monitor.h
View File

@ -339,7 +339,6 @@ char *qemuMonitorUnescapeArg(const char *in);
qemuMonitorPtr qemuMonitorOpen(virDomainObjPtr vm, qemuMonitorPtr qemuMonitorOpen(virDomainObjPtr vm,
virDomainChrSourceDefPtr config, virDomainChrSourceDefPtr config,
bool json,
bool retry, bool retry,
unsigned long long timeout, unsigned long long timeout,
qemuMonitorCallbacksPtr cb, qemuMonitorCallbacksPtr cb,
@ -347,7 +346,6 @@ qemuMonitorPtr qemuMonitorOpen(virDomainObjPtr vm,
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(6); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(6);
qemuMonitorPtr qemuMonitorOpenFD(virDomainObjPtr vm, qemuMonitorPtr qemuMonitorOpenFD(virDomainObjPtr vm,
int sockfd, int sockfd,
bool json,
qemuMonitorCallbacksPtr cb, qemuMonitorCallbacksPtr cb,
void *opaque) void *opaque)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4);

3
src/qemu/qemu_process.c
View File

@ -1895,7 +1895,6 @@ qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob,
mon = qemuMonitorOpen(vm, mon = qemuMonitorOpen(vm,
monConfig, monConfig,
true,
retry, retry,
timeout, timeout,
&monitorCallbacks, &monitorCallbacks,
@ -8467,7 +8466,7 @@ qemuProcessQMPConnectMonitor(qemuProcessQMPPtr proc)
proc->vm->pid = proc->pid; proc->vm->pid = proc->pid;
if (!(proc->mon = qemuMonitorOpen(proc->vm, &monConfig, true, true, if (!(proc->mon = qemuMonitorOpen(proc->vm, &monConfig, true,
0, &callbacks, NULL))) 0, &callbacks, NULL)))
goto cleanup; goto cleanup;

1
tests/qemumonitortestutils.c
View File

@ -1192,7 +1192,6 @@ qemuMonitorTestNew(virDomainXMLOptionPtr xmlopt,
if (!(test->mon = qemuMonitorOpen(test->vm, if (!(test->mon = qemuMonitorOpen(test->vm,
&src, &src,
true, true,
true,
0, 0,
&qemuMonitorTestCallbacks, &qemuMonitorTestCallbacks,
driver))) driver)))