External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: remove chardevStdioLogd param from vhostuser code path

Browse Source 
The vhostuser network backend is only supported with the UNIX domain
socket chardev backend, so passing around chardevStdioLogd is not
required.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
(cherry picked from commit 4c76266bac)
This commit is contained in:
Daniel P. Berrangé 2018-07-05 11:59:22 +01:00
parent 3818514602
commit 941ca31e90
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/qemu/qemu_command.c
View File

@ -8174,8 +8174,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver,
virDomainDefPtr def, virDomainDefPtr def,
virDomainNetDefPtr net, virDomainNetDefPtr net,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
unsigned int bootindex, unsigned int bootindex)
bool chardevStdioLogd)
{ {
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
char *chardev = NULL; char *chardev = NULL;
@ -8196,7 +8195,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver,
cmd, cfg, def, cmd, cfg, def,
net->data.vhostuser, net->data.vhostuser,
net->info.alias, qemuCaps, false, net->info.alias, qemuCaps, false,
chardevStdioLogd))) false)))
goto cleanup; goto cleanup;
break; break;
@ -8270,8 +8269,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
virNetDevVPortProfileOp vmop, virNetDevVPortProfileOp vmop,
bool standalone, bool standalone,
size_t *nnicindexes, size_t *nnicindexes,
int **nicindexes, int **nicindexes)
bool chardevStdioLogd)
{ {
int ret = -1; int ret = -1;
char *nic = NULL, *host = NULL; char *nic = NULL, *host = NULL;
@ -8394,8 +8392,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
ret = qemuBuildVhostuserCommandLine(driver, logManager, secManager, cmd, def, ret = qemuBuildVhostuserCommandLine(driver, logManager, secManager, cmd, def,
net, qemuCaps, bootindex, net, qemuCaps, bootindex);
chardevStdioLogd);
goto cleanup; goto cleanup;
break; break;
@ -8579,8 +8576,7 @@ qemuBuildNetCommandLine(virQEMUDriverPtr driver,
bool standalone, bool standalone,
size_t *nnicindexes, size_t *nnicindexes,
int **nicindexes, int **nicindexes,
unsigned int *bootHostdevNet, unsigned int *bootHostdevNet)
bool chardevStdioLogd)
{ {
size_t i; size_t i;
int last_good_net = -1; int last_good_net = -1;
@ -8607,8 +8603,7 @@ qemuBuildNetCommandLine(virQEMUDriverPtr driver,
if (qemuBuildInterfaceCommandLine(driver, logManager, secManager, cmd, def, net, if (qemuBuildInterfaceCommandLine(driver, logManager, secManager, cmd, def, net,
qemuCaps, bootNet, vmop, qemuCaps, bootNet, vmop,
standalone, nnicindexes, standalone, nnicindexes,
nicindexes, nicindexes) < 0)
chardevStdioLogd) < 0)
goto error; goto error;
last_good_net = i; last_good_net = i;
@ -10269,8 +10264,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
if (qemuBuildNetCommandLine(driver, logManager, secManager, cmd, def, if (qemuBuildNetCommandLine(driver, logManager, secManager, cmd, def,
qemuCaps, vmop, standalone, qemuCaps, vmop, standalone,
nnicindexes, nicindexes, &bootHostdevNet, nnicindexes, nicindexes, &bootHostdevNet) < 0)
chardevStdioLogd) < 0)
goto error; goto error;
if (qemuBuildSmartcardCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps, if (qemuBuildSmartcardCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps,