openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: fix miss goto cleanup in qemuDomainAttachNetDevice 

This place have a wrong logic, maybe forget goto cleanup.
Also fix some small things.

Signed-off-by: Luyao Huang <lhuang@redhat.com>
This commit is contained in:
Luyao Huang 2015-01-06 17:20:30 +08:00 committed by Michal Privoznik
parent 18ec863d19
commit a791599cc6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_hotplug.c
View File

@ -924,7 +924,7 @@ int qemuDomainAttachNetDevice(virConnectPtr conn,
/* Set device online immediately */
if (qemuInterfaceStartDevice(net) < 0)
goto cleanup;
goto cleanup;
/* Set Bandwidth */
if (virNetDevSupportBandwidth(actualType) &&
@ -952,7 +952,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn,
goto cleanup;
} else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_S390)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("virtio-s390 net device cannot be hotplugged."));
_("virtio-s390 net device cannot be hotplugged."));
goto cleanup;
} else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE) &&
virDomainPCIAddressEnsureAddr(priv->pciaddrs, &net->info) < 0) {
goto cleanup;