|
 |
99cbc7 |
From 8a029bcd0227b8c9829858254f9129a9406a167f Mon Sep 17 00:00:00 2001
|
|
|
99cbc7 |
Message-Id: <8a029bcd0227b8c9829858254f9129a9406a167f@dist-git>
|
|
|
99cbc7 |
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
|
|
99cbc7 |
Date: Fri, 6 Jul 2018 15:46:59 +0100
|
|
|
99cbc7 |
Subject: [PATCH] qemu: remove chardevStdioLogd param from vhostuser code path
|
|
|
99cbc7 |
MIME-Version: 1.0
|
|
|
99cbc7 |
Content-Type: text/plain; charset=UTF-8
|
|
|
99cbc7 |
Content-Transfer-Encoding: 8bit
|
|
|
99cbc7 |
|
|
|
99cbc7 |
https://bugzilla.redhat.com/show_bug.cgi?id=1597940
|
|
|
99cbc7 |
|
|
|
99cbc7 |
The vhostuser network backend is only supported with the UNIX domain
|
|
|
99cbc7 |
socket chardev backend, so passing around chardevStdioLogd is not
|
|
|
99cbc7 |
required.
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
99cbc7 |
(cherry picked from commit 4c76266baca407ae4981a180aed45193e50a8ade)
|
|
|
99cbc7 |
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
99cbc7 |
---
|
|
|
99cbc7 |
src/qemu/qemu_command.c | 20 +++++++-------------
|
|
|
99cbc7 |
1 file changed, 7 insertions(+), 13 deletions(-)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
|
|
|
99cbc7 |
index 4120e4f983..41050bfea3 100644
|
|
|
99cbc7 |
--- a/src/qemu/qemu_command.c
|
|
|
99cbc7 |
+++ b/src/qemu/qemu_command.c
|
|
|
99cbc7 |
@@ -8223,8 +8223,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
virDomainDefPtr def,
|
|
|
99cbc7 |
virDomainNetDefPtr net,
|
|
|
99cbc7 |
virQEMUCapsPtr qemuCaps,
|
|
|
99cbc7 |
- unsigned int bootindex,
|
|
|
99cbc7 |
- bool chardevStdioLogd)
|
|
|
99cbc7 |
+ unsigned int bootindex)
|
|
|
99cbc7 |
{
|
|
|
99cbc7 |
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
|
|
99cbc7 |
char *chardev = NULL;
|
|
|
99cbc7 |
@@ -8245,7 +8244,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
cmd, cfg, def,
|
|
|
99cbc7 |
net->data.vhostuser,
|
|
|
99cbc7 |
net->info.alias, qemuCaps, false,
|
|
|
99cbc7 |
- chardevStdioLogd)))
|
|
|
99cbc7 |
+ false)))
|
|
|
99cbc7 |
goto cleanup;
|
|
|
99cbc7 |
break;
|
|
|
99cbc7 |
|
|
|
99cbc7 |
@@ -8319,8 +8318,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
virNetDevVPortProfileOp vmop,
|
|
|
99cbc7 |
bool standalone,
|
|
|
99cbc7 |
size_t *nnicindexes,
|
|
|
99cbc7 |
- int **nicindexes,
|
|
|
99cbc7 |
- bool chardevStdioLogd)
|
|
|
99cbc7 |
+ int **nicindexes)
|
|
|
99cbc7 |
{
|
|
|
99cbc7 |
int ret = -1;
|
|
|
99cbc7 |
char *nic = NULL, *host = NULL;
|
|
|
99cbc7 |
@@ -8443,8 +8441,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
|
|
|
99cbc7 |
case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
|
|
|
99cbc7 |
ret = qemuBuildVhostuserCommandLine(driver, logManager, secManager, cmd, def,
|
|
|
99cbc7 |
- net, qemuCaps, bootindex,
|
|
|
99cbc7 |
- chardevStdioLogd);
|
|
|
99cbc7 |
+ net, qemuCaps, bootindex);
|
|
|
99cbc7 |
goto cleanup;
|
|
|
99cbc7 |
break;
|
|
|
99cbc7 |
|
|
|
99cbc7 |
@@ -8628,8 +8625,7 @@ qemuBuildNetCommandLine(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
bool standalone,
|
|
|
99cbc7 |
size_t *nnicindexes,
|
|
|
99cbc7 |
int **nicindexes,
|
|
|
99cbc7 |
- unsigned int *bootHostdevNet,
|
|
|
99cbc7 |
- bool chardevStdioLogd)
|
|
|
99cbc7 |
+ unsigned int *bootHostdevNet)
|
|
|
99cbc7 |
{
|
|
|
99cbc7 |
size_t i;
|
|
|
99cbc7 |
int last_good_net = -1;
|
|
|
99cbc7 |
@@ -8656,8 +8652,7 @@ qemuBuildNetCommandLine(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
if (qemuBuildInterfaceCommandLine(driver, logManager, secManager, cmd, def, net,
|
|
|
99cbc7 |
qemuCaps, bootNet, vmop,
|
|
|
99cbc7 |
standalone, nnicindexes,
|
|
|
99cbc7 |
- nicindexes,
|
|
|
99cbc7 |
- chardevStdioLogd) < 0)
|
|
|
99cbc7 |
+ nicindexes) < 0)
|
|
|
99cbc7 |
goto error;
|
|
|
99cbc7 |
|
|
|
99cbc7 |
last_good_net = i;
|
|
|
99cbc7 |
@@ -10318,8 +10313,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
|
|
|
99cbc7 |
if (qemuBuildNetCommandLine(driver, logManager, secManager, cmd, def,
|
|
|
99cbc7 |
qemuCaps, vmop, standalone,
|
|
|
99cbc7 |
- nnicindexes, nicindexes, &bootHostdevNet,
|
|
|
99cbc7 |
- chardevStdioLogd) < 0)
|
|
|
99cbc7 |
+ nnicindexes, nicindexes, &bootHostdevNet) < 0)
|
|
|
99cbc7 |
goto error;
|
|
|
99cbc7 |
|
|
|
99cbc7 |
if (qemuBuildSmartcardCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps,
|
|
|
99cbc7 |
--
|
|
|
99cbc7 |
2.18.0
|
|
|
99cbc7 |
|