From nobody Mon Dec 15 03:16:36 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1507120727994315.9183620537773; Wed, 4 Oct 2017 05:38:47 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DFA7AC0587C2; Wed, 4 Oct 2017 12:38:46 +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 BC70860487; Wed, 4 Oct 2017 12:38:46 +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 867C118355C4; Wed, 4 Oct 2017 12:38:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v94CKGDO014647 for ; Wed, 4 Oct 2017 08:20:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 583F762461; Wed, 4 Oct 2017 12:20:16 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 55B5062697; Wed, 4 Oct 2017 12:20:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DFA7AC0587C2 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 4 Oct 2017 14:20:03 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 2/2] qemu: command: Move PPC fdc check to domain validation 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.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 04 Oct 2017 12:38:47 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Apart from not littering the command line generator, the added benefit is that new configs with a FDC will be rejected at define stage. --- src/qemu/qemu_command.c | 8 -------- src/qemu/qemu_process.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 698fef58d..95f99d4d9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2247,14 +2247,6 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd, qemuDomainSecretInfoPtr secinfo =3D diskPriv->secinfo; qemuDomainSecretInfoPtr encinfo =3D diskPriv->encinfo; - /* PowerPC pseries based VMs do not support floppy device */ - if (disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY && - qemuDomainIsPSeries(def)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("PowerPC pseries machines do not support flop= py device")); - return -1; - } - if (disk->info.bootIndex) { bootindex =3D disk->info.bootIndex; } else { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bde3ba462..d8b721282 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4586,7 +4586,8 @@ qemuProcessStartValidateDisks(virDomainObjPtr vm, size_t i; for (i =3D 0; i < vm->def->ndisks; i++) { - virStorageSourcePtr src =3D vm->def->disks[i]->src; + virDomainDiskDefPtr disk =3D vm->def->disks[i]; + virStorageSourcePtr src =3D disk->src; /* This is a best effort check as we can only check if the command * option exists, but we cannot determine whether the running QEMU @@ -4599,6 +4600,14 @@ qemuProcessStartValidateDisks(virDomainObjPtr vm, "QEMU binary")); return -1; } + + /* PowerPC pseries based VMs do not support floppy device */ + if (disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY && + qemuDomainIsPSeries(vm->def)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("PowerPC pseries machines do not support flop= py device")); + return -1; + } } return 0; --=20 2.14.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list