From c120b5738e38dfa06bcd958d65c18308cab977b2 Mon Sep 17 00:00:00 2001

Message-Id: <c120b5738e38dfa06bcd958d65c18308cab977b2@dist-git>

From: Michal Privoznik <mprivozn@redhat.com>

Date: Thu, 27 Jun 2019 14:44:46 +0200

Subject: [PATCH] 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@redhat.com>

Reviewed-by: John Ferlan <jferlan@redhat.com>

(cherry picked from commit 903315dc8ffeb2af651207f090a53526decabc92)

https://bugzilla.redhat.com/show_bug.cgi?id=1624204

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

Message-Id: <16a7ca67708755fe216f78295c56eae44275f5b1.1561639408.git.mprivozn@redhat.com>

Reviewed-by: Jiri Denemark <jdenemar@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 da9d56ffb1..468389fa7a 100644

--- a/src/qemu/qemu_hotplug.c

+++ b/src/qemu/qemu_hotplug.c

@@ -1864,10 +1864,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;

@@ -1909,8 +1913,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.22.0