From nobody Mon Feb 9 23:15:06 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; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1550408703204766.2353249753628; Sun, 17 Feb 2019 05:05:03 -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 1D42878EB1; Sun, 17 Feb 2019 13:05:01 +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 D4E40608C6; Sun, 17 Feb 2019 13:05:00 +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 8C84F181A010; Sun, 17 Feb 2019 13:05:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1HD4XDF016406 for ; Sun, 17 Feb 2019 08:04:33 -0500 Received: by smtp.corp.redhat.com (Postfix) id DF2495D9CA; Sun, 17 Feb 2019 13:04:33 +0000 (UTC) Received: from mx1.redhat.com (ext-mx09.extmail.prod.ext.phx2.redhat.com [10.5.110.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4FE185DF28 for ; Sun, 17 Feb 2019 13:04:29 +0000 (UTC) Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ACDED11DBA9 for ; Sun, 17 Feb 2019 13:04:26 +0000 (UTC) Received: by mail-lj1-f195.google.com with SMTP id r10-v6so12048121ljj.4 for ; Sun, 17 Feb 2019 05:04:26 -0800 (PST) Received: from kloomba.my.domain ([213.147.206.165]) by smtp.gmail.com with ESMTPSA id p15sm2782242lfc.88.2019.02.17.05.04.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Feb 2019 05:04:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SiYwo/fHJpsbeYgqQo9A1GluZc9sZARw9UOjuTnDQG8=; b=DcdXNXd+/NBbyMfQ6tEWxDVB5oJeYowJwdb9Tur2eooSBcfM8oYzqqnMi/j6GvWigD BCDh5WwAUG4M+V5shCH/leWuz5U262zTos/hDK9/6hS+i1R1h9p+w6i23BR5Tz+hIgU9 Cg/VpodEqOv25zcYpmERVCjqW9KCczEKzucE7J++WOvgcZs0ADSGwC/bnYEdCQeBuG4s qQBu4OXR1iPvqw6beXEftKPDe2IwiiIeJD/g1FtnyZkPLVoZ0Gnpu73MtYh866n7bzu8 0aH6Iaso/Px/MXldhM5TYTKGVFlAQpw2j0aeMas+vKwPodgqSGNQRneDqW9HgNAlWtl9 j/rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SiYwo/fHJpsbeYgqQo9A1GluZc9sZARw9UOjuTnDQG8=; b=b1znffAS3PjoTaxJL9TpI+Bu9p1ySxHxE2U33tSWf3D+v0euEXgfPv+8H3TtzEfbkY RxBHg0CgRRxi2945lu8FxuG0bd2OcUD39QESZxaID7VF3hjBCNF0K/bx3ZMNDltjBXX9 0HsWso9tuR5Hw7GIZ1ct+LJRDR2peX99AZT7S8UvOVHAooX96tTiWdRD/hV5GkuIQpQj pC7xSkugFxQDVsmlO+r1OPe17z6Lj2Ikx8fy/Uwn7TUdKMf6+eFcIC3xbon3xY0E+NxR uUt/Qq8H7e8NAL0uDkhhChgple4MlzxTanJuy/owFrQZU1YqjzGvJ/Se6EB4S9txM5/M s19A== X-Gm-Message-State: AHQUAubub8S3suaVm6s1IAW94zRvUrqtHo+6/odkoOTZWNqhdgWjBxc4 Z3QmghwOlb7WvlCvqq9jZOpd/5UF X-Google-Smtp-Source: AHgI3IYVj/zFyo4oePqZ6ygoEfod27iSfGbRbt0xO7n/uyyoUmbEiKufKpbWeVf0m80zSQUUlv2yEA== X-Received: by 2002:a2e:9cc7:: with SMTP id g7mr2196562ljj.33.1550408664387; Sun, 17 Feb 2019 05:04:24 -0800 (PST) From: Roman Bogorodskiy To: libvir-list@redhat.com Date: Sun, 17 Feb 2019 17:04:02 +0400 Message-Id: <20190217130405.4328-4-bogorodskiy@gmail.com> In-Reply-To: <20190217130405.4328-1-bogorodskiy@gmail.com> References: <20190217130405.4328-1-bogorodskiy@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Sun, 17 Feb 2019 13:04:27 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Sun, 17 Feb 2019 13:04:27 +0000 (UTC) for IP:'209.85.208.195' DOMAIN:'mail-lj1-f195.google.com' HELO:'mail-lj1-f195.google.com' FROM:'bogorodskiy@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.11 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, SPF_PASS) 209.85.208.195 mail-lj1-f195.google.com 209.85.208.195 mail-lj1-f195.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.38 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Roman Bogorodskiy Subject: [libvirt] [PATCH v2 3/6] bhyve: support 'isa' controller for LPC 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.27]); Sun, 17 Feb 2019 13:05:01 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Support modeling of the 'isa' controller for bhyve. When controller is not present in the domain XML, but domain requires it to be there (e.g. because bootrom is used), implicitly add addition of this controller to the command line arguments, and bind it to PCI slot 1. PCI slot 1 is always reserved still. User can manually define any PCI slot for the 'isa' controller, including PCI slot 1, but other devices are not allowed to use this address. Signed-off-by: Roman Bogorodskiy --- src/bhyve/bhyve_command.c | 18 +++++++++- src/bhyve/bhyve_device.c | 25 ++++++++++--- ...ml2argv-addr-isa-controller-on-slot-1.args | 10 ++++++ ...2argv-addr-isa-controller-on-slot-1.ldargs | 3 ++ ...xml2argv-addr-isa-controller-on-slot-1.xml | 26 ++++++++++++++ ...l2argv-addr-isa-controller-on-slot-31.args | 10 ++++++ ...argv-addr-isa-controller-on-slot-31.ldargs | 3 ++ ...ml2argv-addr-isa-controller-on-slot-31.xml | 26 ++++++++++++++ ...argv-addr-non-isa-controller-on-slot-1.xml | 23 ++++++++++++ .../bhyvexml2argv-isa-controller.args | 10 ++++++ .../bhyvexml2argv-isa-controller.ldargs | 3 ++ .../bhyvexml2argv-isa-controller.xml | 24 +++++++++++++ ...bhyvexml2argv-isa-multiple-controllers.xml | 25 +++++++++++++ tests/bhyvexml2argvtest.c | 5 +++ ...l2xmlout-addr-isa-controller-on-slot-1.xml | 36 +++++++++++++++++++ ...2xmlout-addr-isa-controller-on-slot-31.xml | 36 +++++++++++++++++++ .../bhyvexml2xmlout-isa-controller.xml | 36 +++++++++++++++++++ tests/bhyvexml2xmltest.c | 3 ++ 18 files changed, 317 insertions(+), 5 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controll= er-on-slot-1.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controll= er-on-slot-1.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controll= er-on-slot-1.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controll= er-on-slot-31.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controll= er-on-slot-31.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controll= er-on-slot-31.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-cont= roller-on-slot-1.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ar= gs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ld= args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-isa-multiple-cont= rollers.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-isa-cont= roller-on-slot-1.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-isa-cont= roller-on-slot-31.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-isa-controlle= r.xml diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index f49dc77118..2c90265a93 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -461,6 +461,7 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, */ size_t i; int nusbcontrollers =3D 0; + int nisacontrollers =3D 0; unsigned int nvcpus =3D virDomainDefGetVcpus(def); =20 virCommandPtr cmd =3D virCommandNew(BHYVE); @@ -581,6 +582,21 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, if (bhyveBuildUSBControllerArgStr(def, controller, cmd) < = 0) goto error; break; + case VIR_DOMAIN_CONTROLLER_TYPE_ISA: + if (controller->model !=3D VIR_DOMAIN_CONTROLLER_MODEL_ISA= _BRIDGE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("unsupported ISA controller= model: only ISA bridge supported")); + goto error; + } + if (++nisacontrollers > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("only single ISA controller= is supported")); + goto error; + } + virCommandAddArg(cmd, "-s"); + virCommandAddArgFormat(cmd, "%d:0,lpc", + controller->info.addr.pci.slot); + break; } } for (i =3D 0; i < def->nnets; i++) { @@ -618,7 +634,7 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, } } =20 - if (bhyveDomainDefNeedsISAController(def)) + if (nisacontrollers =3D=3D 0 && bhyveDomainDefNeedsISAController(def)) bhyveBuildLPCArgStr(def, cmd); =20 if (bhyveBuildConsoleArgStr(def, cmd) < 0) diff --git a/src/bhyve/bhyve_device.c b/src/bhyve/bhyve_device.c index 201044d9e6..42093afb7b 100644 --- a/src/bhyve/bhyve_device.c +++ b/src/bhyve/bhyve_device.c @@ -47,10 +47,17 @@ bhyveCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UN= USED, if (addr->slot =3D=3D 0) { return 0; } else if (addr->slot =3D=3D 1) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("PCI bus 0 slot 1 is reserved for the implici= t " - "LPC PCI-ISA bridge")); - return -1; + if (!((device->type =3D=3D VIR_DOMAIN_DEVICE_CONTROLLER) && + (device->data.controller->type =3D=3D VIR_DOMAIN_CONTROLL= ER_TYPE_ISA) && + (device->data.controller->model =3D=3D VIR_DOMAIN_CONTROL= LER_MODEL_ISA_BRIDGE))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("PCI bus 0 slot 1 is reserved for the imp= licit " + "LPC PCI-ISA bridge")); + return -1; + } else { + /* We reserve slot 1 for LPC in bhyveAssignDevicePCISlots(= ), so exit early */ + return 0; + } } } =20 @@ -103,6 +110,16 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def, goto error; } =20 + for (i =3D 0; i < def->ncontrollers; i++) { + if ((def->controllers[i]->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_= ISA) && + (def->controllers[i]->model =3D=3D VIR_DOMAIN_CONTROLLER_MODE= L_ISA_BRIDGE) && + virDeviceInfoPCIAddressIsWanted(&def->controllers[i]->info))= { + def->controllers[i]->info.type =3D VIR_DOMAIN_DEVICE_ADDRESS_= TYPE_PCI; + def->controllers[i]->info.addr.pci =3D lpc_addr; + break; + } + } + for (i =3D 0; i < def->ncontrollers; i++) { if ((def->controllers[i]->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_P= CI) || (def->controllers[i]->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_S= ATA) || diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-s= lot-1.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-s= lot-1.args new file mode 100644 index 0000000000..910d1bbcfa --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.a= rgs @@ -0,0 +1,10 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 1:0,lpc \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=3D52:54:00:b9:94:02 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-s= lot-1.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on= -slot-1.ldargs new file mode 100644 index 0000000000..32538b558e --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.l= dargs @@ -0,0 +1,3 @@ +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-s= lot-1.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-sl= ot-1.xml new file mode 100644 index 0000000000..796903a9fa --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.x= ml @@ -0,0 +1,26 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + +
+ + + + + +
+ + + + + +
+ + + diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-s= lot-31.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-= slot-31.args new file mode 100644 index 0000000000..ee833eb460 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.= args @@ -0,0 +1,10 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 31:0,lpc \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=3D52:54:00:b9:94:02 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-s= lot-31.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-o= n-slot-31.ldargs new file mode 100644 index 0000000000..32538b558e --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.= ldargs @@ -0,0 +1,3 @@ +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-s= lot-31.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-s= lot-31.xml new file mode 100644 index 0000000000..65d7480db6 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.= xml @@ -0,0 +1,26 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + +
+ + + + + +
+ + + + + +
+ + + diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-= on-slot-1.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controll= er-on-slot-1.xml new file mode 100644 index 0000000000..88ad9aebb7 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot= -1.xml @@ -0,0 +1,23 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + + + + +
+ + + + + +
+ + + diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args b/te= sts/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args new file mode 100644 index 0000000000..910d1bbcfa --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args @@ -0,0 +1,10 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 1:0,lpc \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=3D52:54:00:b9:94:02 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs b/= tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs new file mode 100644 index 0000000000..32538b558e --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs @@ -0,0 +1,3 @@ +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.xml b/tes= ts/bhyvexml2argvdata/bhyvexml2argv-isa-controller.xml new file mode 100644 index 0000000000..71265ea32c --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.xml @@ -0,0 +1,24 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + + + + + +
+ + + + + +
+ + + diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-multiple-controllers= .xml b/tests/bhyvexml2argvdata/bhyvexml2argv-isa-multiple-controllers.xml new file mode 100644 index 0000000000..25622ce78a --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-isa-multiple-controllers.xml @@ -0,0 +1,25 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + + + + + + +
+ + + + + +
+ + + diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 4a7f65a8e2..d120bd43ca 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -211,6 +211,8 @@ mymain(void) DO_TEST("cputopology"); DO_TEST_FAILURE("cputopology-nvcpu-mismatch"); DO_TEST("commandline"); + DO_TEST("isa-controller"); + DO_TEST_FAILURE("isa-multiple-controllers"); =20 /* Address allocation tests */ DO_TEST("addr-single-sata-disk"); @@ -218,6 +220,9 @@ mymain(void) DO_TEST("addr-more-than-32-sata-disks"); DO_TEST("addr-single-virtio-disk"); DO_TEST("addr-multiple-virtio-disks"); + DO_TEST("addr-isa-controller-on-slot-1"); + DO_TEST("addr-isa-controller-on-slot-31"); + DO_TEST_FAILURE("addr-non-isa-controller-on-slot-1"); =20 /* The same without 32 devs per controller support */ driver.bhyvecaps ^=3D BHYVE_CAP_AHCI32SLOT; diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-isa-controller-= on-slot-1.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-isa-controll= er-on-slot-1.xml new file mode 100644 index 0000000000..db84185fe6 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-isa-controller-on-slot= -1.xml @@ -0,0 +1,36 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + + + + +
+ + +
+ + + +
+ + + + + +
+ + + diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-isa-controller-= on-slot-31.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-isa-control= ler-on-slot-31.xml new file mode 100644 index 0000000000..6ab5e6ad1a --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-isa-controller-on-slot= -31.xml @@ -0,0 +1,36 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + + + + +
+ + +
+ + + +
+ + + + + +
+ + + diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-isa-controller.xml b= /tests/bhyvexml2xmloutdata/bhyvexml2xmlout-isa-controller.xml new file mode 100644 index 0000000000..db84185fe6 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-isa-controller.xml @@ -0,0 +1,36 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + + + + +
+ + +
+ + + +
+ + + + + +
+ + + diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index ed421b8839..4b7f59ea29 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -111,6 +111,7 @@ mymain(void) DO_TEST_DIFFERENT("vnc-vgaconf-io"); DO_TEST_DIFFERENT("vnc-autoport"); DO_TEST_DIFFERENT("commandline"); + DO_TEST_DIFFERENT("isa-controller"); =20 /* Address allocation tests */ DO_TEST_DIFFERENT("addr-single-sata-disk"); @@ -118,6 +119,8 @@ mymain(void) DO_TEST_DIFFERENT("addr-more-than-32-sata-disks"); DO_TEST_DIFFERENT("addr-single-virtio-disk"); DO_TEST_DIFFERENT("addr-multiple-virtio-disks"); + DO_TEST_DIFFERENT("addr-isa-controller-on-slot-1"); + DO_TEST_DIFFERENT("addr-isa-controller-on-slot-31"); =20 /* The same without 32 devs per controller support */ driver.bhyvecaps ^=3D BHYVE_CAP_AHCI32SLOT; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list