External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-03 10:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuBuildInterfaceCommandLine: Remove 'vhostfd' machinery

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 09:54:10 +02:00
parent 7939e81f66
commit a7241f85f6
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/qemu/qemu_command.c
View File

@ -8764,10 +8764,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
g_autofree char *nic = NULL; g_autofree char *nic = NULL;
int *tapfd = NULL; int *tapfd = NULL;
size_t tapfdSize = 0; size_t tapfdSize = 0;
int *vhostfd = NULL;
size_t vhostfdSize = 0;
char **tapfdName = NULL; char **tapfdName = NULL;
char **vhostfdName = NULL;
g_autofree char *slirpfdName = NULL; g_autofree char *slirpfdName = NULL;
virDomainNetType actualType = virDomainNetGetActualType(net); virDomainNetType actualType = virDomainNetGetActualType(net);
const virNetDevBandwidth *actualBandwidth; const virNetDevBandwidth *actualBandwidth;
@ -8958,13 +8955,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
tapfd[i] = -1; tapfd[i] = -1;
} }
for (i = 0; i < vhostfdSize; i++) {
vhostfdName[i] = g_strdup_printf("%d", vhostfd[i]);
virCommandPassFD(cmd, vhostfd[i],
VIR_COMMAND_PASS_FD_CLOSE_PARENT);
vhostfd[i] = -1;
}
for (n = netpriv->tapfds; n; n = n->next) { for (n = netpriv->tapfds; n; n = n->next) {
if (qemuFDPassTransferCommand(n->data, cmd) < 0) if (qemuFDPassTransferCommand(n->data, cmd) < 0)
return -1; return -1;
@ -8980,7 +8970,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
if (!(hostnetprops = qemuBuildHostNetProps(net, if (!(hostnetprops = qemuBuildHostNetProps(net,
tapfdName, tapfdSize, tapfdName, tapfdSize,
vhostfdName, vhostfdSize, NULL, 0,
slirpfdName))) slirpfdName)))
goto cleanup; goto cleanup;
@ -9025,13 +9015,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
virDomainConfNWFilterTeardown(net); virDomainConfNWFilterTeardown(net);
virErrorRestore(&saved_err); virErrorRestore(&saved_err);
} }
for (i = 0; vhostfd && i < vhostfdSize; i++) {
if (ret < 0)
VIR_FORCE_CLOSE(vhostfd[i]);
if (vhostfdName)
VIR_FREE(vhostfdName[i]);
}
VIR_FREE(vhostfdName);
for (i = 0; tapfd && i < tapfdSize; i++) { for (i = 0; tapfd && i < tapfdSize; i++) {
if (ret < 0) if (ret < 0)
VIR_FORCE_CLOSE(tapfd[i]); VIR_FORCE_CLOSE(tapfd[i]);
@ -9039,7 +9022,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
VIR_FREE(tapfdName[i]); VIR_FREE(tapfdName[i]);
} }
VIR_FREE(tapfdName); VIR_FREE(tapfdName);
VIR_FREE(vhostfd);
VIR_FREE(tapfd); VIR_FREE(tapfd);
return ret; return ret;
} }