10:12 a.m.
The flags are not used for anything.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 7 +++----
src/qemu/qemu_command.h | 3 +--
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_process.c | 8 +++-----
src/qemu/qemu_process.h | 3 +--
tests/qemuxml2argvtest.c | 2 +-
6 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 25b8dcb10a..38bf4ebea5 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -10392,8 +10392,7 @@ qemuBuildCommandLine(virDomainObj *vm,
virDomainMomentObj *snapshot,
virNetDevVPortProfileOp vmop,
size_t *nnicindexes,
- int **nicindexes,
- unsigned int flags)
+ int **nicindexes)
{
size_t i;
char uuid[VIR_UUID_STRING_BUFLEN];
@@ -10404,8 +10403,8 @@ qemuBuildCommandLine(virDomainObj *vm,
virDomainDef *def = vm->def;
virQEMUCaps *qemuCaps = priv->qemuCaps;
- VIR_DEBUG("Building qemu commandline for def=%s(%p) migrateURI=%s snapshot=%p
vmop=%d flags=0x%x",
- def->name, def, migrateURI, snapshot, vmop, flags);
+ VIR_DEBUG("Building qemu commandline for def=%s(%p) migrateURI=%s snapshot=%p
vmop=%d",
+ def->name, def, migrateURI, snapshot, vmop);
if (qemuBuildCommandLineValidate(driver, def) < 0)
return NULL;
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index 087ab52ee5..2bb4984656 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -48,8 +48,7 @@ virCommand *qemuBuildCommandLine(virDomainObj *vm,
virDomainMomentObj *snapshot,
virNetDevVPortProfileOp vmop,
size_t *nnicindexes,
- int **nicindexes,
- unsigned int flags);
+ int **nicindexes);
/* Generate the object properties for pr-manager */
virJSONValue *qemuBuildPRManagerInfoProps(virStorageSource *src);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 5f4990b09c..2533e22c38 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6390,7 +6390,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
if (qemuConnectDomainXMLToNativePrepareHost(vm) < 0)
return NULL;
- if (!(cmd = qemuProcessCreatePretendCmdBuild(vm, NULL, 0)))
+ if (!(cmd = qemuProcessCreatePretendCmdBuild(vm, NULL)))
return NULL;
return virCommandToString(cmd, false);
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index d50cf2e6be..cabec71c1e 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -7448,7 +7448,7 @@ qemuProcessLaunch(virConnectPtr conn,
if (!(cmd = qemuBuildCommandLine(vm,
incoming ? "defer" : NULL,
snapshot, vmop,
- &nnicindexes, &nicindexes, 0)))
+ &nnicindexes, &nicindexes)))
goto cleanup;
if (incoming && incoming->fd != -1)
@@ -7945,16 +7945,14 @@ qemuProcessCreatePretendCmdPrepare(virQEMUDriver *driver,
virCommand *
qemuProcessCreatePretendCmdBuild(virDomainObj *vm,
- const char *migrateURI,
- unsigned int flags)
+ const char *migrateURI)
{
return qemuBuildCommandLine(vm,
migrateURI,
NULL,
VIR_NETDEV_VPORT_PROFILE_OP_NO_OP,
NULL,
- NULL,
- flags);
+ NULL);
}
diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
index 2387fcdcdc..9866d2bf35 100644
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -98,8 +98,7 @@ int qemuProcessCreatePretendCmdPrepare(virQEMUDriver *driver,
unsigned int flags);
virCommand *qemuProcessCreatePretendCmdBuild(virDomainObj *vm,
- const char *migrateURI,
- unsigned int flags);
+ const char *migrateURI);
int qemuProcessInit(virQEMUDriver *driver,
virDomainObj *vm,
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 50aea47a68..afb8aa1aea 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -484,7 +484,7 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv,
}
}
- return qemuProcessCreatePretendCmdBuild(vm, migrateURI, 0);
+ return qemuProcessCreatePretendCmdBuild(vm, migrateURI);
}
--
2.35.3