shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 01:34:11 +03:00
Code Releases Activity

Revert "qemu: allow passt to self-daemonize"

Browse Source 
This reverts commit 0c4e716835.

This patch was pushed by my mistake. Even though it got ACKed on
the list, I've raised couple of issues with it. They will be
fixed in next commits.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
This commit is contained in:
Michal Privoznik 2023-02-13 10:25:51 +01:00
parent edac6ca756
commit c16214087c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/qemu/qemu_passt.c
View File

@ -141,23 +141,24 @@ qemuPasstStart(virDomainObj *vm,
g_autofree char *passtSocketName = qemuPasstCreateSocketPath(vm, net); g_autofree char *passtSocketName = qemuPasstCreateSocketPath(vm, net);
g_autoptr(virCommand) cmd = NULL; g_autoptr(virCommand) cmd = NULL;
g_autofree char *pidfile = qemuPasstCreatePidFilename(vm, net); g_autofree char *pidfile = qemuPasstCreatePidFilename(vm, net);
g_autofree char *errbuf = NULL;
char macaddr[VIR_MAC_STRING_BUFLEN]; char macaddr[VIR_MAC_STRING_BUFLEN];
size_t i; size_t i;
pid_t pid = (pid_t) -1; pid_t pid = (pid_t) -1;
int exitstatus = 0; int exitstatus = 0;
int cmdret = 0; int cmdret = 0;
VIR_AUTOCLOSE errfd = -1;
cmd = virCommandNew(PASST); cmd = virCommandNew(PASST);
virCommandClearCaps(cmd); virCommandClearCaps(cmd);
virCommandSetErrorBuffer(cmd, &errbuf); virCommandSetPidFile(cmd, pidfile);
virCommandSetErrorFD(cmd, &errfd);
virCommandDaemonize(cmd);
virCommandAddArgList(cmd, virCommandAddArgList(cmd,
"--one-off", "--one-off",
"--socket", passtSocketName, "--socket", passtSocketName,
"--mac-addr", virMacAddrFormat(&net->mac, macaddr), "--mac-addr", virMacAddrFormat(&net->mac, macaddr),
"--pid", pidfile,
NULL); NULL);
if (net->mtu) { if (net->mtu) {
@ -263,7 +264,7 @@ qemuPasstStart(virDomainObj *vm,
if (cmdret < 0 || exitstatus != 0) { if (cmdret < 0 || exitstatus != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Could not start 'passt': %s"), errbuf); _("Could not start 'passt'. exitstatus: %d"), exitstatus);
goto error; goto error;
} }