External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuBuildChrChardevStr: Remove 'cdevflags' argument

Browse Source 
The argument and corresponding enum are not used any more.

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 16:42:31 +01:00
parent 5b7a777bc8
commit bce1f16a8d
1 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/qemu/qemu_command.c
View File

@ -5036,10 +5036,6 @@ qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev)
} }
enum {
QEMU_BUILD_CHARDEV_TCP_NOWAIT = (1 << 0),
};
/* 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 *
@ -5050,8 +5046,7 @@ qemuBuildChrChardevStr(virLogManager *logManager G_GNUC_UNUSED,
const virDomainDef *def G_GNUC_UNUSED, const virDomainDef *def G_GNUC_UNUSED,
const virDomainChrSourceDef *dev, const virDomainChrSourceDef *dev,
const char *alias, const char *alias,
virQEMUCaps *qemuCaps, virQEMUCaps *qemuCaps)
unsigned int cdevflags G_GNUC_UNUSED)
{ {
qemuDomainChrSourcePrivate *chrSourcePriv = QEMU_DOMAIN_CHR_SOURCE_PRIVATE(dev); qemuDomainChrSourcePrivate *chrSourcePriv = QEMU_DOMAIN_CHR_SOURCE_PRIVATE(dev);
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
@ -5525,7 +5520,6 @@ 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;
if (!priv->monConfig) if (!priv->monConfig)
return 0; return 0;
@ -5533,7 +5527,7 @@ qemuBuildMonitorCommandLine(virLogManager *logManager,
if (!(chrdev = qemuBuildChrChardevStr(logManager, secManager, if (!(chrdev = qemuBuildChrChardevStr(logManager, secManager,
cmd, cfg, def, cmd, cfg, def,
priv->monConfig, "monitor", priv->monConfig, "monitor",
priv->qemuCaps, cdevflags))) priv->qemuCaps)))
return -1; return -1;
virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, "-chardev");
virCommandAddArg(cmd, chrdev); virCommandAddArg(cmd, chrdev);
@ -5661,8 +5655,6 @@ qemuBuildRNGBackendChrdevStr(virLogManager *logManager,
virQEMUCaps *qemuCaps, virQEMUCaps *qemuCaps,
char **chr) char **chr)
{ {
unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
*chr = NULL; *chr = NULL;
switch ((virDomainRNGBackend) rng->backend) { switch ((virDomainRNGBackend) rng->backend) {
@ -5676,8 +5668,8 @@ qemuBuildRNGBackendChrdevStr(virLogManager *logManager,
if (!(*chr = qemuBuildChrChardevStr(logManager, secManager, if (!(*chr = qemuBuildChrChardevStr(logManager, secManager,
cmd, cfg, def, cmd, cfg, def,
rng->source.chardev, rng->source.chardev,
rng->info.alias, qemuCaps, rng->info.alias,
cdevflags))) qemuCaps)))
return -1; return -1;
break; break;
} }
@ -8629,7 +8621,7 @@ qemuInterfaceVhostuserConnect(virQEMUDriver *driver,
if (!(*chardev = qemuBuildChrChardevStr(logManager, secManager, if (!(*chardev = qemuBuildChrChardevStr(logManager, secManager,
cmd, cfg, def, cmd, cfg, def,
net->data.vhostuser, net->data.vhostuser,
net->info.alias, qemuCaps, 0))) net->info.alias, qemuCaps)))
return -1; return -1;
break; break;
@ -9073,7 +9065,6 @@ 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;
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);
@ -9081,7 +9072,7 @@ qemuBuildSmartcardCommandLine(virLogManager *logManager,
cmd, cfg, def, cmd, cfg, def,
smartcard->data.passthru, smartcard->data.passthru,
smartcard->info.alias, smartcard->info.alias,
qemuCaps, cdevflags))) { qemuCaps))) {
return -1; return -1;
} }
@ -9237,7 +9228,6 @@ qemuBuildShmemCommandLine(virLogManager *logManager,
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;
if (shmem->size) { if (shmem->size) {
/* /*
@ -9299,8 +9289,8 @@ qemuBuildShmemCommandLine(virLogManager *logManager,
chardev = qemuBuildChrChardevStr(logManager, secManager, chardev = qemuBuildChrChardevStr(logManager, secManager,
cmd, cfg, def, cmd, cfg, def,
shmem->server.chr, shmem->server.chr,
shmem->info.alias, qemuCaps, shmem->info.alias,
cdevflags); qemuCaps);
if (!chardev) if (!chardev)
return -1; return -1;
@ -9405,7 +9395,6 @@ qemuBuildSerialCommandLine(virLogManager *logManager,
{ {
size_t i; size_t i;
bool havespice = false; bool havespice = false;
unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
if (def->nserials) { if (def->nserials) {
for (i = 0; i < def->ngraphics && !havespice; i++) { for (i = 0; i < def->ngraphics && !havespice; i++) {
@ -9425,7 +9414,7 @@ qemuBuildSerialCommandLine(virLogManager *logManager,
cmd, cfg, def, cmd, cfg, def,
serial->source, serial->source,
serial->info.alias, serial->info.alias,
qemuCaps, cdevflags))) qemuCaps)))
return -1; return -1;
virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, "-chardev");
virCommandAddArg(cmd, devstr); virCommandAddArg(cmd, devstr);
@ -9464,7 +9453,6 @@ qemuBuildParallelsCommandLine(virLogManager *logManager,
virQEMUCaps *qemuCaps) virQEMUCaps *qemuCaps)
{ {
size_t i; size_t i;
unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
for (i = 0; i < def->nparallels; i++) { for (i = 0; i < def->nparallels; i++) {
virDomainChrDef *parallel = def->parallels[i]; virDomainChrDef *parallel = def->parallels[i];
@ -9474,7 +9462,7 @@ qemuBuildParallelsCommandLine(virLogManager *logManager,
cmd, cfg, def, cmd, cfg, def,
parallel->source, parallel->source,
parallel->info.alias, parallel->info.alias,
qemuCaps, cdevflags))) qemuCaps)))
return -1; return -1;
virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, "-chardev");
virCommandAddArg(cmd, devstr); virCommandAddArg(cmd, devstr);
@ -9497,7 +9485,6 @@ qemuBuildChannelsCommandLine(virLogManager *logManager,
virQEMUCaps *qemuCaps) virQEMUCaps *qemuCaps)
{ {
size_t i; size_t i;
unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
for (i = 0; i < def->nchannels; i++) { for (i = 0; i < def->nchannels; i++) {
virDomainChrDef *channel = def->channels[i]; virDomainChrDef *channel = def->channels[i];
@ -9508,7 +9495,7 @@ qemuBuildChannelsCommandLine(virLogManager *logManager,
cmd, cfg, def, cmd, cfg, def,
channel->source, channel->source,
channel->info.alias, channel->info.alias,
qemuCaps, cdevflags))) qemuCaps)))
return -1; return -1;
virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, "-chardev");
@ -9548,7 +9535,6 @@ qemuBuildConsoleCommandLine(virLogManager *logManager,
virQEMUCaps *qemuCaps) virQEMUCaps *qemuCaps)
{ {
size_t i; size_t i;
unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
/* Explicit console devices */ /* Explicit console devices */
for (i = 0; i < def->nconsoles; i++) { for (i = 0; i < def->nconsoles; i++) {
@ -9561,7 +9547,7 @@ qemuBuildConsoleCommandLine(virLogManager *logManager,
cmd, cfg, def, cmd, cfg, def,
console->source, console->source,
console->info.alias, console->info.alias,
qemuCaps, cdevflags))) qemuCaps)))
return -1; return -1;
virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, "-chardev");
virCommandAddArg(cmd, devstr); virCommandAddArg(cmd, devstr);
@ -9576,7 +9562,7 @@ qemuBuildConsoleCommandLine(virLogManager *logManager,
cmd, cfg, def, cmd, cfg, def,
console->source, console->source,
console->info.alias, console->info.alias,
qemuCaps, cdevflags))) qemuCaps)))
return -1; return -1;
virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, "-chardev");
virCommandAddArg(cmd, devstr); virCommandAddArg(cmd, devstr);
@ -9591,7 +9577,7 @@ qemuBuildConsoleCommandLine(virLogManager *logManager,
cmd, cfg, def, cmd, cfg, def,
console->source, console->source,
console->info.alias, console->info.alias,
qemuCaps, cdevflags))) qemuCaps)))
return -1; return -1;
virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, "-chardev");
virCommandAddArg(cmd, devstr); virCommandAddArg(cmd, devstr);
@ -9680,7 +9666,6 @@ qemuBuildRedirdevCommandLine(virLogManager *logManager,
virQEMUCaps *qemuCaps) virQEMUCaps *qemuCaps)
{ {
size_t i; size_t i;
unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
for (i = 0; i < def->nredirdevs; i++) { for (i = 0; i < def->nredirdevs; i++) {
virDomainRedirdevDef *redirdev = def->redirdevs[i]; virDomainRedirdevDef *redirdev = def->redirdevs[i];
@ -9691,7 +9676,7 @@ qemuBuildRedirdevCommandLine(virLogManager *logManager,
cmd, cfg, def, cmd, cfg, def,
redirdev->source, redirdev->source,
redirdev->info.alias, redirdev->info.alias,
qemuCaps, cdevflags))) { qemuCaps))) {
return -1; return -1;
} }