External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemuBuildChrChardevStr: Remove unused arguments and clean up callers

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-11-04 10:51:34 +01:00
parent bce1f16a8d
commit 0eabefb2b8
3 changed files with 55 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
src/qemu/qemu_command.c
View File

@ -5039,11 +5039,8 @@ qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev)
/* This function outputs a -chardev command line option which describes only the /* This function outputs a -chardev command line option which describes only the
* host side of the character device */ * host side of the character device */
static char * static char *
qemuBuildChrChardevStr(virLogManager *logManager G_GNUC_UNUSED, qemuBuildChrChardevStr(virCommand *cmd,
virSecurityManager *secManager G_GNUC_UNUSED,
virCommand *cmd,
virQEMUDriverConfig *cfg, virQEMUDriverConfig *cfg,
const virDomainDef *def G_GNUC_UNUSED,
const virDomainChrSourceDef *dev, const virDomainChrSourceDef *dev,
const char *alias, const char *alias,
virQEMUCaps *qemuCaps) virQEMUCaps *qemuCaps)
@ -5512,11 +5509,8 @@ qemuBuildHostdevCommandLine(virCommand *cmd,
static int static int
qemuBuildMonitorCommandLine(virLogManager *logManager, qemuBuildMonitorCommandLine(virCommand *cmd,
virSecurityManager *secManager,
virCommand *cmd,
virQEMUDriverConfig *cfg, virQEMUDriverConfig *cfg,
virDomainDef *def,
qemuDomainObjPrivate *priv) qemuDomainObjPrivate *priv)
{ {
g_autofree char *chrdev = NULL; g_autofree char *chrdev = NULL;
@ -5524,9 +5518,10 @@ qemuBuildMonitorCommandLine(virLogManager *logManager,
if (!priv->monConfig) if (!priv->monConfig)
return 0; return 0;
if (!(chrdev = qemuBuildChrChardevStr(logManager, secManager, if (!(chrdev = qemuBuildChrChardevStr(cmd,
cmd, cfg, def, cfg,
priv->monConfig, "monitor", priv->monConfig,
"monitor",
priv->qemuCaps))) priv->qemuCaps)))
return -1; return -1;
virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, "-chardev");
@ -5646,11 +5641,8 @@ qemuBuildSclpDevProps(virDomainChrDef *dev)
static int static int
qemuBuildRNGBackendChrdevStr(virLogManager *logManager, qemuBuildRNGBackendChrdevStr(virCommand *cmd,
virSecurityManager *secManager,
virCommand *cmd,
virQEMUDriverConfig *cfg, virQEMUDriverConfig *cfg,
const virDomainDef *def,
virDomainRNGDef *rng, virDomainRNGDef *rng,
virQEMUCaps *qemuCaps, virQEMUCaps *qemuCaps,
char **chr) char **chr)
@ -5665,8 +5657,8 @@ qemuBuildRNGBackendChrdevStr(virLogManager *logManager,
return 0; return 0;
case VIR_DOMAIN_RNG_BACKEND_EGD: case VIR_DOMAIN_RNG_BACKEND_EGD:
if (!(*chr = qemuBuildChrChardevStr(logManager, secManager, if (!(*chr = qemuBuildChrChardevStr(cmd,
cmd, cfg, def, cfg,
rng->source.chardev, rng->source.chardev,
rng->info.alias, rng->info.alias,
qemuCaps))) qemuCaps)))
@ -5757,9 +5749,7 @@ qemuBuildRNGDevProps(const virDomainDef *def,
static int static int
qemuBuildRNGCommandLine(virLogManager *logManager, qemuBuildRNGCommandLine(virCommand *cmd,
virSecurityManager *secManager,
virCommand *cmd,
virQEMUDriverConfig *cfg, virQEMUDriverConfig *cfg,
const virDomainDef *def, const virDomainDef *def,
virQEMUCaps *qemuCaps) virQEMUCaps *qemuCaps)
@ -5779,8 +5769,7 @@ qemuBuildRNGCommandLine(virLogManager *logManager,
} }
/* possibly add character device for backend */ /* possibly add character device for backend */
if (qemuBuildRNGBackendChrdevStr(logManager, secManager, cmd, cfg, def, if (qemuBuildRNGBackendChrdevStr(cmd, cfg, rng, qemuCaps, &chardev) < 0)
rng, qemuCaps, &chardev) < 0)
return -1; return -1;
if (chardev) if (chardev)
@ -8606,10 +8595,7 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfig *cfg,
static int static int
qemuInterfaceVhostuserConnect(virQEMUDriver *driver, qemuInterfaceVhostuserConnect(virQEMUDriver *driver,
virLogManager *logManager,
virSecurityManager *secManager,
virCommand *cmd, virCommand *cmd,
virDomainDef *def,
virDomainNetDef *net, virDomainNetDef *net,
virQEMUCaps *qemuCaps, virQEMUCaps *qemuCaps,
char **chardev) char **chardev)
@ -8618,10 +8604,11 @@ qemuInterfaceVhostuserConnect(virQEMUDriver *driver,
switch ((virDomainChrType)net->data.vhostuser->type) { switch ((virDomainChrType)net->data.vhostuser->type) {
case VIR_DOMAIN_CHR_TYPE_UNIX: case VIR_DOMAIN_CHR_TYPE_UNIX:
if (!(*chardev = qemuBuildChrChardevStr(logManager, secManager, if (!(*chardev = qemuBuildChrChardevStr(cmd,
cmd, cfg, def, cfg,
net->data.vhostuser, net->data.vhostuser,
net->info.alias, qemuCaps))) net->info.alias,
qemuCaps)))
return -1; return -1;
break; break;
@ -8650,8 +8637,6 @@ qemuInterfaceVhostuserConnect(virQEMUDriver *driver,
static int static int
qemuBuildInterfaceCommandLine(virQEMUDriver *driver, qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
virDomainObj *vm, virDomainObj *vm,
virLogManager *logManager,
virSecurityManager *secManager,
virCommand *cmd, virCommand *cmd,
virDomainNetDef *net, virDomainNetDef *net,
virQEMUCaps *qemuCaps, virQEMUCaps *qemuCaps,
@ -8742,8 +8727,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
requireNicdev = true; requireNicdev = true;
if (qemuInterfaceVhostuserConnect(driver, logManager, secManager, if (qemuInterfaceVhostuserConnect(driver, cmd, net, qemuCaps, &chardev) < 0)
cmd, def, net, qemuCaps, &chardev) < 0)
goto cleanup; goto cleanup;
if (virNetDevOpenvswitchGetVhostuserIfname(net->data.vhostuser->data.nix.path, if (virNetDevOpenvswitchGetVhostuserIfname(net->data.vhostuser->data.nix.path,
@ -8980,8 +8964,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
static int static int
qemuBuildNetCommandLine(virQEMUDriver *driver, qemuBuildNetCommandLine(virQEMUDriver *driver,
virDomainObj *vm, virDomainObj *vm,
virLogManager *logManager,
virSecurityManager *secManager,
virCommand *cmd, virCommand *cmd,
virQEMUCaps *qemuCaps, virQEMUCaps *qemuCaps,
virNetDevVPortProfileOp vmop, virNetDevVPortProfileOp vmop,
@ -8997,7 +8979,7 @@ qemuBuildNetCommandLine(virQEMUDriver *driver,
for (i = 0; i < def->nnets; i++) { for (i = 0; i < def->nnets; i++) {
virDomainNetDef *net = def->nets[i]; virDomainNetDef *net = def->nets[i];
if (qemuBuildInterfaceCommandLine(driver, vm, logManager, secManager, cmd, net, if (qemuBuildInterfaceCommandLine(driver, vm, cmd, net,
qemuCaps, vmop, qemuCaps, vmop,
standalone, nnicindexes, standalone, nnicindexes,
nicindexes) < 0) nicindexes) < 0)
@ -9019,9 +9001,7 @@ qemuBuildNetCommandLine(virQEMUDriver *driver,
static int static int
qemuBuildSmartcardCommandLine(virLogManager *logManager, qemuBuildSmartcardCommandLine(virCommand *cmd,
virSecurityManager *secManager,
virCommand *cmd,
virQEMUDriverConfig *cfg, virQEMUDriverConfig *cfg,
const virDomainDef *def, const virDomainDef *def,
virQEMUCaps *qemuCaps) virQEMUCaps *qemuCaps)
@ -9068,8 +9048,8 @@ qemuBuildSmartcardCommandLine(virLogManager *logManager,
g_autofree char *chardevstr = NULL; g_autofree char *chardevstr = NULL;
g_autofree char *chardevalias = g_strdup_printf("char%s", smartcard->info.alias); g_autofree char *chardevalias = g_strdup_printf("char%s", smartcard->info.alias);
if (!(chardevstr = qemuBuildChrChardevStr(logManager, secManager, if (!(chardevstr = qemuBuildChrChardevStr(cmd,
cmd, cfg, def, cfg,
smartcard->data.passthru, smartcard->data.passthru,
smartcard->info.alias, smartcard->info.alias,
qemuCaps))) { qemuCaps))) {
@ -9217,9 +9197,7 @@ qemuBuildShmemBackendMemProps(virDomainShmemDef *shmem)
static int static int
qemuBuildShmemCommandLine(virLogManager *logManager, qemuBuildShmemCommandLine(virCommand *cmd,
virSecurityManager *secManager,
virCommand *cmd,
virQEMUDriverConfig *cfg, virQEMUDriverConfig *cfg,
virDomainDef *def, virDomainDef *def,
virDomainShmemDef *shmem, virDomainShmemDef *shmem,
@ -9286,8 +9264,8 @@ qemuBuildShmemCommandLine(virLogManager *logManager,
return -1; return -1;
if (shmem->server.enabled) { if (shmem->server.enabled) {
chardev = qemuBuildChrChardevStr(logManager, secManager, chardev = qemuBuildChrChardevStr(cmd,
cmd, cfg, def, cfg,
shmem->server.chr, shmem->server.chr,
shmem->info.alias, shmem->info.alias,
qemuCaps); qemuCaps);
@ -9386,9 +9364,7 @@ qemuChrIsPlatformDevice(const virDomainDef *def,
static int static int
qemuBuildSerialCommandLine(virLogManager *logManager, qemuBuildSerialCommandLine(virCommand *cmd,
virSecurityManager *secManager,
virCommand *cmd,
virQEMUDriverConfig *cfg, virQEMUDriverConfig *cfg,
const virDomainDef *def, const virDomainDef *def,
virQEMUCaps *qemuCaps) virQEMUCaps *qemuCaps)
@ -9410,8 +9386,8 @@ qemuBuildSerialCommandLine(virLogManager *logManager,
if (serial->source->type == VIR_DOMAIN_CHR_TYPE_SPICEPORT && !havespice) if (serial->source->type == VIR_DOMAIN_CHR_TYPE_SPICEPORT && !havespice)
continue; continue;
if (!(devstr = qemuBuildChrChardevStr(logManager, secManager, if (!(devstr = qemuBuildChrChardevStr(cmd,
cmd, cfg, def, cfg,
serial->source, serial->source,
serial->info.alias, serial->info.alias,
qemuCaps))) qemuCaps)))
@ -9445,9 +9421,7 @@ qemuBuildSerialCommandLine(virLogManager *logManager,
static int static int
qemuBuildParallelsCommandLine(virLogManager *logManager, qemuBuildParallelsCommandLine(virCommand *cmd,
virSecurityManager *secManager,
virCommand *cmd,
virQEMUDriverConfig *cfg, virQEMUDriverConfig *cfg,
const virDomainDef *def, const virDomainDef *def,
virQEMUCaps *qemuCaps) virQEMUCaps *qemuCaps)
@ -9458,8 +9432,8 @@ qemuBuildParallelsCommandLine(virLogManager *logManager,
virDomainChrDef *parallel = def->parallels[i]; virDomainChrDef *parallel = def->parallels[i];
g_autofree char *devstr = NULL; g_autofree char *devstr = NULL;
if (!(devstr = qemuBuildChrChardevStr(logManager, secManager, if (!(devstr = qemuBuildChrChardevStr(cmd,
cmd, cfg, def, cfg,
parallel->source, parallel->source,
parallel->info.alias, parallel->info.alias,
qemuCaps))) qemuCaps)))
@ -9477,9 +9451,7 @@ qemuBuildParallelsCommandLine(virLogManager *logManager,
static int static int
qemuBuildChannelsCommandLine(virLogManager *logManager, qemuBuildChannelsCommandLine(virCommand *cmd,
virSecurityManager *secManager,
virCommand *cmd,
virQEMUDriverConfig *cfg, virQEMUDriverConfig *cfg,
const virDomainDef *def, const virDomainDef *def,
virQEMUCaps *qemuCaps) virQEMUCaps *qemuCaps)
@ -9491,8 +9463,8 @@ qemuBuildChannelsCommandLine(virLogManager *logManager,
g_autofree char *chardevstr = NULL; g_autofree char *chardevstr = NULL;
g_autoptr(virJSONValue) netdevprops = NULL; g_autoptr(virJSONValue) netdevprops = NULL;
if (!(chardevstr = qemuBuildChrChardevStr(logManager, secManager, if (!(chardevstr = qemuBuildChrChardevStr(cmd,
cmd, cfg, def, cfg,
channel->source, channel->source,
channel->info.alias, channel->info.alias,
qemuCaps))) qemuCaps)))
@ -9527,9 +9499,7 @@ qemuBuildChannelsCommandLine(virLogManager *logManager,
static int static int
qemuBuildConsoleCommandLine(virLogManager *logManager, qemuBuildConsoleCommandLine(virCommand *cmd,
virSecurityManager *secManager,
virCommand *cmd,
virQEMUDriverConfig *cfg, virQEMUDriverConfig *cfg,
const virDomainDef *def, const virDomainDef *def,
virQEMUCaps *qemuCaps) virQEMUCaps *qemuCaps)
@ -9543,8 +9513,8 @@ qemuBuildConsoleCommandLine(virLogManager *logManager,
switch (console->targetType) { switch (console->targetType) {
case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLP: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLP:
if (!(devstr = qemuBuildChrChardevStr(logManager, secManager, if (!(devstr = qemuBuildChrChardevStr(cmd,
cmd, cfg, def, cfg,
console->source, console->source,
console->info.alias, console->info.alias,
qemuCaps))) qemuCaps)))
@ -9558,8 +9528,8 @@ qemuBuildConsoleCommandLine(virLogManager *logManager,
break; break;
case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLPLM: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLPLM:
if (!(devstr = qemuBuildChrChardevStr(logManager, secManager, if (!(devstr = qemuBuildChrChardevStr(cmd,
cmd, cfg, def, cfg,
console->source, console->source,
console->info.alias, console->info.alias,
qemuCaps))) qemuCaps)))
@ -9573,8 +9543,8 @@ qemuBuildConsoleCommandLine(virLogManager *logManager,
break; break;
case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO:
if (!(devstr = qemuBuildChrChardevStr(logManager, secManager, if (!(devstr = qemuBuildChrChardevStr(cmd,
cmd, cfg, def, cfg,
console->source, console->source,
console->info.alias, console->info.alias,
qemuCaps))) qemuCaps)))
@ -9658,9 +9628,7 @@ qemuBuildRedirdevDevProps(const virDomainDef *def,
static int static int
qemuBuildRedirdevCommandLine(virLogManager *logManager, qemuBuildRedirdevCommandLine(virCommand *cmd,
virSecurityManager *secManager,
virCommand *cmd,
virQEMUDriverConfig *cfg, virQEMUDriverConfig *cfg,
const virDomainDef *def, const virDomainDef *def,
virQEMUCaps *qemuCaps) virQEMUCaps *qemuCaps)
@ -9672,8 +9640,8 @@ qemuBuildRedirdevCommandLine(virLogManager *logManager,
g_autoptr(virJSONValue) devprops = NULL; g_autoptr(virJSONValue) devprops = NULL;
char *devstr; char *devstr;
if (!(devstr = qemuBuildChrChardevStr(logManager, secManager, if (!(devstr = qemuBuildChrChardevStr(cmd,
cmd, cfg, def, cfg,
redirdev->source, redirdev->source,
redirdev->info.alias, redirdev->info.alias,
qemuCaps))) { qemuCaps))) {
@ -10522,8 +10490,6 @@ qemuBuildCompatDeprecatedCommandLine(virCommand *cmd,
*/ */
virCommand * virCommand *
qemuBuildCommandLine(virQEMUDriver *driver, qemuBuildCommandLine(virQEMUDriver *driver,
virLogManager *logManager,
virSecurityManager *secManager,
virDomainObj *vm, virDomainObj *vm,
const char *migrateURI, const char *migrateURI,
virDomainMomentObj *snapshot, virDomainMomentObj *snapshot,
@ -10650,7 +10616,7 @@ qemuBuildCommandLine(virQEMUDriver *driver,
virCommandAddArg(cmd, "-no-user-config"); virCommandAddArg(cmd, "-no-user-config");
virCommandAddArg(cmd, "-nodefaults"); virCommandAddArg(cmd, "-nodefaults");
if (qemuBuildMonitorCommandLine(logManager, secManager, cmd, cfg, def, priv) < 0) if (qemuBuildMonitorCommandLine(cmd, cfg, priv) < 0)
return NULL; return NULL;
if (qemuBuildClockCommandLine(cmd, def, qemuCaps) < 0) if (qemuBuildClockCommandLine(cmd, def, qemuCaps) < 0)
@ -10684,24 +10650,24 @@ qemuBuildCommandLine(virQEMUDriver *driver,
if (qemuBuildFilesystemCommandLine(cmd, def, qemuCaps, priv) < 0) if (qemuBuildFilesystemCommandLine(cmd, def, qemuCaps, priv) < 0)
return NULL; return NULL;
if (qemuBuildNetCommandLine(driver, vm, logManager, secManager, cmd, if (qemuBuildNetCommandLine(driver, vm, cmd,
qemuCaps, vmop, standalone, qemuCaps, vmop, standalone,
nnicindexes, nicindexes) < 0) nnicindexes, nicindexes) < 0)
return NULL; return NULL;
if (qemuBuildSmartcardCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps) < 0) if (qemuBuildSmartcardCommandLine(cmd, cfg, def, qemuCaps) < 0)
return NULL; return NULL;
if (qemuBuildSerialCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps) < 0) if (qemuBuildSerialCommandLine(cmd, cfg, def, qemuCaps) < 0)
return NULL; return NULL;
if (qemuBuildParallelsCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps) < 0) if (qemuBuildParallelsCommandLine(cmd, cfg, def, qemuCaps) < 0)
return NULL; return NULL;
if (qemuBuildChannelsCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps) < 0) if (qemuBuildChannelsCommandLine(cmd, cfg, def, qemuCaps) < 0)
return NULL; return NULL;
if (qemuBuildConsoleCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps) < 0) if (qemuBuildConsoleCommandLine(cmd, cfg, def, qemuCaps) < 0)
return NULL; return NULL;
if (qemuBuildTPMsCommandLine(cmd, def, qemuCaps) < 0) if (qemuBuildTPMsCommandLine(cmd, def, qemuCaps) < 0)
@ -10725,7 +10691,7 @@ qemuBuildCommandLine(virQEMUDriver *driver,
if (qemuBuildWatchdogCommandLine(cmd, def, qemuCaps) < 0) if (qemuBuildWatchdogCommandLine(cmd, def, qemuCaps) < 0)
return NULL; return NULL;
if (qemuBuildRedirdevCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps) < 0) if (qemuBuildRedirdevCommandLine(cmd, cfg, def, qemuCaps) < 0)
return NULL; return NULL;
if (qemuBuildHostdevCommandLine(cmd, def, qemuCaps) < 0) if (qemuBuildHostdevCommandLine(cmd, def, qemuCaps) < 0)
@ -10737,7 +10703,7 @@ qemuBuildCommandLine(virQEMUDriver *driver,
if (qemuBuildMemballoonCommandLine(cmd, def, qemuCaps) < 0) if (qemuBuildMemballoonCommandLine(cmd, def, qemuCaps) < 0)
return NULL; return NULL;
if (qemuBuildRNGCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps) < 0) if (qemuBuildRNGCommandLine(cmd, cfg, def, qemuCaps) < 0)
return NULL; return NULL;
if (qemuBuildNVRAMCommandLine(cmd, def) < 0) if (qemuBuildNVRAMCommandLine(cmd, def) < 0)
@ -10771,8 +10737,7 @@ qemuBuildCommandLine(virQEMUDriver *driver,
return NULL; return NULL;
for (i = 0; i < def->nshmems; i++) { for (i = 0; i < def->nshmems; i++) {
if (qemuBuildShmemCommandLine(logManager, secManager, cmd, cfg, if (qemuBuildShmemCommandLine(cmd, cfg, def, def->shmems[i], qemuCaps) < 0)
def, def->shmems[i], qemuCaps) < 0)
return NULL; return NULL;
} }

2
src/qemu/qemu_command.h
View File

@ -44,8 +44,6 @@ VIR_ENUM_DECL(qemuVideo);
VIR_ENUM_DECL(qemuSoundCodec); VIR_ENUM_DECL(qemuSoundCodec);
virCommand *qemuBuildCommandLine(virQEMUDriver *driver, virCommand *qemuBuildCommandLine(virQEMUDriver *driver,
virLogManager *logManager,
virSecurityManager *secManager,
virDomainObj *vm, virDomainObj *vm,
const char *migrateURI, const char *migrateURI,
virDomainMomentObj *snapshot, virDomainMomentObj *snapshot,

4
src/qemu/qemu_process.c
View File

@ -7459,8 +7459,6 @@ qemuProcessLaunch(virConnectPtr conn,
VIR_DEBUG("Building emulator command line"); VIR_DEBUG("Building emulator command line");
if (!(cmd = qemuBuildCommandLine(driver, if (!(cmd = qemuBuildCommandLine(driver,
qemuDomainLogContextGetManager(logCtxt),
driver->securityManager,
vm, vm,
incoming ? incoming->launchURI : NULL, incoming ? incoming->launchURI : NULL,
snapshot, vmop, snapshot, vmop,
@ -7974,8 +7972,6 @@ qemuProcessCreatePretendCmdBuild(virQEMUDriver *driver,
{ {
VIR_DEBUG("Building emulator command line"); VIR_DEBUG("Building emulator command line");
return qemuBuildCommandLine(driver, return qemuBuildCommandLine(driver,
NULL,
driver->securityManager,
vm, vm,
migrateURI, migrateURI,
NULL, NULL,