shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-12 04:58:32 +03:00
Code Releases Activity

qemuBuildCommandLine: Remove 'driver' argument

Browse Source 
We pass 'vm' which already contains it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa 2022-05-16 13:32:59 +02:00
parent d810ae2fae
commit 9b765882cd
6 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_command.c
View File

@ -10421,8 +10421,7 @@ qemuBuildCompatDeprecatedCommandLine(virCommand *cmd,
* for a given virtual machine. * for a given virtual machine.
*/ */
virCommand * virCommand *
qemuBuildCommandLine(virQEMUDriver *driver, qemuBuildCommandLine(virDomainObj *vm,
virDomainObj *vm,
const char *migrateURI, const char *migrateURI,
virDomainMomentObj *snapshot, virDomainMomentObj *snapshot,
virNetDevVPortProfileOp vmop, virNetDevVPortProfileOp vmop,
@ -10434,8 +10433,9 @@ qemuBuildCommandLine(virQEMUDriver *driver,
size_t i; size_t i;
char uuid[VIR_UUID_STRING_BUFLEN]; char uuid[VIR_UUID_STRING_BUFLEN];
g_autoptr(virCommand) cmd = NULL; g_autoptr(virCommand) cmd = NULL;
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
qemuDomainObjPrivate *priv = vm->privateData; qemuDomainObjPrivate *priv = vm->privateData;
virQEMUDriver *driver = priv->driver;
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
virDomainDef *def = vm->def; virDomainDef *def = vm->def;
virQEMUCaps *qemuCaps = priv->qemuCaps; virQEMUCaps *qemuCaps = priv->qemuCaps;

17
src/qemu/qemu_command.h
View File

@ -47,15 +47,14 @@ typedef enum {
QEMU_BUILD_COMMAND_LINE_CPUS_RUNNING = 1 << 0, QEMU_BUILD_COMMAND_LINE_CPUS_RUNNING = 1 << 0,
} qemuBuildCommandLineFlags; } qemuBuildCommandLineFlags;
virCommand *qemuBuildCommandLine(virQEMUDriver *driver, virCommand *qemuBuildCommandLine(virDomainObj *vm,
virDomainObj *vm, const char *migrateURI,
const char *migrateURI, virDomainMomentObj *snapshot,
virDomainMomentObj *snapshot, virNetDevVPortProfileOp vmop,
virNetDevVPortProfileOp vmop, bool enableFips,
bool enableFips, size_t *nnicindexes,
size_t *nnicindexes, int **nicindexes,
int **nicindexes, unsigned int flags);
unsigned int flags);
/* Generate the object properties for pr-manager */ /* Generate the object properties for pr-manager */
virJSONValue *qemuBuildPRManagerInfoProps(virStorageSource *src); virJSONValue *qemuBuildPRManagerInfoProps(virStorageSource *src);

2
src/qemu/qemu_driver.c
View File

@ -6391,7 +6391,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
if (qemuConnectDomainXMLToNativePrepareHost(vm) < 0) if (qemuConnectDomainXMLToNativePrepareHost(vm) < 0)
return NULL; return NULL;
if (!(cmd = qemuProcessCreatePretendCmdBuild(driver, vm, NULL, if (!(cmd = qemuProcessCreatePretendCmdBuild(vm, NULL,
qemuCheckFips(vm), qemuCheckFips(vm),
commandlineflags))) commandlineflags)))
return NULL; return NULL;

9
src/qemu/qemu_process.c
View File

@ -7445,8 +7445,7 @@ qemuProcessLaunch(virConnectPtr conn,
if (qemuExtDevicesStart(driver, vm, incoming != NULL) < 0) if (qemuExtDevicesStart(driver, vm, incoming != NULL) < 0)
goto cleanup; goto cleanup;
if (!(cmd = qemuBuildCommandLine(driver, if (!(cmd = qemuBuildCommandLine(vm,
vm,
incoming ? "defer" : NULL, incoming ? "defer" : NULL,
snapshot, vmop, snapshot, vmop,
qemuCheckFips(vm), qemuCheckFips(vm),
@ -7946,14 +7945,12 @@ qemuProcessCreatePretendCmdPrepare(virQEMUDriver *driver,
virCommand * virCommand *
qemuProcessCreatePretendCmdBuild(virQEMUDriver *driver, qemuProcessCreatePretendCmdBuild(virDomainObj *vm,
virDomainObj *vm,
const char *migrateURI, const char *migrateURI,
bool enableFips, bool enableFips,
unsigned int flags) unsigned int flags)
{ {
return qemuBuildCommandLine(driver, return qemuBuildCommandLine(vm,
vm,
migrateURI, migrateURI,
NULL, NULL,
VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP,

3
src/qemu/qemu_process.h
View File

@ -97,8 +97,7 @@ int qemuProcessCreatePretendCmdPrepare(virQEMUDriver *driver,
const char *migrateURI, const char *migrateURI,
unsigned int flags); unsigned int flags);
virCommand *qemuProcessCreatePretendCmdBuild(virQEMUDriver *driver, virCommand *qemuProcessCreatePretendCmdBuild(virDomainObj *vm,
virDomainObj *vm,
const char *migrateURI, const char *migrateURI,
bool enableFips, bool enableFips,
unsigned int flags); unsigned int flags);

2
tests/qemuxml2argvtest.c
View File

@ -490,7 +490,7 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv,
if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_ENABLE_FIPS)) if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_ENABLE_FIPS))
enableFips = false; enableFips = false;
return qemuProcessCreatePretendCmdBuild(drv, vm, migrateURI, return qemuProcessCreatePretendCmdBuild(vm, migrateURI,
enableFips, 0); enableFips, 0);
} }