From nobody Fri Apr 26 22:45:51 2024 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 1549811382672523.3316399752607; Sun, 10 Feb 2019 07:09:42 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7102EE6A79; Sun, 10 Feb 2019 15:09:40 +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 38ADD62948; Sun, 10 Feb 2019 15:09:40 +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 E56D93F7D0; Sun, 10 Feb 2019 15:09:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1AF9CYr023853 for ; Sun, 10 Feb 2019 10:09:12 -0500 Received: by smtp.corp.redhat.com (Postfix) id 67D0E60C55; Sun, 10 Feb 2019 15:09:12 +0000 (UTC) Received: from mx1.redhat.com (ext-mx10.extmail.prod.ext.phx2.redhat.com [10.5.110.39]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5CB2960BE7 for ; Sun, 10 Feb 2019 15:09:09 +0000 (UTC) Received: from mail-lj1-f196.google.com (mail-lj1-f196.google.com [209.85.208.196]) (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 B53E959443 for ; Sun, 10 Feb 2019 15:09:07 +0000 (UTC) Received: by mail-lj1-f196.google.com with SMTP id v14-v6so6779331ljv.1 for ; Sun, 10 Feb 2019 07:09:07 -0800 (PST) Received: from kloomba.my.domain ([31.29.234.59]) by smtp.gmail.com with ESMTPSA id w24-v6sm1310001ljh.83.2019.02.10.07.09.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Feb 2019 07:09:04 -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=XzNVRgQlb9VAVyE4ObIi8iPFGfVWoveFvFCHY0m6ZYc=; b=RcKH/9YjbES9Oll4c5gnhHEmwBv+ZbD+x+7slqQuNtdyj/DzoVPC21ouEF5CWVW2AQ PBOSBhqZewX2ShffefbjzvIh1+l9gSanBBSg4/oUbKXOO72QF/4/e2AFjPnVxir826CL TfgM/wt8cIHB0C9w7zbtbdzX8bjqw1H5Fyq1lM0kLL7v6bnmmdf9lOpkycuQvODCyGH0 KL1DxFfuiUv9R4MsztYEAig1Y8rhPujdxB1UDUJtmHNdyUOJC8Tvtys+O4pBzaY4cNeE TxH4TP++Def/sMpqvavrTACDaW7NsjEGpqKS5WgSYp/WFaLLQzPkA8AOtKwT73nkJbYG LAJg== 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=XzNVRgQlb9VAVyE4ObIi8iPFGfVWoveFvFCHY0m6ZYc=; b=KQRppdpfb1nrbQKNmx4UEM7aVmCXZU+qC8+qC+Dc7EKPveF/G6SEgA/jGG1EYISvud j0usD6bMC4cU2n8COPYpYAc5JxwCtY311VL01itSWH7r1YnRF18WJaxuDw7eRh0Uy26b CFAaIoJlbJYYRoMQqiN0vQ1p5q6rcgAIDxt83yzn4O0d/ShNcRE0doRGvPfpTK/VuNZW vgjs3nnMN1+TMCYR1SCCCvJtl3wk0IN4+GauQmnPqksoBkbIhl/m/+bExslsptdqSOU4 8jAxJbamXRsDu3zYWjnYbhDgwB6gcffqGOCBqkRPU8BgQO+umqo94juGWUBo1crUR/O1 uZMw== X-Gm-Message-State: AHQUAubuLDSFpuIucgNZvNS3qiTM0bcObqBCIw4Yo5btDCPsqL6SJdfQ X+If30KqdviQkK7XFFjvreF7qcC6 X-Google-Smtp-Source: AHgI3IasgMcBjl0wJyHCaYCQc1HwpYP0Ihj9TVWIcAGDX5rwJYlwxl+CkUyd5NWoOaV71tNJcz1HFg== X-Received: by 2002:a2e:3509:: with SMTP id z9-v6mr6837093ljz.54.1549811345719; Sun, 10 Feb 2019 07:09:05 -0800 (PST) From: Roman Bogorodskiy To: libvir-list@redhat.com Date: Sun, 10 Feb 2019 19:08:52 +0400 Message-Id: <20190210150855.24867-2-bogorodskiy@gmail.com> In-Reply-To: <20190210150855.24867-1-bogorodskiy@gmail.com> References: <20190210150855.24867-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.39]); Sun, 10 Feb 2019 15:09:08 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Sun, 10 Feb 2019 15:09:08 +0000 (UTC) for IP:'209.85.208.196' DOMAIN:'mail-lj1-f196.google.com' HELO:'mail-lj1-f196.google.com' FROM:'bogorodskiy@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.111 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_PASS) 209.85.208.196 mail-lj1-f196.google.com 209.85.208.196 mail-lj1-f196.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.39 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Roman Bogorodskiy Subject: [libvirt] [PATCH 1/4] conf: add 'isa-bridge' PCI controller model 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Sun, 10 Feb 2019 15:09:41 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Introduce 'isa-bridge' PCI controller model that looks this way in domain XML: ...
... Currently, this is needed by the bhyve driver to allow choosing a specific PCI address for that. In bhyve, this controller is used to attach serial ports and a boot ROM. Signed-off-by: Roman Bogorodskiy --- docs/schemas/domaincommon.rng | 1 + src/conf/domain_addr.c | 10 ++++++++++ src/conf/domain_addr.h | 4 +++- src/conf/domain_conf.c | 2 ++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 1 + src/qemu/qemu_domain.c | 9 +++++++++ src/qemu/qemu_domain_address.c | 2 ++ 8 files changed, 29 insertions(+), 1 deletion(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index ba80440c72..382582063e 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2294,6 +2294,7 @@ pcie-switch-downstream-port pci-expander-bus pcie-expander-bus + isa-bridge diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 04c4e6d7e1..10f0c151c7 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -304,6 +304,9 @@ virDomainPCIControllerModelToConnectType(virDomainContr= ollerModelPCI model) =20 case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_DOWNSTREAM_PORT: return VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_DOWNSTREAM_PORT; + + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ISA_BRIDGE: + return VIR_PCI_CONNECT_TYPE_PCI_ISA_BRIDGE; } return 0; } @@ -591,6 +594,13 @@ virDomainPCIAddressBusSetModel(virDomainPCIAddressBusP= tr bus, bus->maxSlot =3D VIR_PCI_ADDRESS_SLOT_LAST; break; =20 + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ISA_BRIDGE: + bus->flags =3D (VIR_PCI_CONNECT_TYPE_PCI_DEVICE | + VIR_PCI_CONNECT_TYPE_PCI_BRIDGE); + bus->minSlot =3D 1; + bus->maxSlot =3D VIR_PCI_ADDRESS_SLOT_LAST; + break; + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h index 803d07d415..bb4ddc385a 100644 --- a/src/conf/domain_addr.h +++ b/src/conf/domain_addr.h @@ -53,6 +53,7 @@ typedef enum { VIR_PCI_CONNECT_TYPE_PCIE_EXPANDER_BUS =3D 1 << 9, VIR_PCI_CONNECT_TYPE_PCI_BRIDGE =3D 1 << 10, VIR_PCI_CONNECT_TYPE_PCIE_TO_PCI_BRIDGE =3D 1 << 11, + VIR_PCI_CONNECT_TYPE_PCI_ISA_BRIDGE =3D 1 << 12, } virDomainPCIConnectFlags; =20 /* a combination of all bits that describe the type of connections @@ -67,7 +68,8 @@ typedef enum { VIR_PCI_CONNECT_TYPE_PCI_EXPANDER_BUS | \ VIR_PCI_CONNECT_TYPE_PCIE_EXPANDER_BUS | \ VIR_PCI_CONNECT_TYPE_PCI_BRIDGE | \ - VIR_PCI_CONNECT_TYPE_PCIE_TO_PCI_BRIDGE) + VIR_PCI_CONNECT_TYPE_PCIE_TO_PCI_BRIDGE | \ + VIR_PCI_CONNECT_TYPE_PCI_ISA_BRIDGE) =20 /* combination of all bits that could be used to connect a normal * endpoint device (i.e. excluding the connection possible between an diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6772c327ed..9a6fa14eb2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -354,6 +354,7 @@ VIR_ENUM_IMPL(virDomainControllerModelPCI, VIR_DOMAIN_C= ONTROLLER_MODEL_PCI_LAST, "pcie-switch-downstream-port", "pci-expander-bus", "pcie-expander-bus", + "isa-bridge", ); =20 VIR_ENUM_IMPL(virDomainControllerPCIModelName, @@ -10619,6 +10620,7 @@ virDomainControllerDefParseXML(virDomainXMLOptionPt= r xmlopt, case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_DOWNSTREAM_PORT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_EXPANDER_BUS: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS: + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ISA_BRIDGE: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: /* Other controller models don't require extra checks */ diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 2bc3f879f7..06e003d8cd 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -704,6 +704,7 @@ typedef enum { VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_DOWNSTREAM_PORT, VIR_DOMAIN_CONTROLLER_MODEL_PCI_EXPANDER_BUS, VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS, + VIR_DOMAIN_CONTROLLER_MODEL_PCI_ISA_BRIDGE, =20 VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST } virDomainControllerModelPCI; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 572d3bc20f..101badf4ef 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3012,6 +3012,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Unsupported PCI Express root controller")); goto error; + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ISA_BRIDGE: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 801d25a44b..512d74f382 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5405,6 +5405,7 @@ qemuDomainDeviceDefValidateControllerPCI(const virDom= ainControllerDef *cont, } break; =20 + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ISA_BRIDGE: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: default: @@ -5486,6 +5487,7 @@ qemuDomainDeviceDefValidateControllerPCI(const virDom= ainControllerDef *cont, } break; =20 + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ISA_BRIDGE: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: default: @@ -5530,6 +5532,7 @@ qemuDomainDeviceDefValidateControllerPCI(const virDom= ainControllerDef *cont, } break; =20 + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ISA_BRIDGE: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: default: @@ -5571,6 +5574,7 @@ qemuDomainDeviceDefValidateControllerPCI(const virDom= ainControllerDef *cont, } break; =20 + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ISA_BRIDGE: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: default: @@ -5606,6 +5610,7 @@ qemuDomainDeviceDefValidateControllerPCI(const virDom= ainControllerDef *cont, } break; =20 + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ISA_BRIDGE: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: default: @@ -5637,6 +5642,7 @@ qemuDomainDeviceDefValidateControllerPCI(const virDom= ainControllerDef *cont, } break; =20 + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ISA_BRIDGE: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: default: @@ -5682,6 +5688,7 @@ qemuDomainDeviceDefValidateControllerPCI(const virDom= ainControllerDef *cont, } break; =20 + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ISA_BRIDGE: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: default: @@ -5713,6 +5720,7 @@ qemuDomainDeviceDefValidateControllerPCI(const virDom= ainControllerDef *cont, } break; =20 + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ISA_BRIDGE: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: default: @@ -5752,6 +5760,7 @@ qemuDomainDeviceDefValidateControllerPCI(const virDom= ainControllerDef *cont, } break; =20 + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ISA_BRIDGE: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: default: diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 32fdd59566..88cf385c4a 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2402,6 +2402,7 @@ qemuDomainPCIControllerSetDefaultModelName(virDomainC= ontrollerDefPtr cont, *modelName =3D VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_SPAPR_PCI_= HOST_BRIDGE; break; case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ISA_BRIDGE: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: break; @@ -2803,6 +2804,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_TO_PCI_BRIDGE: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ISA_BRIDGE: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: break; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 26 22:45:51 2024 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 1549811382349257.5643381739827; Sun, 10 Feb 2019 07:09:42 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 87504806B3; Sun, 10 Feb 2019 15:09:40 +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 576C55C687; Sun, 10 Feb 2019 15:09:40 +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 1130C18005C8; Sun, 10 Feb 2019 15:09:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1AF9H5a023884 for ; Sun, 10 Feb 2019 10:09:17 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6241B27BBB; Sun, 10 Feb 2019 15:09:17 +0000 (UTC) Received: from mx1.redhat.com (ext-mx05.extmail.prod.ext.phx2.redhat.com [10.5.110.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5654B277CB for ; Sun, 10 Feb 2019 15:09:17 +0000 (UTC) Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) (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 A37373C2CF2 for ; Sun, 10 Feb 2019 15:09:10 +0000 (UTC) Received: by mail-lj1-f170.google.com with SMTP id c19-v6so6730453lja.5 for ; Sun, 10 Feb 2019 07:09:10 -0800 (PST) Received: from kloomba.my.domain ([31.29.234.59]) by smtp.gmail.com with ESMTPSA id w24-v6sm1310001ljh.83.2019.02.10.07.09.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Feb 2019 07:09:06 -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=c52VHj2s9l9d+TvLThgSyoDmAxEI7uub8IDp5oFtvW4=; b=tuyyCSLmt7Ikk0NXo2ArTdNeIzO2I6XjmMAyYoqFPthcfFcMmL0UBFHSfmzOpH1pC0 NbgABLek3Bp9RYB/wcR0HfG0Tj+NdHhvwTjBQfvQaIxsm0+QhobbRApH05DgRQuIhC/m pGgL1JWorLWcJgK2GqdOOb0vPudElW88eo6QI0849jRXEkNo4TMb1Z5m6qwkYFAjp0pl RJU3AjMCQUSOAo4bhFxGLx551KIwSQgR5Q61k3MLaq+MgPE1fKsL1l9r+0bu8pYV72M+ iIVsj69M87Un0Jvg6Lcqsmb0barzLf0jssBrTFyus9BIguMT4bUchizqqdmVCxdM5lBJ A/qQ== 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=c52VHj2s9l9d+TvLThgSyoDmAxEI7uub8IDp5oFtvW4=; b=Xqhi7TyTTOOzYcWhOLRCVDb8txfdGb8gUgtrR+/kNDnAd3fEx660GAtBKa6DU7e+V4 xwrnYbhejruxgg4aHer9lj/GxmeOJj6HWbudjrRQ1/yTj6FUB+Jinkyz/LSCcB8nbYfq iCxDESmYGGkVxM52lX8bLqTzVo2VzVNWrp1X6L2y6LtQranJkh55fb0k77yUE9WC5yLE SaDy+0kGv9DBFqqF/pNO0iMvpxSd0KtynJlNAtA5WnAJs1NCIZXEnPdsmvEfH+hj7/gI ks2OqbsUtJKsOmF3bch3rMEocEYTl9lBufBsVB38iJjHqlM7WwotAbq2iVCOnBMlCHVk 3Ghg== X-Gm-Message-State: AHQUAuYlFNeuj2MiI1Ogwi7a64aSzEw2jW2P1X525R2/FSxWrp6Bybyi LQZ84xcUyhZTCkHMF8flskogzR4l X-Google-Smtp-Source: AHgI3IaMzXvBmRLeOkgM8A3gKMVRkzruvXDucxoe6pCYR7UzXULhJgLFlv2+2dlAm/R2rhd0DUYugQ== X-Received: by 2002:a2e:92ca:: with SMTP id k10-v6mr19327360ljh.63.1549811347136; Sun, 10 Feb 2019 07:09:07 -0800 (PST) From: Roman Bogorodskiy To: libvir-list@redhat.com Date: Sun, 10 Feb 2019 19:08:53 +0400 Message-Id: <20190210150855.24867-3-bogorodskiy@gmail.com> In-Reply-To: <20190210150855.24867-1-bogorodskiy@gmail.com> References: <20190210150855.24867-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.29]); Sun, 10 Feb 2019 15:09:12 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Sun, 10 Feb 2019 15:09:12 +0000 (UTC) for IP:'209.85.208.170' DOMAIN:'mail-lj1-f170.google.com' HELO:'mail-lj1-f170.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.170 mail-lj1-f170.google.com 209.85.208.170 mail-lj1-f170.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.29 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Roman Bogorodskiy Subject: [libvirt] [PATCH 2/4] bhyve: model PCI ISA bridge 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Sun, 10 Feb 2019 15:09:41 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" bhyve(8) uses PCI ISA bridge to attach serial ports and a boot ROM. In the libvirt driver a PCI slot 1 was always reserved for that, and if a domain used serial ports or a boot ROM, then it would be added to the command line. However, some guests require the ISA bridge to have PCI slot other than 1. To make things more flexible, explicitly model that in XML. So now the behavior is as follows: * The 'isa-bridge' PCI controller is added to the domain if it uses video or serial devices, or boot ROM * If user didn't assign a PCI address for that controller, slot 1 will reserved for it * If user did assign a PCI address for it, this address will be used, and PCI slot 1 will be free (available for reservation for other devices) * If user assigned slot 1 to other device, slot is checked. If it's also assigned already, then the next available PCI slot is used for LPC PCI-ISA bridge, and a warning about that is emitted Signed-off-by: Roman Bogorodskiy --- src/bhyve/bhyve_command.c | 32 +++++-------- src/bhyve/bhyve_device.c | 47 ++++++++++++------- src/bhyve/bhyve_domain.c | 6 +++ .../bhyvexml2argv-acpiapic.args | 2 +- ...xml2argv-addr-more-than-32-sata-disks.args | 6 +-- ...hyvexml2argv-addr-multiple-sata-disks.args | 4 +- ...vexml2argv-addr-multiple-virtio-disks.args | 6 +-- ...rgv-addr-no32devs-multiple-sata-disks.args | 6 +-- ...l2argv-addr-no32devs-single-sata-disk.args | 4 +- .../bhyvexml2argv-addr-single-sata-disk.args | 4 +- ...bhyvexml2argv-addr-single-virtio-disk.args | 2 +- ...vexml2argv-addr-slot-1-and-31-not-lpc.args | 10 ++++ ...xml2argv-addr-slot-1-and-31-not-lpc.ldargs | 3 ++ ...yvexml2argv-addr-slot-1-and-31-not-lpc.xml | 27 +++++++++++ .../bhyvexml2argv-addr-slot-1-not-lpc.args | 10 ++++ .../bhyvexml2argv-addr-slot-1-not-lpc.ldargs | 3 ++ .../bhyvexml2argv-addr-slot-1-not-lpc.xml | 27 +++++++++++ .../bhyvexml2argvdata/bhyvexml2argv-base.args | 2 +- .../bhyvexml2argv-bhyveload-bootorder.args | 2 +- .../bhyvexml2argv-bhyveload-bootorder1.args | 2 +- .../bhyvexml2argv-bhyveload-bootorder3.args | 2 +- .../bhyvexml2argv-bhyveload-explicitargs.args | 2 +- .../bhyvexml2argv-commandline.args | 2 +- .../bhyvexml2argv-console.args | 2 +- .../bhyvexml2argv-cputopology.args | 2 +- .../bhyvexml2argv-custom-loader.args | 2 +- .../bhyvexml2argv-disk-cdrom-grub.args | 2 +- .../bhyvexml2argv-disk-cdrom.args | 2 +- .../bhyvexml2argv-explicit-lpc.args | 10 ++++ .../bhyvexml2argv-explicit-lpc.ldargs | 3 ++ .../bhyvexml2argv-explicit-lpc.xml | 26 ++++++++++ .../bhyvexml2argv-grub-bootorder.args | 2 +- .../bhyvexml2argv-grub-bootorder2.args | 2 +- .../bhyvexml2argv-grub-defaults.args | 2 +- .../bhyvexml2argv-input-xhci-tablet.args | 4 +- .../bhyvexml2argv-localtime.args | 2 +- .../bhyvexml2argv-macaddr.args | 2 +- .../bhyvexml2argv-net-e1000.args | 2 +- .../bhyvexml2argv-serial-grub-nocons.args | 2 +- .../bhyvexml2argv-serial-grub.args | 2 +- .../bhyvexml2argv-serial.args | 2 +- .../bhyvexml2argvdata/bhyvexml2argv-uefi.args | 4 +- .../bhyvexml2argv-vnc-autoport.args | 4 +- .../bhyvexml2argv-vnc-vgaconf-io.args | 4 +- .../bhyvexml2argv-vnc-vgaconf-off.args | 4 +- .../bhyvexml2argv-vnc-vgaconf-on.args | 4 +- .../bhyvexml2argvdata/bhyvexml2argv-vnc.args | 4 +- .../bhyvexml2argv-wired.args | 2 +- tests/bhyvexml2argvtest.c | 3 ++ .../bhyvexml2xmlout-acpiapic.xml | 2 +- ...ml2xmlout-addr-more-than-32-sata-disks.xml | 6 +-- ...yvexml2xmlout-addr-multiple-sata-disks.xml | 4 +- ...exml2xmlout-addr-multiple-virtio-disks.xml | 6 +-- ...lout-addr-no32devs-multiple-sata-disks.xml | 8 ++-- ...2xmlout-addr-no32devs-single-sata-disk.xml | 4 +- .../bhyvexml2xmlout-addr-single-sata-disk.xml | 4 +- ...hyvexml2xmlout-addr-single-virtio-disk.xml | 2 +- ...exml2xmlout-addr-slot-1-and-31-not-lpc.xml | 36 ++++++++++++++ .../bhyvexml2xmlout-addr-slot-1-not-lpc.xml | 36 ++++++++++++++ .../bhyvexml2xmlout-base.xml | 2 +- .../bhyvexml2xmlout-bhyveload-bootorder.xml | 2 +- .../bhyvexml2xmlout-bhyveload-bootorder1.xml | 2 +- .../bhyvexml2xmlout-bhyveload-bootorder2.xml | 2 +- .../bhyvexml2xmlout-bhyveload-bootorder3.xml | 2 +- .../bhyvexml2xmlout-bhyveload-bootorder4.xml | 2 +- ...bhyvexml2xmlout-bhyveload-explicitargs.xml | 2 +- .../bhyvexml2xmlout-commandline.xml | 2 +- .../bhyvexml2xmlout-console.xml | 3 ++ .../bhyvexml2xmlout-custom-loader.xml | 2 +- .../bhyvexml2xmlout-disk-cdrom-grub.xml | 2 +- .../bhyvexml2xmlout-disk-cdrom.xml | 2 +- .../bhyvexml2xmlout-explicit-lpc.xml | 36 ++++++++++++++ .../bhyvexml2xmlout-grub-bootorder.xml | 2 +- .../bhyvexml2xmlout-grub-bootorder2.xml | 2 +- .../bhyvexml2xmlout-grub-defaults.xml | 2 +- .../bhyvexml2xmlout-input-xhci-tablet.xml | 4 +- .../bhyvexml2xmlout-localtime.xml | 2 +- .../bhyvexml2xmlout-macaddr.xml | 2 +- .../bhyvexml2xmlout-metadata.xml | 4 +- .../bhyvexml2xmlout-serial-grub-nocons.xml | 3 ++ .../bhyvexml2xmlout-serial-grub.xml | 3 ++ .../bhyvexml2xmlout-serial.xml | 3 ++ .../bhyvexml2xmlout-vnc-autoport.xml | 3 ++ .../bhyvexml2xmlout-vnc-vgaconf-io.xml | 3 ++ .../bhyvexml2xmlout-vnc-vgaconf-off.xml | 3 ++ .../bhyvexml2xmlout-vnc-vgaconf-on.xml | 3 ++ .../bhyvexml2xmlout-vnc.xml | 3 ++ .../bhyvexml2xmlout-wired.xml | 2 +- tests/bhyvexml2xmltest.c | 3 ++ 89 files changed, 400 insertions(+), 127 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-and-3= 1-not-lpc.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-and-3= 1-not-lpc.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-and-3= 1-not-lpc.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-not-l= pc.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-not-l= pc.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-not-l= pc.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-explicit-lpc.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-explicit-lpc.ldar= gs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-explicit-lpc.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-slot-1-a= nd-31-not-lpc.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-slot-1-n= ot-lpc.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-explicit-lpc.= xml diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 1f215dac08..0842484086 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -325,14 +325,6 @@ bhyveBuildVirtIODiskArgStr(const virDomainDef *def ATT= RIBUTE_UNUSED, return 0; } =20 -static int -bhyveBuildLPCArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, - virCommandPtr cmd) -{ - virCommandAddArgList(cmd, "-s", "1,lpc", NULL); - return 0; -} - static int bhyveBuildGraphicsArgStr(const virDomainDef *def, virDomainGraphicsDefPtr graphics, @@ -460,7 +452,6 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, * vm0 */ size_t i; - bool add_lpc =3D false; int nusbcontrollers =3D 0; unsigned int nvcpus =3D virDomainDefGetVcpus(def); =20 @@ -549,7 +540,6 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, if ((bhyveDriverGetCaps(conn) & BHYVE_CAP_LPC_BOOTROM)) { virCommandAddArg(cmd, "-l"); virCommandAddArgFormat(cmd, "bootrom,%s", def->os.loader->path= ); - add_lpc =3D true; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Installed bhyve binary does not support " @@ -563,12 +553,20 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, virDomainControllerDefPtr controller =3D def->controllers[i]; switch (controller->type) { case VIR_DOMAIN_CONTROLLER_TYPE_PCI: - if (controller->model !=3D VIR_DOMAIN_CONTROLLER_MODEL_PCI= _ROOT) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("unsupported PCI controller= model: only PCI root supported")); - goto error; - } + switch (controller->model) { + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ISA_BRIDGE: + virCommandAddArg(cmd, "-s"); + virCommandAddArgFormat(cmd, "%d:0,lpc", + controller->info.addr.pci.slot); + break; + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT: break; + default: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("unsupported PCI controller model: = only PCI root supported")); + goto error; + } + break; case VIR_DOMAIN_CONTROLLER_TYPE_SATA: if (bhyveBuildAHCIControllerArgStr(def, controller, conn, = cmd) < 0) goto error; @@ -613,7 +611,6 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, if (bhyveBuildGraphicsArgStr(def, def->graphics[0], def->video= s[0], conn, cmd, dryRun) < 0) goto error; - add_lpc =3D true; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Multiple graphics devices are not supported"= )); @@ -621,9 +618,6 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, } } =20 - if (add_lpc || def->nserials) - bhyveBuildLPCArgStr(def, cmd); - if (bhyveBuildConsoleArgStr(def, cmd) < 0) goto error; =20 diff --git a/src/bhyve/bhyve_device.c b/src/bhyve/bhyve_device.c index 201044d9e6..d9ac1911a3 100644 --- a/src/bhyve/bhyve_device.c +++ b/src/bhyve/bhyve_device.c @@ -43,16 +43,8 @@ bhyveCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNU= SED, virDomainPCIAddressSetPtr addrs =3D opaque; virPCIDeviceAddressPtr addr =3D &info->addr.pci; =20 - if (addr->domain =3D=3D 0 && addr->bus =3D=3D 0) { - 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 (addr->domain =3D=3D 0 && addr->bus =3D=3D 0 && addr->slot =3D=3D 0) + return 0; =20 if (virDomainPCIAddressReserveAddr(addrs, addr, VIR_PCI_CONNECT_TYPE_PCI_DEVICE, 0)= < 0) { @@ -92,15 +84,36 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def, virDomainPCIAddressSetPtr addrs) { size_t i; - virPCIDeviceAddress lpc_addr; =20 - /* explicitly reserve slot 1 for LPC-ISA bridge */ - memset(&lpc_addr, 0, sizeof(lpc_addr)); - lpc_addr.slot =3D 0x1; + /* Look for isa-bridge first, if it has no address assigned, we want t= o reserve + PCI slot 1 for it before it's used by some other device */ + for (i =3D 0; i < def->ncontrollers; i++) { + if ((def->controllers[i]->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_P= CI) && + (def->controllers[i]->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL= _PCI_ISA_BRIDGE) && + virDeviceInfoPCIAddressIsWanted(&def->controllers[i]->info)) { + virPCIDeviceAddress lpc_addr; + memset(&lpc_addr, 0, sizeof(lpc_addr)); + lpc_addr.slot =3D 0x1; + + if (virDomainPCIAddressSlotInUse(addrs, &lpc_addr)) { + lpc_addr.slot =3D 0x1f; + + if (virDomainPCIAddressSlotInUse(addrs, &lpc_addr)) { + VIR_WARN("Cannot use PCI slots 1 and 31 for LPC PCI-IS= A bridge " + "as they are already reserved, using the next= available " + "address"); + continue; + } + } + + if (virDomainPCIAddressReserveAddr(addrs, &lpc_addr, + VIR_PCI_CONNECT_TYPE_PCI_DE= VICE, 0) < 0) { + goto error; + } =20 - if (virDomainPCIAddressReserveAddr(addrs, &lpc_addr, - VIR_PCI_CONNECT_TYPE_PCI_DEVICE, 0)= < 0) { - goto error; + def->controllers[i]->info.type =3D VIR_DOMAIN_DEVICE_ADDRESS_T= YPE_PCI; + def->controllers[i]->info.addr.pci =3D lpc_addr; + } } =20 for (i =3D 0; i < def->ncontrollers; i++) { diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 79cf103d28..6e09cbc484 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -73,6 +73,12 @@ bhyveDomainDefPostParse(virDomainDefPtr def, VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROO= T) < 0) return -1; =20 + if ((def->os.bootloader =3D=3D NULL && def->os.loader) || + (def->nconsoles || def->nserials) || (def->ngraphics && def->nvide= os)) + if (virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE= _PCI, 1, + VIR_DOMAIN_CONTROLLER_MODEL_PCI= _ISA_BRIDGE) < 0) + return -1; + return 0; } =20 diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args b/tests/bh= yvexml2argvdata/bhyvexml2argv-acpiapic.args index e71ceec84f..9a754f08da 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args @@ -7,5 +7,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 1:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:81:c4:b1 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-d= isks.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-di= sks.args index d7917bd8f3..ce90d51311 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.ar= gs +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.ar= gs @@ -5,7 +5,7 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd1.img,hd:/tmp/freebsd2.img,hd:/tmp/freebsd3.img= ,\ +-s 1:0,ahci,hd:/tmp/freebsd1.img,hd:/tmp/freebsd2.img,hd:/tmp/freebsd3.img= ,\ hd:/tmp/freebsd4.img,hd:/tmp/freebsd5.img,hd:/tmp/freebsd6.img,\ hd:/tmp/freebsd7.img,hd:/tmp/freebsd8.img,hd:/tmp/freebsd9.img,\ hd:/tmp/freebsd10.img,hd:/tmp/freebsd11.img,hd:/tmp/freebsd12.img,\ @@ -16,6 +16,6 @@ hd:/tmp/freebsd21.img,hd:/tmp/freebsd22.img,hd:/tmp/freeb= sd23.img,\ hd:/tmp/freebsd24.img,hd:/tmp/freebsd25.img,hd:/tmp/freebsd26.img,\ hd:/tmp/freebsd27.img,hd:/tmp/freebsd28.img,hd:/tmp/freebsd29.img,\ hd:/tmp/freebsd30.img \ --s 3:0,ahci,hd:/tmp/freebsd31.img,hd:/tmp/freebsd32.img,hd:/tmp/freebsd33.= img,\ +-s 2:0,ahci,hd:/tmp/freebsd31.img,hd:/tmp/freebsd32.img,hd:/tmp/freebsd33.= img,\ hd:/tmp/freebsd34.img,hd:/tmp/freebsd35.img \ --s 4:0,virtio-net,faketapdev,mac=3D52:54:00:b9:94:02 bhyve +-s 3:0,virtio-net,faketapdev,mac=3D52:54:00:b9:94:02 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks= .args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args index 5665842b84..ab06f070be 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args @@ -5,5 +5,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd1.img,hd:/tmp/freebsd2.img,hd:/tmp/freebsd2.img= \ --s 3:0,virtio-net,faketapdev,mac=3D52:54:00:b9:94:02 bhyve +-s 1:0,ahci,hd:/tmp/freebsd1.img,hd:/tmp/freebsd2.img,hd:/tmp/freebsd2.img= \ +-s 2:0,virtio-net,faketapdev,mac=3D52:54:00:b9:94:02 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-dis= ks.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.= args index 8cc1668949..d5abc6e181 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args @@ -6,6 +6,6 @@ -P \ -s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:bc:85:fe \ --s 2:0,virtio-blk,/tmp/freebsd.img \ --s 4:0,virtio-blk,/tmp/test.img \ --s 5:0,virtio-blk,/tmp/test2.img bhyve +-s 1:0,virtio-blk,/tmp/freebsd.img \ +-s 2:0,virtio-blk,/tmp/test.img \ +-s 4:0,virtio-blk,/tmp/test2.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-s= ata-disks.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multip= le-sata-disks.args index 03bf381ffb..927ae7c026 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-dis= ks.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-dis= ks.args @@ -5,7 +5,7 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci-hd,/tmp/freebsd1.img \ +-s 1:0,ahci-hd,/tmp/freebsd1.img \ +-s 2:0,ahci-hd,/tmp/freebsd2.img \ -s 3:0,ahci-hd,/tmp/freebsd2.img \ --s 4:0,ahci-hd,/tmp/freebsd2.img \ --s 5:0,virtio-net,faketapdev,mac=3D52:54:00:b9:94:02 bhyve +-s 4:0,virtio-net,faketapdev,mac=3D52:54:00:b9:94:02 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sat= a-disk.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sa= ta-disk.args index d519241359..ee209efc14 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.= args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.= args @@ -5,5 +5,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci-hd,/tmp/freebsd.img \ --s 3:0,virtio-net,faketapdev,mac=3D52:54:00:b9:94:02 bhyve +-s 1:0,ahci-hd,/tmp/freebsd.img \ +-s 2:0,virtio-net,faketapdev,mac=3D52:54:00:b9:94:02 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ar= gs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args index 547485ba5d..d707d64089 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args @@ -5,5 +5,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd.img \ --s 3:0,virtio-net,faketapdev,mac=3D52:54:00:b9:94:02 bhyve +-s 1:0,ahci,hd:/tmp/freebsd.img \ +-s 2:0,virtio-net,faketapdev,mac=3D52:54:00:b9:94:02 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.= args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args index 4dcc40404b..e9121a1227 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args @@ -6,4 +6,4 @@ -P \ -s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:bc:85:fe \ --s 2:0,virtio-blk,/tmp/freebsd.img bhyve +-s 1:0,virtio-blk,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-and-31-not-l= pc.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-and-31-not-lpc.= args new file mode 100644 index 0000000000..6aa0393037 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-and-31-not-lpc.args @@ -0,0 +1,10 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 2:0,lpc \ +-s 1:0,ahci,hd:/tmp/freebsd.img \ +-s 31:0,virtio-net,faketapdev,mac=3D52:54:00:b9:94:02 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-and-31-not-l= pc.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-and-31-not-lp= c.ldargs new file mode 100644 index 0000000000..32538b558e --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-and-31-not-lpc.ldar= gs @@ -0,0 +1,3 @@ +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-and-31-not-l= pc.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-and-31-not-lpc.x= ml new file mode 100644 index 0000000000..78cfbe220b --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-and-31-not-lpc.xml @@ -0,0 +1,27 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + + + + +
+ + + +
+ + + + + +
+ + + diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-not-lpc.args= b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-not-lpc.args new file mode 100644 index 0000000000..22becbc9ca --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-not-lpc.args @@ -0,0 +1,10 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 31:0,lpc \ +-s 1: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-slot-1-not-lpc.ldar= gs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-not-lpc.ldargs new file mode 100644 index 0000000000..32538b558e --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-not-lpc.ldargs @@ -0,0 +1,3 @@ +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-not-lpc.xml = b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-not-lpc.xml new file mode 100644 index 0000000000..630c898c25 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-slot-1-not-lpc.xml @@ -0,0 +1,27 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + + + + +
+ + + +
+ + + + + +
+ + + diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.args b/tests/bhyvex= ml2argvdata/bhyvexml2argv-base.args index 547485ba5d..f350590aa6 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-base.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-base.args @@ -5,5 +5,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 1: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-bhyveload-bootorder.args= b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args index 4d7c7c92a8..9ac476e0dd 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args @@ -5,5 +5,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso \ +-s 1:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:8d:10:e1 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.arg= s b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args index 8ec9799ccd..241ad4da75 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args @@ -5,5 +5,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso \ +-s 1:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:92:68:0e bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.arg= s b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args index f1c0bf3987..0658357e4e 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args @@ -5,5 +5,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso \ +-s 1:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:7a:f5:a4 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.a= rgs b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args index 17a1c83809..11f0fa390d 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args @@ -5,5 +5,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 1:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:11:bd:26 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args b/tests= /bhyvexml2argvdata/bhyvexml2argv-commandline.args index cb21b99cd6..5d8b820074 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args @@ -5,5 +5,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 1:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:b9:94:02 ARGUMENT1 ARGUMENT2 b= hyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console.args b/tests/bhy= vexml2argvdata/bhyvexml2argv-console.args index 6ab91ae7e4..25fbd4727e 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-console.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console.args @@ -5,7 +5,7 @@ -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:b1:42:eb \ --s 1,lpc \ -l com1,/dev/nmdm0A bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args b/tests= /bhyvexml2argvdata/bhyvexml2argv-cputopology.args index 2d175a4178..4e643a7809 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args @@ -5,5 +5,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 1: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-custom-loader.args b/tes= ts/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args index f6bfc78374..32c31e7f09 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args @@ -5,5 +5,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 1:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:35:99:c2 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args b/t= ests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args index 72f1d3538c..1b14ff7680 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args @@ -5,5 +5,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,cd:/tmp/cdrom.iso \ +-s 1:0,ahci,cd:/tmp/cdrom.iso \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:6f:6a:53 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args b/tests/= bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args index 3e61b8fc8a..d6fe24e042 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args @@ -5,5 +5,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,cd:/tmp/cdrom.iso \ +-s 1:0,ahci,cd:/tmp/cdrom.iso \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:e3:ec:9b bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-explicit-lpc.args b/test= s/bhyvexml2argvdata/bhyvexml2argv-explicit-lpc.args new file mode 100644 index 0000000000..22becbc9ca --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-explicit-lpc.args @@ -0,0 +1,10 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 31:0,lpc \ +-s 1: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-explicit-lpc.ldargs b/te= sts/bhyvexml2argvdata/bhyvexml2argv-explicit-lpc.ldargs new file mode 100644 index 0000000000..32538b558e --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-explicit-lpc.ldargs @@ -0,0 +1,3 @@ +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-explicit-lpc.xml b/tests= /bhyvexml2argvdata/bhyvexml2argv-explicit-lpc.xml new file mode 100644 index 0000000000..cd1c4b5be7 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-explicit-lpc.xml @@ -0,0 +1,26 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + +
+ + + + + +
+ + + + + +
+ + + diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args b/te= sts/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args index e64e67b39d..395769ff2a 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args @@ -5,5 +5,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd1.img,hd:/tmp/freebsd2.img,hd:/tmp/freebsd3.img= \ +-s 1:0,ahci,hd:/tmp/freebsd1.img,hd:/tmp/freebsd2.img,hd:/tmp/freebsd3.img= \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:f4:6c:be bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args b/t= ests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args index 872a69df3b..f0dbeabfc4 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args @@ -5,5 +5,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd1.img,hd:/tmp/freebsd2.img,hd:/tmp/freebsd3.img= \ +-s 1:0,ahci,hd:/tmp/freebsd1.img,hd:/tmp/freebsd2.img,hd:/tmp/freebsd3.img= \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:0e:d2:6f bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args b/tes= ts/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args index 3ba5c11608..ee1edb5bbf 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args @@ -5,5 +5,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 1:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:ee:f5:79 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args b= /tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args index b1c0c94d03..9d15ff1d7c 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args @@ -5,5 +5,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,xhci,tablet \ --s 3:0,ahci-hd,/tmp/freebsd.img bhyve +-s 1:0,xhci,tablet \ +-s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args b/tests/b= hyvexml2argvdata/bhyvexml2argv-localtime.args index 307d888c1f..d38aefd393 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args @@ -4,5 +4,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 1:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:82:ca:a3 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args b/tests/bhy= vexml2argvdata/bhyvexml2argv-macaddr.args index 5e13a9742d..9da11060c9 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args @@ -5,5 +5,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 1:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:22:ee:11 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args b/tests/b= hyvexml2argvdata/bhyvexml2argv-net-e1000.args index 09e30db46e..05fddf011d 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args @@ -5,5 +5,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 1:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,e1000,faketapdev,mac=3D52:54:00:00:00:00 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args = b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args index 42a278208d..02846cb893 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args @@ -5,7 +5,7 @@ -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:a7:cd:5b \ --s 1,lpc \ -l com1,/dev/nmdm0A bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args b/tests= /bhyvexml2argvdata/bhyvexml2argv-serial-grub.args index 313724dc90..e4712b448c 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args @@ -5,7 +5,7 @@ -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:f0:72:11 \ --s 1,lpc \ -l com1,/dev/nmdm0A bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args b/tests/bhyv= exml2argvdata/bhyvexml2argv-serial.args index 059e457072..f45a190137 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args @@ -5,7 +5,7 @@ -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:4f:f3:5b \ --s 1,lpc \ -l com1,/dev/nmdm0A bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args b/tests/bhyvex= ml2argvdata/bhyvexml2argv-uefi.args index 8ff8673ed4..937b066e8c 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args @@ -6,6 +6,6 @@ -P \ -s 0:0,hostbridge \ -l bootrom,/path/to/test.fd \ +-s 1:0,lpc \ -s 2:0,ahci,hd:/tmp/freebsd.img \ --s 3:0,virtio-net,faketapdev,mac=3D52:54:00:00:00:00 \ --s 1,lpc bhyve +-s 3:0,virtio-net,faketapdev,mac=3D52:54:00:00:00:00 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args b/test= s/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args index 039526ff35..551469dabe 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args @@ -6,7 +6,7 @@ -P \ -s 0:0,hostbridge \ -l bootrom,/path/to/test.fd \ +-s 1:0,lpc \ -s 2:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:00:00:00 \ --s 4:0,fbuf,tcp=3D127.0.0.1:5900 \ --s 1,lpc bhyve +-s 4:0,fbuf,tcp=3D127.0.0.1:5900 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args b/te= sts/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args index da37971009..47022e84cf 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args @@ -6,7 +6,7 @@ -P \ -s 0:0,hostbridge \ -l bootrom,/path/to/test.fd \ +-s 1:0,lpc \ -s 2:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:00:00:00 \ --s 4:0,fbuf,tcp=3D127.0.0.1:5904,vga=3Dio \ --s 1,lpc bhyve +-s 4:0,fbuf,tcp=3D127.0.0.1:5904,vga=3Dio bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args b/t= ests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args index 70347ee0b6..923098f3db 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args @@ -6,7 +6,7 @@ -P \ -s 0:0,hostbridge \ -l bootrom,/path/to/test.fd \ +-s 1:0,lpc \ -s 2:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:00:00:00 \ --s 4:0,fbuf,tcp=3D127.0.0.1:5904,vga=3Doff \ --s 1,lpc bhyve +-s 4:0,fbuf,tcp=3D127.0.0.1:5904,vga=3Doff bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args b/te= sts/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args index d0e1d81e2a..9225f5d133 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args @@ -6,7 +6,7 @@ -P \ -s 0:0,hostbridge \ -l bootrom,/path/to/test.fd \ +-s 1:0,lpc \ -s 2:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:00:00:00 \ --s 4:0,fbuf,tcp=3D127.0.0.1:5904,vga=3Don \ --s 1,lpc bhyve +-s 4:0,fbuf,tcp=3D127.0.0.1:5904,vga=3Don bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args b/tests/bhyvexm= l2argvdata/bhyvexml2argv-vnc.args index 90889b8f39..cd7a543265 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args @@ -6,7 +6,7 @@ -P \ -s 0:0,hostbridge \ -l bootrom,/path/to/test.fd \ +-s 1:0,lpc \ -s 2:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:00:00:00 \ --s 4:0,fbuf,tcp=3D127.0.0.1:5904 \ --s 1,lpc bhyve +-s 4:0,fbuf,tcp=3D127.0.0.1:5904 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.args b/tests/bhyve= xml2argvdata/bhyvexml2argv-wired.args index 13d4f49095..ae750335a9 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-wired.args @@ -6,5 +6,5 @@ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 1:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:b9:94:02 bhyve diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 4a7f65a8e2..78e4f9a68c 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -211,6 +211,7 @@ mymain(void) DO_TEST("cputopology"); DO_TEST_FAILURE("cputopology-nvcpu-mismatch"); DO_TEST("commandline"); + DO_TEST("explicit-lpc"); =20 /* Address allocation tests */ DO_TEST("addr-single-sata-disk"); @@ -218,6 +219,8 @@ 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-slot-1-not-lpc"); + DO_TEST("addr-slot-1-and-31-not-lpc"); =20 /* The same without 32 devs per controller support */ driver.bhyvecaps ^=3D BHYVE_CAP_AHCI32SLOT; diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-acpiapic.xml b/tests= /bhyvexml2xmloutdata/bhyvexml2xmlout-acpiapic.xml index 0a9b284ffb..ffcc6912a1 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-acpiapic.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-acpiapic.xml @@ -25,7 +25,7 @@ -
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-more-than-32-sa= ta-disks.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-more-than-32-= sata-disks.xml index ac3799936f..99fdcb69fd 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-more-than-32-sata-disk= s.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-more-than-32-sata-disk= s.xml @@ -231,16 +231,16 @@ -
+
-
+
-
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-sata-d= isks.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-sata-dis= ks.xml index ac4cbb4ea2..757661a9cc 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-sata-disks.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-sata-disks.xml @@ -33,13 +33,13 @@ -
+
-
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-virtio= -disks.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-virtio= -disks.xml index 542bff121c..6cf4aec932 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-virtio-disks.= xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-virtio-disks.= xml @@ -17,19 +17,19 @@ -
+
-
+
-
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-multip= le-sata-disks.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs= -multiple-sata-disks.xml index e4be4b9a40..da0f39731b 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-multiple-sata= -disks.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-multiple-sata= -disks.xml @@ -33,19 +33,19 @@ -
+
-
+
-
+
-
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-single= -sata-disk.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-si= ngle-sata-disk.xml index 53fa67a3ed..22fd2a29cb 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-single-sata-d= isk.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-single-sata-d= isk.xml @@ -21,13 +21,13 @@ -
+
-
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-sata-dis= k.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-sata-disk.xml index 53fa67a3ed..22fd2a29cb 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-sata-disk.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-sata-disk.xml @@ -21,13 +21,13 @@ -
+
-
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-virtio-d= isk.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-virtio-disk= .xml index d7abb5abcd..d16f8d814d 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-virtio-disk.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-virtio-disk.xml @@ -17,7 +17,7 @@ -
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-slot-1-and-31-n= ot-lpc.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-slot-1-and-31-n= ot-lpc.xml new file mode 100644 index 0000000000..66ba229336 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-slot-1-and-31-not-lpc.= 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-slot-1-not-lpc.= xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-slot-1-not-lpc.xml new file mode 100644 index 0000000000..7f229a28d7 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-slot-1-not-lpc.xml @@ -0,0 +1,36 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + + + + +
+ + +
+ + +
+ + + + + + +
+ + + diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-base.xml b/tests/bhy= vexml2xmloutdata/bhyvexml2xmlout-base.xml index 56ff3bd14b..5943b3549e 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-base.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-base.xml @@ -21,7 +21,7 @@ -
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder.= xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder.xml index c4705d9a8b..6718603be8 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder.xml @@ -28,7 +28,7 @@ -
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder1= .xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder1.xml index ebc781e740..a3dbb6cce7 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder1.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder1.xml @@ -28,7 +28,7 @@ -
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder2= .xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder2.xml index 389355f913..719c2600bb 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder2.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder2.xml @@ -21,7 +21,7 @@ -
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder3= .xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder3.xml index 10ba217934..5e6ecd8992 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder3.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder3.xml @@ -28,7 +28,7 @@ -
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder4= .xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder4.xml index 2215c7327e..6fa65f5ff3 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder4.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder4.xml @@ -29,7 +29,7 @@ -
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-explicitar= gs.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-explicitargs.x= ml index 6c6ed114d9..7af3fba221 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-explicitargs.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-explicitargs.xml @@ -21,7 +21,7 @@ -
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-commandline.xml b/te= sts/bhyvexml2xmloutdata/bhyvexml2xmlout-commandline.xml index 7e6b0e430f..40fc11c898 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-commandline.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-commandline.xml @@ -21,7 +21,7 @@ -
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console.xml b/tests/= bhyvexml2xmloutdata/bhyvexml2xmlout-console.xml index 78d4d30016..c819a8ee76 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console.xml @@ -20,6 +20,9 @@
+ +
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-custom-loader.xml b/= tests/bhyvexml2xmloutdata/bhyvexml2xmlout-custom-loader.xml index 8bb0d53b76..d861f7651a 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-custom-loader.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-custom-loader.xml @@ -22,7 +22,7 @@ -
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom-grub.xml = b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom-grub.xml index b624f3d973..65a9e45d99 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom-grub.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom-grub.xml @@ -22,7 +22,7 @@ -
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom.xml b/tes= ts/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom.xml index ef3cd9fff2..6de2cd5b98 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom.xml @@ -22,7 +22,7 @@ -
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-explicit-lpc.xml b/t= ests/bhyvexml2xmloutdata/bhyvexml2xmlout-explicit-lpc.xml new file mode 100644 index 0000000000..76814bf2b5 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-explicit-lpc.xml @@ -0,0 +1,36 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + + + + +
+ + +
+ + + +
+ + + + + +
+ + + diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder.xml b= /tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder.xml index da55c0aaef..0c88805f00 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder.xml @@ -34,7 +34,7 @@ -
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder2.xml = b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder2.xml index 3974d5bc58..e12e04921b 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder2.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder2.xml @@ -36,7 +36,7 @@ -
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-defaults.xml b/= tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-defaults.xml index 270d41c831..019b802ee9 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-defaults.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-defaults.xml @@ -21,7 +21,7 @@ -
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-input-xhci-tablet.xm= l b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-input-xhci-tablet.xml index 797868e7f2..9a062f97b0 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-input-xhci-tablet.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-input-xhci-tablet.xml @@ -20,11 +20,11 @@
-
+
-
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-localtime.xml b/test= s/bhyvexml2xmloutdata/bhyvexml2xmlout-localtime.xml index 2d1b729e69..c956f70dd0 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-localtime.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-localtime.xml @@ -21,7 +21,7 @@ -
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-macaddr.xml b/tests/= bhyvexml2xmloutdata/bhyvexml2xmlout-macaddr.xml index 6710818ee8..e7c3217dc6 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-macaddr.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-macaddr.xml @@ -21,7 +21,7 @@ -
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-metadata.xml b/tests= /bhyvexml2xmloutdata/bhyvexml2xmlout-metadata.xml index 5c5109404d..9003e694b8 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-metadata.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-metadata.xml @@ -25,13 +25,13 @@ -
+
-
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub-nocons.x= ml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub-nocons.xml index 845cb09e9f..ea7bd9e949 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub-nocons.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub-nocons.xml @@ -20,6 +20,9 @@
+ +
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub.xml b/te= sts/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub.xml index 6c8fda32af..237320874b 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub.xml @@ -20,6 +20,9 @@
+ +
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial.xml b/tests/b= hyvexml2xmloutdata/bhyvexml2xmlout-serial.xml index eb50cc05ad..431a169da2 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial.xml @@ -20,6 +20,9 @@
+ +
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-autoport.xml b/t= ests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-autoport.xml index d6cfe76b70..6f76f82233 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-autoport.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-autoport.xml @@ -21,6 +21,9 @@
+ +
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-io.xml b= /tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-io.xml index 9e470e432e..54ea8fd3ea 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-io.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-io.xml @@ -21,6 +21,9 @@
+ +
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-off.xml = b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-off.xml index 89c4ceac57..27d60ea9ec 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-off.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-off.xml @@ -21,6 +21,9 @@
+ +
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-on.xml b= /tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-on.xml index 86d8939364..835f13ca34 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-on.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-on.xml @@ -21,6 +21,9 @@
+ +
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc.xml b/tests/bhyv= exml2xmloutdata/bhyvexml2xmlout-vnc.xml index 9e470e432e..54ea8fd3ea 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc.xml @@ -21,6 +21,9 @@
+ +
+
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-wired.xml b/tests/bh= yvexml2xmloutdata/bhyvexml2xmlout-wired.xml index ed564e2777..37e6bd14fd 100644 --- a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-wired.xml +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-wired.xml @@ -24,7 +24,7 @@ -
+
diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index ed421b8839..ee0860948d 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("explicit-lpc"); =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-slot-1-not-lpc"); + DO_TEST_DIFFERENT("addr-slot-1-and-31-not-lpc"); =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 From nobody Fri Apr 26 22:45:51 2024 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 1549811360909887.3165482106265; Sun, 10 Feb 2019 07:09:20 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 11CBA3DE0B; Sun, 10 Feb 2019 15:09:18 +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 A9B661054FD2; Sun, 10 Feb 2019 15:09:17 +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 5146518005C8; Sun, 10 Feb 2019 15:09:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1AF9CPG023854 for ; Sun, 10 Feb 2019 10:09:12 -0500 Received: by smtp.corp.redhat.com (Postfix) id 67586271AF; Sun, 10 Feb 2019 15:09:12 +0000 (UTC) Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 58D8727BD9 for ; Sun, 10 Feb 2019 15:09:12 +0000 (UTC) Received: from mail-lf1-f68.google.com (mail-lf1-f68.google.com [209.85.167.68]) (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 E3717C01DE0F for ; Sun, 10 Feb 2019 15:09:10 +0000 (UTC) Received: by mail-lf1-f68.google.com with SMTP id n23so5860400lfl.4 for ; Sun, 10 Feb 2019 07:09:10 -0800 (PST) Received: from kloomba.my.domain ([31.29.234.59]) by smtp.gmail.com with ESMTPSA id w24-v6sm1310001ljh.83.2019.02.10.07.09.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Feb 2019 07:09:07 -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=dfNGXA4KjWIjkinXdH0tGWAOO6tauLTZq6doWbngHKk=; b=agyTcEjQVUn7yXEC90ef6Fyl8N+ix/YtSZGCHdJgTmHbWNhOx+XNXYoOryfxWClhx8 DNq+KHX31ulcX1hsi3X6kPidzU6ZuZXwSb+faEUvi6gRf8e0SCBul6x7mMBG63nJC8o8 UMOeYx+xLKnl/z0+P2e5ddSZCebqxQPIoCxCLHuPH+LjhJY26Zg0psfJz1XpttwFqjIA rdV9j9zfbIKzOhw14NXsKjl8fIFP7vPy2s1NDMnC42dvFUWFyNmYGciz4GP+I0YPBGn9 bqY0I4bnwjXZIQxiPXyyoY97oa+EpVvyeDD4ATWALBtm7GN74ayGCpHZLf0EAsTOAVPR V4jQ== 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=dfNGXA4KjWIjkinXdH0tGWAOO6tauLTZq6doWbngHKk=; b=nYYWHVR8CuIRGjjXZupPfVmCxCQy6P/zEKBwY850kO65QOQr+AIK7ZT+dko7jtjAaM T4x/4Rst9YxhcB4nBAssCVu81Hnp2L4sNj1Sb42tnN7ypBT5e7WJSKebAbsS2UjdaX6R 3IjFtdpPkvsSjL5q+zLSh3FYBjJFP+u3r6ZUoHctSAof8Hm6oVu022Pc8nidyJQmIReA u2rXzVufnpHn8AMuk4bvR8Umgc+9EE7Zjt0hLfhNcjAeRaEpkk64sLPSoNhzSr0W+qGn 6eqnwSRRvt2lITpr0coZN3HqzS0m7vJ3Qp8YGBIltO9KlAcsthnruAAGL7iiug8m36wb 2NvQ== X-Gm-Message-State: AHQUAuYxEfi+udubhr+4D6QX6MUu/6OhB3NcJMqaVkO1oREDoBnYIY3Y 4ELX9j2Q3F/yYccV145YcmUWsh1z X-Google-Smtp-Source: AHgI3IYn22xR9h37UBNzt0YsBwTuw4X1TEI0YHQBfMGDR9ea7pOseYyVYlAsqbAzmjPcs9ambg+nuw== X-Received: by 2002:a19:cd45:: with SMTP id d66mr19217107lfg.165.1549811348383; Sun, 10 Feb 2019 07:09:08 -0800 (PST) From: Roman Bogorodskiy To: libvir-list@redhat.com Date: Sun, 10 Feb 2019 19:08:54 +0400 Message-Id: <20190210150855.24867-4-bogorodskiy@gmail.com> In-Reply-To: <20190210150855.24867-1-bogorodskiy@gmail.com> References: <20190210150855.24867-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.31]); Sun, 10 Feb 2019 15:09:11 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Sun, 10 Feb 2019 15:09:11 +0000 (UTC) for IP:'209.85.167.68' DOMAIN:'mail-lf1-f68.google.com' HELO:'mail-lf1-f68.google.com' FROM:'bogorodskiy@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.111 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_PASS) 209.85.167.68 mail-lf1-f68.google.com 209.85.167.68 mail-lf1-f68.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.31 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Roman Bogorodskiy Subject: [libvirt] [PATCH 3/4] docs: bhyve: document isa-bridge addressing 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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Sun, 10 Feb 2019 15:09:18 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Document ability to specify LCP PCI-ISA bridge PCI address. Signed-off-by: Roman Bogorodskiy --- docs/drvbhyve.html.in | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/docs/drvbhyve.html.in b/docs/drvbhyve.html.in index 2e9cf5551b..18bfb94b48 100644 --- a/docs/drvbhyve.html.in +++ b/docs/drvbhyve.html.in @@ -462,6 +462,28 @@ Example:

</domain> =20 +

LPC PCI-ISA bridge address

+ +

LPC PCI-ISA bridge is used in bhyve to attach serial ports and a boot R= OM. +By default, the bhyve driver assigns PCI slot 1 for it. +However, sometimes it may be necessary to use other slot for it. +For example, placing it on slot 31 instead of slot 1 will look like this:<= /p> + +

+<domain type=3D"bhyve">
+  ...
+  <devices>
+    ...
+    <controller type=3D'pci' index=3D'1' model=3D'isa-bridge'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f=
' function=3D'0x0'/>
+    </controller>
+    ...
+  </devices>
+</domain>
+
+ +

This is supported since 5.1.0.

+

Pass-through of arbitrary bhyve commands =20

Since 5.1.0, it's possible to pass additio= nal command-line --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 26 22:45:51 2024 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 1549811388600553.7720619880346; Sun, 10 Feb 2019 07:09:48 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 807F5C0703A8; Sun, 10 Feb 2019 15:09: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 4F04A27C3E; Sun, 10 Feb 2019 15:09: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 0E5C618033A9; Sun, 10 Feb 2019 15:09:46 +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 x1AF9F7l023879 for ; Sun, 10 Feb 2019 10:09:15 -0500 Received: by smtp.corp.redhat.com (Postfix) id E16955D978; Sun, 10 Feb 2019 15:09:15 +0000 (UTC) Received: from mx1.redhat.com (ext-mx02.extmail.prod.ext.phx2.redhat.com [10.5.110.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D68195DF5D for ; Sun, 10 Feb 2019 15:09:13 +0000 (UTC) Received: from mail-lj1-f196.google.com (mail-lj1-f196.google.com [209.85.208.196]) (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 BA66E86679 for ; Sun, 10 Feb 2019 15:09:11 +0000 (UTC) Received: by mail-lj1-f196.google.com with SMTP id l7-v6so170489ljg.9 for ; Sun, 10 Feb 2019 07:09:11 -0800 (PST) Received: from kloomba.my.domain ([31.29.234.59]) by smtp.gmail.com with ESMTPSA id w24-v6sm1310001ljh.83.2019.02.10.07.09.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Feb 2019 07:09:08 -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=4ur9S9w5pbhLUw5/jqciLSDKIVUVEuJ7vca8BYt+28o=; b=hM7waGUmCmrQvHHwdIIQ+tgvHcjfVPjWMcKO+ebZdMnuW9k2TxocaUq3zbNN7AT9Qw Url+6xImaB9e1xtrPXrCii9nMh2xX74uEh1EkiifBqTd322FTINkInYDZmhlRoehKdAB NI9YnCL2vNJ5vxtNiQARE1ZbuHwuvPwuX0O/gq+Kf9Y28jp6lB+5VAzva6bTC6HxS0Hk 3jYNEOxjLBRTmiLi0SUJwin3OcNF5howId/5w6fysJjJ3crX1vjLwyqJLn3FS+8KlLjD QHno6L+MFsKsmydbc5VXW2tWYSo7ufLxYY1c5OcLI1/SBdFmszQgbD4yMI9XPgq7pUOn /8hQ== 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=4ur9S9w5pbhLUw5/jqciLSDKIVUVEuJ7vca8BYt+28o=; b=UlPN1Ru2xFCGqjTphDkgJ0bxnHUVxwh1NCUB8BoQme46GET4GOftq0AuVbK7okwhws jYaNSP4lXpt7aN95RDtSbRH4kXVBaFebj6ScrROctKWpYWtEeeBrnNsveSqu+IGYL0ri R6/6QE6y0tj4JIcdElvMwzjRsZV92S2TMgLqgvIz4cxMQtaxyq0Y2hjpwvgOpIhvRv3c WWjrACwfIkqkU7Ef7pNskqa9tlmsf+98kXaiKvay/V8vjFQyraQD4vNAtOurmtvrBzxt hGbn0jSAnYBmy4AMXjfI5HB55aGVXjYWSUa6qxye3Kvx8bYrvBAKjjCUdK9+NRBfx2AP /vhQ== X-Gm-Message-State: AHQUAuZebOJExAjnKMRDlvr2wHCujwWYUc5OBewYsWnEd53vD5w/wGw9 /gIpzRXYFBDKFowzia+sMq6Sg3o6 X-Google-Smtp-Source: AHgI3IatOs0Ttn0mIN2P2BkF5bVICPFOb6+4BI8ooKvJNic0Cbxbn18nEhnZb0UAQg9AtuuJVGGQOA== X-Received: by 2002:a2e:9181:: with SMTP id f1-v6mr20275479ljg.64.1549811349810; Sun, 10 Feb 2019 07:09:09 -0800 (PST) From: Roman Bogorodskiy To: libvir-list@redhat.com Date: Sun, 10 Feb 2019 19:08:55 +0400 Message-Id: <20190210150855.24867-5-bogorodskiy@gmail.com> In-Reply-To: <20190210150855.24867-1-bogorodskiy@gmail.com> References: <20190210150855.24867-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.26]); Sun, 10 Feb 2019 15:09:12 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Sun, 10 Feb 2019 15:09:12 +0000 (UTC) for IP:'209.85.208.196' DOMAIN:'mail-lj1-f196.google.com' HELO:'mail-lj1-f196.google.com' FROM:'bogorodskiy@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.111 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_PASS) 209.85.208.196 mail-lj1-f196.google.com 209.85.208.196 mail-lj1-f196.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.26 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Roman Bogorodskiy Subject: [libvirt] [PATCH 4/4] news: document bhyve isa-bridge changes 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.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Sun, 10 Feb 2019 15:09:47 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Roman Bogorodskiy --- docs/news.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 8d6d58ae6a..e0c9c3590f 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -59,6 +59,16 @@ of the network's bridge element. + +

+ bhyve: allow to configure LPC PCI address + + + The bhyve driver now explicty models LPC PCI-ISA bridge, thus + allowing to specify PCI address for it instead of using + the default PCI slot 1. + +
--=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list