]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: do not attempt to pass unopened vsock FD
authorJán Tomko <jtomko@redhat.com>
Thu, 20 Oct 2022 14:19:20 +0000 (16:19 +0200)
committerJán Tomko <jtomko@redhat.com>
Mon, 24 Oct 2022 13:36:33 +0000 (15:36 +0200)
On normal vm startup, we open a file descriptor
for the vsock device in qemuProcessPrepareHost.

However, when doing domxml-to-native, no file descriptors are open.

Only pass the fd if it's not -1, to make domxml-to-native work.

https://bugzilla.redhat.com/show_bug.cgi?id=1777212

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
src/qemu/qemu_command.c

index 150824f2e14aaeef38f6f2a233b6afd9711af1af..bbbde57c0f7e1d46be759612c93d6a7bf5073db1 100644 (file)
@@ -9717,7 +9717,8 @@ qemuBuildVsockCommandLine(virCommand *cmd,
     if (!(devprops = qemuBuildVsockDevProps(def, vsock, qemuCaps, "")))
         return -1;
 
-    virCommandPassFD(cmd, priv->vhostfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT);
+    if (priv->vhostfd != -1)
+        virCommandPassFD(cmd, priv->vhostfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT);
     priv->vhostfd = -1;
 
     if (qemuCommandAddExtDevice(cmd, &vsock->info, def, qemuCaps) < 0)