External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 12:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: domain: remove monJSON field

Browse Source 
If we have a monitor, it is a JSON monitor.

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 21:14:42 +02:00
parent 011f4eb124
commit 466764346d
4 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qemu/qemu_domain.c
View File

@ -2903,9 +2903,6 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt,
priv->monConfig->type = VIR_DOMAIN_CHR_TYPE_PTY; priv->monConfig->type = VIR_DOMAIN_CHR_TYPE_PTY;
VIR_FREE(tmp); VIR_FREE(tmp);
priv->monJSON = virXPathBoolean("count(./monitor[@json = '1']) > 0",
ctxt) > 0;
switch (priv->monConfig->type) { switch (priv->monConfig->type) {
case VIR_DOMAIN_CHR_TYPE_PTY: case VIR_DOMAIN_CHR_TYPE_PTY:
priv->monConfig->data.file.path = monitorpath; priv->monConfig->data.file.path = monitorpath;

1
src/qemu/qemu_domain.h
View File

@ -280,7 +280,6 @@ struct _qemuDomainObjPrivate {
qemuMonitorPtr mon; qemuMonitorPtr mon;
virDomainChrSourceDefPtr monConfig; virDomainChrSourceDefPtr monConfig;
bool monJSON;
bool monError; bool monError;
unsigned long long monStart; unsigned long long monStart;

1
src/qemu/qemu_process.c
View File

@ -6195,7 +6195,6 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver,
if (qemuProcessPrepareMonitorChr(priv->monConfig, priv->libDir) < 0) if (qemuProcessPrepareMonitorChr(priv->monConfig, priv->libDir) < 0)
goto cleanup; goto cleanup;
priv->monJSON = true;
priv->monError = false; priv->monError = false;
priv->monStart = 0; priv->monStart = 0;
priv->runningReason = VIR_DOMAIN_RUNNING_UNKNOWN; priv->runningReason = VIR_DOMAIN_RUNNING_UNKNOWN;

2
tests/qemuhotplugtest.c
View File

@ -298,7 +298,6 @@ testQemuHotplug(const void *data)
priv = vm->privateData; priv = vm->privateData;
priv->mon = qemuMonitorTestGetMonitor(test_mon); priv->mon = qemuMonitorTestGetMonitor(test_mon);
priv->monJSON = true;
/* XXX We need to unlock the monitor here, as /* XXX We need to unlock the monitor here, as
* qemuDomainObjEnterMonitorInternal (called from qemuDomainChangeGraphics) * qemuDomainObjEnterMonitorInternal (called from qemuDomainChangeGraphics)
@ -441,7 +440,6 @@ testQemuHotplugCpuPrepare(const char *test,
goto error; goto error;
priv->mon = qemuMonitorTestGetMonitor(data->mon); priv->mon = qemuMonitorTestGetMonitor(data->mon);
priv->monJSON = true;
virObjectUnlock(priv->mon); virObjectUnlock(priv->mon);
if (qemuDomainRefreshVcpuInfo(&driver, data->vm, 0, false) < 0) if (qemuDomainRefreshVcpuInfo(&driver, data->vm, 0, false) < 0)