From: Ján Tomko <jtomko@redhat.com>
Date: Thu, 20 May 2021 09:01:15 +0000 (+0200)
Subject: qemu: fs: do not try to fill binary path if we have a socket
X-Git-Tag: v7.4.0-rc1~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=015fe0439f0592ca0b0274b306258a1e7aafe43c;p=thirdparty%2Flibvirt.git

qemu: fs: do not try to fill binary path if we have a socket

We do not need to look for a suitable binary in the vhost-user
description files, if we aren't the ones starting it.
Otherwise startup will fail with:

error: Failed to start domain 'vm1'
error: operation failed: Unable to find a satisfying virtiofsd

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

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c
index e310f2e7aa..edaedf0304 100644
--- a/src/qemu/qemu_virtiofs.c
+++ b/src/qemu/qemu_virtiofs.c
@@ -322,7 +322,7 @@ int
 qemuVirtioFSPrepareDomain(virQEMUDriver *driver,
                           virDomainFSDef *fs)
 {
-    if (fs->binary)
+    if (fs->binary || fs->sock)
         return 0;
 
     return qemuVhostUserFillDomainFS(driver, fs);