External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-28 03:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: command: Remove unused QEMU_BUILD_CHARDEV_FILE_LOGD and QEMU_BUILD_CHARDEV_UNIX_FD_PASS

Browse Source 
'qemuBuildChrChardevStr' doesn't use these flags any more. Stop passing
them.

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-03 13:24:24 +01:00
parent ff024b60cc
commit f88dc728cd
1 changed files with 17 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/qemu/qemu_command.c
View File

@ -5038,8 +5038,6 @@ qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev)
enum { enum {
QEMU_BUILD_CHARDEV_TCP_NOWAIT = (1 << 0), QEMU_BUILD_CHARDEV_TCP_NOWAIT = (1 << 0),
QEMU_BUILD_CHARDEV_FILE_LOGD = (1 << 1),
QEMU_BUILD_CHARDEV_UNIX_FD_PASS = (1 << 2),
}; };
/* This function outputs a -chardev command line option which describes only the /* This function outputs a -chardev command line option which describes only the
@ -5527,10 +5525,7 @@ qemuBuildMonitorCommandLine(virLogManager *logManager,
qemuDomainObjPrivate *priv) qemuDomainObjPrivate *priv)
{ {
g_autofree char *chrdev = NULL; g_autofree char *chrdev = NULL;
unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT | unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
if (priv->chardevStdioLogd)
cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
if (!priv->monConfig) if (!priv->monConfig)
return 0; return 0;
@ -5665,16 +5660,12 @@ qemuBuildRNGBackendChrdevStr(virLogManager *logManager,
virDomainRNGDef *rng, virDomainRNGDef *rng,
virQEMUCaps *qemuCaps, virQEMUCaps *qemuCaps,
char **chr, char **chr,
bool chardevStdioLogd) bool chardevStdioLogd G_GNUC_UNUSED)
{ {
unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT | unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
*chr = NULL; *chr = NULL;
if (chardevStdioLogd)
cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
switch ((virDomainRNGBackend) rng->backend) { switch ((virDomainRNGBackend) rng->backend) {
case VIR_DOMAIN_RNG_BACKEND_RANDOM: case VIR_DOMAIN_RNG_BACKEND_RANDOM:
case VIR_DOMAIN_RNG_BACKEND_BUILTIN: case VIR_DOMAIN_RNG_BACKEND_BUILTIN:
@ -9045,7 +9036,7 @@ qemuBuildSmartcardCommandLine(virLogManager *logManager,
virQEMUDriverConfig *cfg, virQEMUDriverConfig *cfg,
const virDomainDef *def, const virDomainDef *def,
virQEMUCaps *qemuCaps, virQEMUCaps *qemuCaps,
bool chardevStdioLogd) bool chardevStdioLogd G_GNUC_UNUSED)
{ {
g_autoptr(virJSONValue) props = NULL; g_autoptr(virJSONValue) props = NULL;
virDomainSmartcardDef *smartcard; virDomainSmartcardDef *smartcard;
@ -9086,13 +9077,10 @@ qemuBuildSmartcardCommandLine(virLogManager *logManager,
break; break;
case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH: { case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH: {
unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT | QEMU_BUILD_CHARDEV_UNIX_FD_PASS; unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
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 (chardevStdioLogd)
cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
if (!(chardevstr = qemuBuildChrChardevStr(logManager, secManager, if (!(chardevstr = qemuBuildChrChardevStr(logManager, secManager,
cmd, cfg, def, cmd, cfg, def,
smartcard->data.passthru, smartcard->data.passthru,
@ -9249,15 +9237,12 @@ qemuBuildShmemCommandLine(virLogManager *logManager,
virDomainDef *def, virDomainDef *def,
virDomainShmemDef *shmem, virDomainShmemDef *shmem,
virQEMUCaps *qemuCaps, virQEMUCaps *qemuCaps,
bool chardevStdioLogd) bool chardevStdioLogd G_GNUC_UNUSED)
{ {
g_autoptr(virJSONValue) memProps = NULL; g_autoptr(virJSONValue) memProps = NULL;
g_autoptr(virJSONValue) devProps = NULL; g_autoptr(virJSONValue) devProps = NULL;
g_autofree char *chardev = NULL; g_autofree char *chardev = NULL;
unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT | unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
if (chardevStdioLogd)
cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
if (shmem->size) { if (shmem->size) {
/* /*
@ -9422,14 +9407,11 @@ qemuBuildSerialCommandLine(virLogManager *logManager,
virQEMUDriverConfig *cfg, virQEMUDriverConfig *cfg,
const virDomainDef *def, const virDomainDef *def,
virQEMUCaps *qemuCaps, virQEMUCaps *qemuCaps,
bool chardevStdioLogd) bool chardevStdioLogd G_GNUC_UNUSED)
{ {
size_t i; size_t i;
bool havespice = false; bool havespice = false;
unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT | unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
if (chardevStdioLogd)
cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
if (def->nserials) { if (def->nserials) {
for (i = 0; i < def->ngraphics && !havespice; i++) { for (i = 0; i < def->ngraphics && !havespice; i++) {
@ -9486,13 +9468,10 @@ qemuBuildParallelsCommandLine(virLogManager *logManager,
virQEMUDriverConfig *cfg, virQEMUDriverConfig *cfg,
const virDomainDef *def, const virDomainDef *def,
virQEMUCaps *qemuCaps, virQEMUCaps *qemuCaps,
bool chardevStdioLogd) bool chardevStdioLogd G_GNUC_UNUSED)
{ {
size_t i; size_t i;
unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT | unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
if (chardevStdioLogd)
cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
for (i = 0; i < def->nparallels; i++) { for (i = 0; i < def->nparallels; i++) {
virDomainChrDef *parallel = def->parallels[i]; virDomainChrDef *parallel = def->parallels[i];
@ -9523,13 +9502,10 @@ qemuBuildChannelsCommandLine(virLogManager *logManager,
virQEMUDriverConfig *cfg, virQEMUDriverConfig *cfg,
const virDomainDef *def, const virDomainDef *def,
virQEMUCaps *qemuCaps, virQEMUCaps *qemuCaps,
bool chardevStdioLogd) bool chardevStdioLogd G_GNUC_UNUSED)
{ {
size_t i; size_t i;
unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT | unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
if (chardevStdioLogd)
cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
for (i = 0; i < def->nchannels; i++) { for (i = 0; i < def->nchannels; i++) {
virDomainChrDef *channel = def->channels[i]; virDomainChrDef *channel = def->channels[i];
@ -9578,13 +9554,10 @@ qemuBuildConsoleCommandLine(virLogManager *logManager,
virQEMUDriverConfig *cfg, virQEMUDriverConfig *cfg,
const virDomainDef *def, const virDomainDef *def,
virQEMUCaps *qemuCaps, virQEMUCaps *qemuCaps,
bool chardevStdioLogd) bool chardevStdioLogd G_GNUC_UNUSED)
{ {
size_t i; size_t i;
unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT | unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
if (chardevStdioLogd)
cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
/* Explicit console devices */ /* Explicit console devices */
for (i = 0; i < def->nconsoles; i++) { for (i = 0; i < def->nconsoles; i++) {
@ -9714,13 +9687,10 @@ qemuBuildRedirdevCommandLine(virLogManager *logManager,
virQEMUDriverConfig *cfg, virQEMUDriverConfig *cfg,
const virDomainDef *def, const virDomainDef *def,
virQEMUCaps *qemuCaps, virQEMUCaps *qemuCaps,
bool chardevStdioLogd) bool chardevStdioLogd G_GNUC_UNUSED)
{ {
size_t i; size_t i;
unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT | unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
if (chardevStdioLogd)
cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
for (i = 0; i < def->nredirdevs; i++) { for (i = 0; i < def->nredirdevs; i++) {
virDomainRedirdevDef *redirdev = def->redirdevs[i]; virDomainRedirdevDef *redirdev = def->redirdevs[i];