External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-08 07:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuFDPassTransferCommand: Remove return value

Browse Source 
Now that the 'direct' mode was separated and thus we don't have any
possible error case we can stop returning any values and simplify
callers.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-05-16 17:17:20 +02:00
parent 20ba291ebd
commit 4438b8ac09
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/qemu/qemu_command.c
View File

@ -1513,9 +1513,7 @@ qemuBuildChardevCommand(virCommand *cmd,
break;
case VIR_DOMAIN_CHR_TYPE_FILE:
if (qemuFDPassTransferCommand(chrSourcePriv->sourcefd, cmd) < 0)
return -1;
qemuFDPassTransferCommand(chrSourcePriv->sourcefd, cmd);
break;
case VIR_DOMAIN_CHR_TYPE_UNIX:
@ -1543,8 +1541,7 @@ qemuBuildChardevCommand(virCommand *cmd,
return -1;
}
if (qemuFDPassTransferCommand(chrSourcePriv->logfd, cmd) < 0)
return -1;
qemuFDPassTransferCommand(chrSourcePriv->logfd, cmd);
if (!(charstr = qemuBuildChardevStr(dev, charAlias)))
return -1;
@ -8888,9 +8885,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
qemuFDPassDirectTransferCommand(n->data, cmd);
qemuFDPassDirectTransferCommand(netpriv->slirpfd, cmd);
if (qemuFDPassTransferCommand(netpriv->vdpafd, cmd) < 0)
return -1;
qemuFDPassTransferCommand(netpriv->vdpafd, cmd);
if (!(hostnetprops = qemuBuildHostNetProps(net)))
goto cleanup;
@ -9778,11 +9773,8 @@ qemuBuildTPMCommandLine(virCommand *cmd,
return -1;
}
if (qemuFDPassTransferCommand(passtpm, cmd) < 0)
return -1;
if (qemuFDPassTransferCommand(passcancel, cmd) < 0)
return -1;
qemuFDPassTransferCommand(passtpm, cmd);
qemuFDPassTransferCommand(passcancel, cmd);
if (!(tpmdevstr = qemuBuildTPMBackendStr(tpm, passtpm, passcancel)))
return -1;

6
src/qemu/qemu_fd.c
View File

@ -133,14 +133,14 @@ qemuFDPassAddFD(qemuFDPass *fdpass,
* Pass the fds in @fdpass to a commandline object @cmd. @fdpass may be NULL
* in which case this is a no-op.
*/
int
void
qemuFDPassTransferCommand(qemuFDPass *fdpass,
virCommand *cmd)
{
size_t i;
if (!fdpass)
return 0;
return;
for (i = 0; i < fdpass->nfds; i++) {
g_autofree char *arg = g_strdup_printf("set=%u,fd=%d,opaque=%s",
@ -152,8 +152,6 @@ qemuFDPassTransferCommand(qemuFDPass *fdpass,
fdpass->fds[i].fd = -1;
virCommandAddArgList(cmd, "-add-fd", arg, NULL);
}
return 0;
}

2
src/qemu/qemu_fd.h
View File

@ -39,7 +39,7 @@ qemuFDPassAddFD(qemuFDPass *fdpass,
int *fd,
const char *suffix);
int
void
qemuFDPassTransferCommand(qemuFDPass *fdpass,
virCommand *cmd);