External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuBuildCommandLine: Convert 'standalone' flag to use 'flags'

Browse Source 
Introduce 'qemuBuildCommandLineFlags' and use it instead of specific
flag booleans.

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:15:22 +02:00
parent 0b64b75a09
commit 552790edf2
6 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qemu/qemu_command.c
View File

@ -10436,7 +10436,6 @@ qemuBuildCommandLine(virQEMUDriver *driver,
const char *migrateURI,
virDomainMomentObj *snapshot,
virNetDevVPortProfileOp vmop,
bool standalone,
bool enableFips,
size_t *nnicindexes,
int **nicindexes,
@ -10484,7 +10483,7 @@ qemuBuildCommandLine(virQEMUDriver *driver,
qemuBuildCompatDeprecatedCommandLine(cmd, cfg, def, qemuCaps);
if (!standalone)
if (!(flags & QEMU_BUILD_COMMAND_LINE_CPUS_RUNNING))
virCommandAddArg(cmd, "-S"); /* freeze CPU */
if (qemuBuildMasterKeyCommandLine(cmd, priv) < 0)

5
src/qemu/qemu_command.h
View File

@ -43,12 +43,15 @@
VIR_ENUM_DECL(qemuVideo);
VIR_ENUM_DECL(qemuSoundCodec);
typedef enum {
QEMU_BUILD_COMMAND_LINE_CPUS_RUNNING = 1 << 0,
} qemuBuildCommandLineFlags;
virCommand *qemuBuildCommandLine(virQEMUDriver *driver,
virDomainObj *vm,
const char *migrateURI,
virDomainMomentObj *snapshot,
virNetDevVPortProfileOp vmop,
bool standalone,
bool enableFips,
size_t *nnicindexes,
int **nicindexes,

4
src/qemu/qemu_driver.c
View File

@ -6330,6 +6330,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
virQEMUDriver *driver = conn->privateData;
virDomainObj *vm = NULL;
g_autoptr(virCommand) cmd = NULL;
unsigned int commandlineflags = QEMU_BUILD_COMMAND_LINE_CPUS_RUNNING;
char *ret = NULL;
size_t i;
@ -6383,7 +6384,8 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
goto cleanup;
if (!(cmd = qemuProcessCreatePretendCmdBuild(driver, vm, NULL,
qemuCheckFips(vm), true)))
qemuCheckFips(vm),
commandlineflags)))
goto cleanup;
ret = virCommandToString(cmd, false);

6
src/qemu/qemu_process.c
View File

@ -7450,7 +7450,6 @@ qemuProcessLaunch(virConnectPtr conn,
vm,
incoming ? "defer" : NULL,
snapshot, vmop,
false,
qemuCheckFips(vm),
&nnicindexes, &nicindexes, 0)))
goto cleanup;
@ -7952,7 +7951,7 @@ qemuProcessCreatePretendCmdBuild(virQEMUDriver *driver,
virDomainObj *vm,
const char *migrateURI,
bool enableFips,
bool standalone)
unsigned int flags)
{
VIR_DEBUG("Building emulator command line");
return qemuBuildCommandLine(driver,
@ -7960,11 +7959,10 @@ qemuProcessCreatePretendCmdBuild(virQEMUDriver *driver,
migrateURI,
NULL,
VIR_NETDEV_VPORT_PROFILE_OP_NO_OP,
standalone,
enableFips,
NULL,
NULL,
0);
flags);
}

8
src/qemu/qemu_process.h
View File

@ -98,10 +98,10 @@ int qemuProcessCreatePretendCmdPrepare(virQEMUDriver *driver,
unsigned int flags);
virCommand *qemuProcessCreatePretendCmdBuild(virQEMUDriver *driver,
virDomainObj *vm,
const char *migrateURI,
bool enableFips,
bool standalone);
virDomainObj *vm,
const char *migrateURI,
bool enableFips,
unsigned int flags);
int qemuProcessInit(virQEMUDriver *driver,
virDomainObj *vm,

2
tests/qemuxml2argvtest.c
View File

@ -488,7 +488,7 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv,
enableFips = false;
return qemuProcessCreatePretendCmdBuild(drv, vm, migrateURI,
enableFips, false);
enableFips, 0);
}