External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-24 05:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuDomainAttachNetDevice: Clean up unneeded 'slirp' helper variables

Browse Source 
We don't need 'slirpfdName' and 'slirpfd'. The 'slirp' local can be
removed too as qemuSlirpStart is safe to be called if there's nothing to
do.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-05-10 16:48:35 +02:00
parent c8633d35ca
commit 08b0ac6683
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/qemu/qemu_hotplug.c
View File

@ -1183,8 +1183,6 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
virDomainDeviceDef dev = { VIR_DOMAIN_DEVICE_NET, { .net = net } }; virDomainDeviceDef dev = { VIR_DOMAIN_DEVICE_NET, { .net = net } };
qemuDomainNetworkPrivate *netpriv = QEMU_DOMAIN_NETWORK_PRIVATE(net); qemuDomainNetworkPrivate *netpriv = QEMU_DOMAIN_NETWORK_PRIVATE(net);
virErrorPtr originalError = NULL; virErrorPtr originalError = NULL;
g_autofree char *slirpfdName = NULL;
int slirpfd = -1;
g_autoptr(virJSONValue) nicprops = NULL; g_autoptr(virJSONValue) nicprops = NULL;
g_autoptr(virJSONValue) netprops = NULL; g_autoptr(virJSONValue) netprops = NULL;
int ret = -1; int ret = -1;
@ -1305,14 +1303,10 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_USER:
if (!priv->disableSlirp && if (!priv->disableSlirp &&
virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DBUS_VMSTATE)) { virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DBUS_VMSTATE)) {
qemuSlirp *slirp = NULL;
if (qemuInterfacePrepareSlirp(driver, net) < 0) if (qemuInterfacePrepareSlirp(driver, net) < 0)
goto cleanup; goto cleanup;
if (!(slirp = QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp))
break;
if (qemuSlirpStart(vm, net, NULL) < 0) { if (qemuSlirpStart(vm, net, NULL) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Failed to start slirp")); "%s", _("Failed to start slirp"));
@ -1408,7 +1402,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
} }
if (qemuMonitorAddNetdev(priv->mon, &netprops, if (qemuMonitorAddNetdev(priv->mon, &netprops,
slirpfd, slirpfdName) < 0) { -1, NULL) < 0) {
qemuDomainObjExitMonitor(vm); qemuDomainObjExitMonitor(vm);
virDomainAuditNet(vm, NULL, net, "attach", false); virDomainAuditNet(vm, NULL, net, "attach", false);
goto try_remove; goto try_remove;
@ -1511,7 +1505,6 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
} }
virDomainCCWAddressSetFree(ccwaddrs); virDomainCCWAddressSetFree(ccwaddrs);
VIR_FORCE_CLOSE(slirpfd);
return ret; return ret;