From nobody Mon May 13 21:18:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621502287; cv=none; d=zohomail.com; s=zohoarc; b=Kvc7n2j0HoOXG6fRLaGD+2fl0tc4qYLmlHs96EdW4vV8nd676i4Y40fVHxX/mMOzwiPLiHtMP+R4seRbhl/nOHERCBpLq2HmNwEFaHGNVuV+29BuAQYOaPbGtHiPRF1vEJMxSvkfSL3yUwpd7LOw9Ir6YqdWwXOnnJzYXylarDI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621502287; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=TNHMvD4bLht5iN8V1MjSBJVafXqHlA1i5qMl/M4f3uo=; b=IWHavSS/O+WkfwLq7CPuNre4SzkwPpfc0JjXT6l17kB3Aezrz2rIN78vrvpMqD9JZwzTlpvL5SP+v6y2tGFMYxnxsdGgUpkY7fo0ENGaYEXtyFTyK2h43p7mreBtTGrfXrkHMMa2CNg8TPZ121LIUm+tZIYp+8AjjDIDj88fq4Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621502287236931.8146051251076; Thu, 20 May 2021 02:18:07 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-159-XFa6Ft31PU2xLnkjrzXYXg-1; Thu, 20 May 2021 05:18:03 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2C5518042B9; Thu, 20 May 2021 09:17:57 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3C6B919C59; Thu, 20 May 2021 09:17:55 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 796411800BB8; Thu, 20 May 2021 09:17:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 14K9Ag8G012715 for ; Thu, 20 May 2021 05:10:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5B9335C261; Thu, 20 May 2021 09:10:42 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id CF6B05C276 for ; Thu, 20 May 2021 09:10:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621502286; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=TNHMvD4bLht5iN8V1MjSBJVafXqHlA1i5qMl/M4f3uo=; b=bo3tvaWK6e7P3WkCs9kc5izYdr8JzSr11TtK/Oa6kAYbmhK2hZuSSLCS6HO/esckv5IZfZ zAvBxUGE0zIllHgRQnjUenMUunM7CcGHLcqmW6vVodqFFX0Zu7rqva3jbj5iY8ZZXKv00b XEvwxck5o0WGc+6rEiZKiku/2fS6Jig= X-MC-Unique: XFa6Ft31PU2xLnkjrzXYXg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH] qemu: fs: do not try to fill binary path if we have a socket Date: Thu, 20 May 2021 11:10:36 +0200 Message-Id: <41b359ef8fbe759a855938d2d73d3070df79a5fe.1621501833.git.jtomko@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 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=3D1855789 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_virtiofs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; =20 return qemuVhostUserFillDomainFS(driver, fs); --=20 2.31.1