External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 14:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_hotplug: Attach guestfwd using netdev_add

Browse Source 
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>
This commit is contained in:
Michal Privoznik 2019-02-11 16:05:37 +01:00
parent 18b8f67745
commit 903315dc8f
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/qemu/qemu_hotplug.c
View File

@ -2292,10 +2292,14 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver,
char *tlsAlias = NULL; char *tlsAlias = NULL;
const char *secAlias = NULL; const char *secAlias = NULL;
bool need_release = false; bool need_release = false;
bool guestfwd = false;
if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL) {
qemuDomainPrepareChannel(chr, priv->channelTargetDir) < 0) guestfwd = chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD;
goto cleanup;
if (qemuDomainPrepareChannel(chr, priv->channelTargetDir) < 0)
goto cleanup;
}
if (qemuAssignDeviceChrAlias(vmdef, chr, -1) < 0) if (qemuAssignDeviceChrAlias(vmdef, chr, -1) < 0)
goto cleanup; goto cleanup;
@ -2337,8 +2341,14 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver,
goto exit_monitor; goto exit_monitor;
chardevAttached = true; chardevAttached = true;
if (qemuMonitorAddDevice(priv->mon, devstr) < 0) if (guestfwd) {
goto exit_monitor; 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) if (qemuDomainObjExitMonitor(driver, vm) < 0)
goto audit; goto audit;