From nobody Sun Feb 8 19:35:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1563275249; cv=none; d=zoho.com; s=zohoarc; b=NnLX44TOhVpPuLCZl/AtTpaWMwqpXG1UNFCIIN6f54kCyOWUc2xiA2waSoz8UBA7X6Lm6O2KkbXiEyePKFAuDdvIr3PAmh/kFfAFsoknGM/thcXbLLQTt26eGGM/u0H8ca5muRcvpJ7lhKBo4I4Yu2rORM2fM9Cko4kBcqqqwyE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563275249; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=3dRykdn5V5/a14Lt6l2ofl0ZbX95VNU3ZOI2rQo77WE=; b=fC21KfJYe5BZKfqHFYMjft22WbwiB7S471/NaBvzOt+qdNFAtR3XvLMBwNOdQVcK1+lFSTS52771U6NwwEEeOZ6TWRP9rbJsPhq0EA8R+oF+RGmSensPXzayMz8tioo3K9Zsz+o4ey2GQJrBStOlZy+lNVpRlbK88wS2RTW5By0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1563275249174970.5490805351229; Tue, 16 Jul 2019 04:07:29 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 49F43811DC; Tue, 16 Jul 2019 11:07:27 +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 2501A60C70; Tue, 16 Jul 2019 11:07:27 +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 D4776180020C; Tue, 16 Jul 2019 11:07:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x6GB75il029273 for ; Tue, 16 Jul 2019 07:07:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id C1F371C4; Tue, 16 Jul 2019 11:07:05 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C53260920 for ; Tue, 16 Jul 2019 11:07:05 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 16 Jul 2019 13:06:53 +0200 Message-Id: <8af7958121fe4ef9c747b6e3e17fba0d422eeb94.1563275164.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 5/9] qemu: command: re-introduce qemuBuildFSDevCommandLine 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 16 Jul 2019 11:07:27 +0000 (UTC) This time it only builds one device. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 44 ++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9d5d54fd6e..02a6642207 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2801,6 +2801,33 @@ qemuBuildFSDevStr(const virDomainDef *def, } =20 =20 +static int +qemuBuildFSDevCommandLine(virCommandPtr cmd, + virDomainFSDefPtr fs, + const virDomainDef *def, + virQEMUCapsPtr qemuCaps) +{ + char *optstr; + + virCommandAddArg(cmd, "-fsdev"); + if (!(optstr =3D qemuBuildFSStr(fs))) + return -1; + virCommandAddArg(cmd, optstr); + VIR_FREE(optstr); + + if (qemuCommandAddExtDevice(cmd, &fs->info) < 0) + return -1; + + virCommandAddArg(cmd, "-device"); + if (!(optstr =3D qemuBuildFSDevStr(def, fs, qemuCaps))) + return -1; + virCommandAddArg(cmd, optstr); + VIR_FREE(optstr); + + return 0; +} + + static int qemuBuildFilesystemCommandLine(virCommandPtr cmd, const virDomainDef *def, @@ -2809,23 +2836,8 @@ qemuBuildFilesystemCommandLine(virCommandPtr cmd, size_t i; =20 for (i =3D 0; i < def->nfss; i++) { - char *optstr; - virDomainFSDefPtr fs =3D def->fss[i]; - - virCommandAddArg(cmd, "-fsdev"); - if (!(optstr =3D qemuBuildFSStr(fs))) - return -1; - virCommandAddArg(cmd, optstr); - VIR_FREE(optstr); - - if (qemuCommandAddExtDevice(cmd, &fs->info) < 0) - return -1; - - virCommandAddArg(cmd, "-device"); - if (!(optstr =3D qemuBuildFSDevStr(def, fs, qemuCaps))) + if (qemuBuildFSDevCommandLine(cmd, def->fss[i], def, qemuCaps) < 0) return -1; - virCommandAddArg(cmd, optstr); - VIR_FREE(optstr); } =20 return 0; --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list