[libvirt] [PATCH 3/5] qemu_hotplug: Attach guestfwd using netdev_add
https://bugzilla.redhat.com/show_bug.cgi?id=1624204
The guestfwd channels are -netdevs really. Hotplug them as such.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/qemu/qemu_hotplug.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 01920a78f5..a0ccc3b82c 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2292,10 +2292,14 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver,
char *tlsAlias = NULL;
const char *secAlias = NULL;
bool need_release = false;
+ bool guestfwd = false;
- if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL &&
- qemuDomainPrepareChannel(chr, priv->channelTargetDir) < 0)
- goto cleanup;
+ if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL) {
+ guestfwd = chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD;
+
+ if (qemuDomainPrepareChannel(chr, priv->channelTargetDir) < 0)
+ goto cleanup;
+ }
if (qemuAssignDeviceChrAlias(vmdef, chr, -1) < 0)
goto cleanup;
@@ -2337,8 +2341,14 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver,
goto exit_monitor;
chardevAttached = true;
- if (qemuMonitorAddDevice(priv->mon, devstr) < 0)
- goto exit_monitor;
+ if (guestfwd) {
+ if (qemuMonitorAddNetdev(priv->mon, devstr,
+ NULL, NULL, 0, NULL, NULL, 0) < 0)
+ goto exit_monitor;
+ } else {
+ if (qemuMonitorAddDevice(priv->mon, devstr) < 0)
+ goto exit_monitor;
+ }
if (qemuDomainObjExitMonitor(driver, vm) < 0)
goto audit;
--
2.19.2