shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-12 04:58:32 +03:00
Code Releases Activity

qemuDomainAttachNetDevice: Remove unused 'tapfd' infrastructure

Browse Source 
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 15:49:14 +02:00
parent 822a6dfc07
commit c613b1a211
1 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/qemu/qemu_hotplug.c
View File

@ -1185,9 +1185,6 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
virErrorPtr originalError = NULL; virErrorPtr originalError = NULL;
g_autofree char *slirpfdName = NULL; g_autofree char *slirpfdName = NULL;
int slirpfd = -1; int slirpfd = -1;
char **tapfdName = NULL;
int *tapfd = NULL;
size_t tapfdSize = 0;
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;
@ -1198,7 +1195,6 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
const virNetDevBandwidth *actualBandwidth; const virNetDevBandwidth *actualBandwidth;
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
virDomainCCWAddressSet *ccwaddrs = NULL; virDomainCCWAddressSet *ccwaddrs = NULL;
size_t i;
g_autofree char *charDevAlias = NULL; g_autofree char *charDevAlias = NULL;
bool charDevPlugged = false; bool charDevPlugged = false;
bool netdevPlugged = false; bool netdevPlugged = false;
@ -1383,19 +1379,8 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
virNetDevSetMTU(net->ifname, net->mtu) < 0) virNetDevSetMTU(net->ifname, net->mtu) < 0)
goto cleanup; goto cleanup;
for (i = 0; i < tapfdSize; i++) {
if (qemuSecuritySetTapFDLabel(driver->securityManager,
vm->def, tapfd[i]) < 0)
goto cleanup;
}
tapfdName = g_new0(char *, tapfdSize);
for (i = 0; i < tapfdSize; i++)
tapfdName[i] = g_strdup_printf("fd-%s%zu", net->info.alias, i);
if (!(netprops = qemuBuildHostNetProps(net, if (!(netprops = qemuBuildHostNetProps(net,
tapfdName, tapfdSize, NULL, 0,
slirpfdName))) slirpfdName)))
goto cleanup; goto cleanup;
@ -1430,7 +1415,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
} }
if (qemuMonitorAddNetdev(priv->mon, &netprops, if (qemuMonitorAddNetdev(priv->mon, &netprops,
tapfd, tapfdName, tapfdSize, NULL, NULL, 0,
slirpfd, slirpfdName) < 0) { slirpfd, slirpfdName) < 0) {
qemuDomainObjExitMonitor(vm); qemuDomainObjExitMonitor(vm);
virDomainAuditNet(vm, NULL, net, "attach", false); virDomainAuditNet(vm, NULL, net, "attach", false);
@ -1440,9 +1425,6 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
qemuDomainObjExitMonitor(vm); qemuDomainObjExitMonitor(vm);
for (i = 0; i < tapfdSize; i++)
VIR_FORCE_CLOSE(tapfd[i]);
if (!(nicprops = qemuBuildNicDevProps(vm->def, net, priv->qemuCaps))) if (!(nicprops = qemuBuildNicDevProps(vm->def, net, priv->qemuCaps)))
goto try_remove; goto try_remove;
@ -1536,13 +1518,6 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
virErrorRestore(&save_err); virErrorRestore(&save_err);
} }
for (i = 0; tapfd && i < tapfdSize; i++) {
VIR_FORCE_CLOSE(tapfd[i]);
if (tapfdName)
VIR_FREE(tapfdName[i]);
}
VIR_FREE(tapfd);
VIR_FREE(tapfdName);
virDomainCCWAddressSetFree(ccwaddrs); virDomainCCWAddressSetFree(ccwaddrs);
VIR_FORCE_CLOSE(slirpfd); VIR_FORCE_CLOSE(slirpfd);