|
 |
c8c376 |
From 67133474cb7914e4666392eb02f8c24cfa083586 Mon Sep 17 00:00:00 2001
|
|
|
c8c376 |
Message-Id: <67133474cb7914e4666392eb02f8c24cfa083586@dist-git>
|
|
|
c8c376 |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
c8c376 |
Date: Tue, 8 Nov 2016 13:42:08 +0100
|
|
|
c8c376 |
Subject: [PATCH] qemuBuildHostNetStr: Explicitly enumerate net types
|
|
|
c8c376 |
|
|
|
c8c376 |
RHEL-7.3: https://bugzilla.redhat.com/show_bug.cgi?id=1366108
|
|
|
c8c376 |
RHEL-7.3.z: https://bugzilla.redhat.com/show_bug.cgi?id=1392032
|
|
|
c8c376 |
|
|
|
c8c376 |
We tend to prevent using 'default' in switches. And it is for a
|
|
|
c8c376 |
good reason - control may end up in paths we wouldn't want for
|
|
|
c8c376 |
new values. In this specific case, if qemuBuildHostNetStr is
|
|
|
c8c376 |
called over VIR_DOMAIN_NET_TYPE_VHOSTUSER it would produce
|
|
|
c8c376 |
meaningless output. Fortunately, there no such call yet.
|
|
|
c8c376 |
|
|
|
c8c376 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
c8c376 |
(cherry picked from commit 1dcbef8a0f4bdfb25bf6b8cac08afd1a589c1ccd)
|
|
|
c8c376 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
c8c376 |
---
|
|
|
c8c376 |
src/qemu/qemu_command.c | 14 +++++++++++++-
|
|
|
c8c376 |
1 file changed, 13 insertions(+), 1 deletion(-)
|
|
|
c8c376 |
|
|
|
c8c376 |
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
|
|
|
c8c376 |
index 8bebe437a..d88ee5b6b 100644
|
|
|
c8c376 |
--- a/src/qemu/qemu_command.c
|
|
|
c8c376 |
+++ b/src/qemu/qemu_command.c
|
|
|
c8c376 |
@@ -3676,9 +3676,21 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
|
|
|
c8c376 |
break;
|
|
|
c8c376 |
|
|
|
c8c376 |
case VIR_DOMAIN_NET_TYPE_USER:
|
|
|
c8c376 |
- default:
|
|
|
c8c376 |
+ case VIR_DOMAIN_NET_TYPE_INTERNAL:
|
|
|
c8c376 |
virBufferAddLit(&buf, "user");
|
|
|
c8c376 |
break;
|
|
|
c8c376 |
+
|
|
|
c8c376 |
+ case VIR_DOMAIN_NET_TYPE_HOSTDEV:
|
|
|
c8c376 |
+ /* Should have been handled earlier via PCI/USB hotplug code. */
|
|
|
c8c376 |
+ virObjectUnref(cfg);
|
|
|
c8c376 |
+ return NULL;
|
|
|
c8c376 |
+
|
|
|
c8c376 |
+ case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
|
|
|
c8c376 |
+ /* Unsupported yet. */
|
|
|
c8c376 |
+ break;
|
|
|
c8c376 |
+
|
|
|
c8c376 |
+ case VIR_DOMAIN_NET_TYPE_LAST:
|
|
|
c8c376 |
+ break;
|
|
|
c8c376 |
}
|
|
|
c8c376 |
|
|
|
c8c376 |
if (vlan >= 0) {
|
|
|
c8c376 |
--
|
|
|
c8c376 |
2.11.0
|
|
|
c8c376 |
|