From nobody Mon Feb 9 17:35:03 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 1551798471947747.1366530749793; Tue, 5 Mar 2019 07:07:51 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C0F023092647; Tue, 5 Mar 2019 15:07:49 +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 8E18560A9A; Tue, 5 Mar 2019 15:07:49 +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 A279D41F3D; Tue, 5 Mar 2019 15:07:48 +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 x25F7lN3019559 for ; Tue, 5 Mar 2019 10:07:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id 42E265D71A; Tue, 5 Mar 2019 15:07:47 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BB4C85D782 for ; Tue, 5 Mar 2019 15:07:46 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 5 Mar 2019 16:07:40 +0100 Message-Id: <20190305150740.27408-3-abologna@redhat.com> In-Reply-To: <20190305150740.27408-1-abologna@redhat.com> References: <20190305150740.27408-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] conf: Accept model=virtio for SCSI controllers 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-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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 05 Mar 2019 15:07:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" At the moment, all VirtIO devices support model=3Dvirtio except for SCSI controllers where model=3Dvirtio-scsi must be used instead: get rid of this inconsistency by providing an alias at the parser level, so that existing code keeps working but using the same values across the board is also optionally possible. Tweak one of the test cases to show that the new value is accepted transparently, without altering any of the output files in the process. Signed-off-by: Andrea Bolognani --- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 16 ++++++++++------ .../qemuxml2argvdata/controller-virtio-scsi.xml | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 80f9f84f70..8981eda4b7 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2156,6 +2156,7 @@ ibmvscsi virtio-scsi lsisas1078 + virtio virtio-transitional virtio-non-transitional diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0c0e422889..cde10598f9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10320,16 +10320,20 @@ static int virDomainControllerModelTypeFromString(const virDomainControllerDef *def, const char *model) { - if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_SCSI) - return virDomainControllerModelSCSITypeFromString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB) + if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_SCSI) { + if (STREQ_NULLABLE(model, "virtio")) + return VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO; + else + return virDomainControllerModelSCSITypeFromString(model); + } else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB) { return virDomainControllerModelUSBTypeFromString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_PCI) + } else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_PCI) { return virDomainControllerModelPCITypeFromString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE) + } else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE) { return virDomainControllerModelIDETypeFromString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) + } else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) { return virDomainControllerModelVirtioSerialTypeFromString(model); + } =20 return -1; } diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.xml b/tests/qemu= xml2argvdata/controller-virtio-scsi.xml index 844e4ad397..861121821c 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.xml +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.xml @@ -47,7 +47,7 @@ - + --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list