From nobody Mon Feb 9 00:02:50 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1531211828930334.95179857521646; Tue, 10 Jul 2018 01:37:08 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 415425AFEC; Tue, 10 Jul 2018 08:37:07 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 76EF93001A53; Tue, 10 Jul 2018 08:37:06 +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 23DCF3F64F; Tue, 10 Jul 2018 08:37:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6A8b3Td007821 for ; Tue, 10 Jul 2018 04:37:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1E12179DC; Tue, 10 Jul 2018 08:37:03 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id B5E9D76E9 for ; Tue, 10 Jul 2018 08:37:02 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 10 Jul 2018 10:44:44 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/9] qemu: command: Rename and export qemuDiskBusNeedsDeviceArg 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 10 Jul 2018 08:37:07 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Change the semantics to exactly opposite and rename it to qemuDiskBusNeedsDriveArg. This will be necessary as some devices can't be used with -blockdev. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_command.c | 23 +++++++++++++---------- src/qemu/qemu_command.h | 1 + 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index cea31e6a24..8f5303ed95 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1330,15 +1330,18 @@ qemuCheckFips(void) } -/* Unfortunately it is not possible to use - -device for floppies, or SD - devices. Fortunately, those don't need - static PCI addresses, so we don't really - care that we can't use -device */ -static bool -qemuDiskBusNeedsDeviceArg(int bus) +/** + * qemuDiskBusNeedsDriveArg: + * @bus: disk bus + * + * Unfortunately it is not possible to use -device for SD devices. + * Fortunately, those don't need static PCI addresses, so we can use -dri= ve + * without -device. + */ +bool +qemuDiskBusNeedsDriveArg(int bus) { - return bus !=3D VIR_DOMAIN_DISK_BUS_SD; + return bus =3D=3D VIR_DOMAIN_DISK_BUS_SD; } @@ -1636,7 +1639,7 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, if (qemuBuildDriveSourceStr(disk, qemuCaps, &opt) < 0) goto error; - if (qemuDiskBusNeedsDeviceArg(disk->bus)) { + if (!qemuDiskBusNeedsDriveArg(disk->bus)) { char *drivealias =3D qemuAliasDiskDriveFromDisk(disk); if (!drivealias) goto error; @@ -2250,7 +2253,7 @@ qemuBuildDiskCommandLine(virCommandPtr cmd, qemuBlockStorageSourceAttachDataFree(data); - if (qemuDiskBusNeedsDeviceArg(disk->bus)) { + if (!qemuDiskBusNeedsDriveArg(disk->bus)) { if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_FDC) { if (qemuBuildFloppyCommandLineOptions(cmd, def, disk, bootindex) < 0) diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 4f1b360130..4452c98e4b 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -99,6 +99,7 @@ char *qemuBuildNicDevStr(virDomainDefPtr def, virQEMUCapsPtr qemuCaps); char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk); +bool qemuDiskBusNeedsDriveArg(int bus); qemuBlockStorageSourceAttachDataPtr qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskDefPtr disk, --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list