shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 21:34:54 +03:00
Code Releases Activity

qemu: process: Remove unused qemuCaps

Browse Source 
After 426dc5eb2 qemuCaps and virDomainDefPtr are unused here,
remove it from the call stack

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2017-07-10 17:30:03 -04:00
parent c19d98d7c4
commit ccb7c7b253
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/qemu/qemu_process.c
View File

@ -1877,9 +1877,7 @@ qemuProcessMonitorReportLogError(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
static int static int
qemuProcessLookupPTYs(virDomainDefPtr def ATTRIBUTE_UNUSED, qemuProcessLookupPTYs(virDomainChrDefPtr *devices,
virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED,
virDomainChrDefPtr *devices,
int count, int count,
virHashTablePtr info) virHashTablePtr info)
{ {
@ -1927,24 +1925,18 @@ qemuProcessLookupPTYs(virDomainDefPtr def ATTRIBUTE_UNUSED,
static int static int
qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr vm, qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr vm,
virQEMUCapsPtr qemuCaps,
virHashTablePtr info) virHashTablePtr info)
{ {
size_t i = 0; size_t i = 0;
if (qemuProcessLookupPTYs(vm->def, qemuCaps, if (qemuProcessLookupPTYs(vm->def->serials, vm->def->nserials, info) < 0)
vm->def->serials, vm->def->nserials, return -1;
if (qemuProcessLookupPTYs(vm->def->parallels, vm->def->nparallels,
info) < 0) info) < 0)
return -1; return -1;
if (qemuProcessLookupPTYs(vm->def, qemuCaps, if (qemuProcessLookupPTYs(vm->def->channels, vm->def->nchannels, info) < 0)
vm->def->parallels, vm->def->nparallels,
info) < 0)
return -1;
if (qemuProcessLookupPTYs(vm->def, qemuCaps,
vm->def->channels, vm->def->nchannels,
info) < 0)
return -1; return -1;
/* For historical reasons, console[0] can be just an alias /* For historical reasons, console[0] can be just an alias
* for serial[0]. That's why we need to update it as well. */ * for serial[0]. That's why we need to update it as well. */
@ -1962,8 +1954,7 @@ qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr vm,
} }
} }
if (qemuProcessLookupPTYs(vm->def, qemuCaps, if (qemuProcessLookupPTYs(vm->def->consoles + i, vm->def->nconsoles - i,
vm->def->consoles + i, vm->def->nconsoles - i,
info) < 0) info) < 0)
return -1; return -1;
@ -2111,7 +2102,6 @@ static int
qemuProcessWaitForMonitor(virQEMUDriverPtr driver, qemuProcessWaitForMonitor(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
int asyncJob, int asyncJob,
virQEMUCapsPtr qemuCaps,
qemuDomainLogContextPtr logCtxt) qemuDomainLogContextPtr logCtxt)
{ {
int ret = -1; int ret = -1;
@ -2135,8 +2125,7 @@ qemuProcessWaitForMonitor(virQEMUDriverPtr driver,
ret = -1; ret = -1;
if (ret == 0) { if (ret == 0) {
if ((ret = qemuProcessFindCharDevicePTYsMonitor(vm, qemuCaps, if ((ret = qemuProcessFindCharDevicePTYsMonitor(vm, info)) < 0)
info)) < 0)
goto cleanup; goto cleanup;
if ((ret = qemuProcessRefreshChannelVirtioState(driver, vm, info, if ((ret = qemuProcessRefreshChannelVirtioState(driver, vm, info,
@ -5870,7 +5859,7 @@ qemuProcessLaunch(virConnectPtr conn,
goto cleanup; goto cleanup;
VIR_DEBUG("Waiting for monitor to show up"); VIR_DEBUG("Waiting for monitor to show up");
if (qemuProcessWaitForMonitor(driver, vm, asyncJob, priv->qemuCaps, logCtxt) < 0) if (qemuProcessWaitForMonitor(driver, vm, asyncJob, logCtxt) < 0)
goto cleanup; goto cleanup;
if (qemuConnectAgent(driver, vm) < 0) if (qemuConnectAgent(driver, vm) < 0)
@ -6724,7 +6713,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED,
qemuDomainObjTaint(driver, vm, VIR_DOMAIN_TAINT_EXTERNAL_LAUNCH, logCtxt); qemuDomainObjTaint(driver, vm, VIR_DOMAIN_TAINT_EXTERNAL_LAUNCH, logCtxt);
VIR_DEBUG("Waiting for monitor to show up"); VIR_DEBUG("Waiting for monitor to show up");
if (qemuProcessWaitForMonitor(driver, vm, QEMU_ASYNC_JOB_NONE, priv->qemuCaps, NULL) < 0) if (qemuProcessWaitForMonitor(driver, vm, QEMU_ASYNC_JOB_NONE, NULL) < 0)
goto error; goto error;
if (qemuConnectAgent(driver, vm) < 0) if (qemuConnectAgent(driver, vm) < 0)