From nobody Tue Feb 10 19:14:45 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 15504086791581005.2492100120119; Sun, 17 Feb 2019 05:04:39 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 971B23695F; Sun, 17 Feb 2019 13:04:35 +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 156C95D9CA; Sun, 17 Feb 2019 13:04:34 +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 159C7181A00B; Sun, 17 Feb 2019 13:04:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1HD4PeP016352 for ; Sun, 17 Feb 2019 08:04:25 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0C82A1024968; Sun, 17 Feb 2019 13:04:25 +0000 (UTC) Received: from mx1.redhat.com (ext-mx01.extmail.prod.ext.phx2.redhat.com [10.5.110.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 03F5F101E846 for ; Sun, 17 Feb 2019 13:04:24 +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 A14BB7F6C5 for ; Sun, 17 Feb 2019 13:04:23 +0000 (UTC) Received: by mail-lj1-f196.google.com with SMTP id z25so4198401ljk.8 for ; Sun, 17 Feb 2019 05:04:23 -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.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Feb 2019 05:04:20 -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=wxjVDOhKANTM6vNTnIQxqWELb1+wvZhqiYnoG2YVh1g=; b=ON0rGA7YpmMV4uJVR6woxPcuDjb4vFlsu3ucgo0u1OigLrCJNi1rht2/qruJrAs3JB +h+ZWI3U1c6TRnOFARUHaHr4/Cql3AVubMYGBRNCcWhGHnODS4e3f5wtU1VcygAe4JL6 dDFv4nuVcS2comYoub226vNTbRVx4fDy6wu20jG/BfZ0BhUuq/ROe3LkN3g/nuzQHyDB FVX+7+j+hvBIlE70VPO46i/675VK7dJJlwhns+1N88Ho1JEVra34ULYASG68LPW/rNSf 7XOC5o+QYdHIZDTdmn38oQVTKTRigpFdxgcthtMWt1PRDfDV8Rc16+8orKSbQUKgI52X /Seg== 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=wxjVDOhKANTM6vNTnIQxqWELb1+wvZhqiYnoG2YVh1g=; b=BqiDZaRj7b+nZFzAvtvKVh8AHUUpZRr3HxoEdI2LDagMgRtgnEGiMUpurgcLauSeDC UUUlQlBUwCxsCZXE76t0Qk9caectCsrInziw+Bs7tDKYmxDSqnV6x/baxrmy2MZUBK9B baVlTEeL/G8olWyzUZ5f3GTrA+i9+mRTNSHaOVtNztWYrGbxZx3k4kHQcMVY9CGqz77k XlHjNRhDgge9hik7kGvJ9m8xmfeb4wIIyovv97pzNRjzON/U9Ilr9+W0Hz93jDSSfr6+ VBTT1JVHY0Dx9L/oyRRY+RYg65967m/wH3aPlGdd30VpB59OZhL/yh29j7+9rp6cOj9m 8yVw== X-Gm-Message-State: AHQUAuYr+7U2Z7vRS7OZKVIyuMtsJxveWnzWmgC+wx9Xic7oJ1b8PLnC 0ac7eAqZwCC9PsG2+q6cEy9NRBBr X-Google-Smtp-Source: AHgI3IYy02/v7pN4dL0hMuXY3caVavKhwJzLL/LkasUMhB1ypK1/RphWbIAdHIoqIOWQjoThFyIdcQ== X-Received: by 2002:a2e:9786:: with SMTP id y6-v6mr11113448lji.53.1550408661673; Sun, 17 Feb 2019 05:04:21 -0800 (PST) From: Roman Bogorodskiy To: libvir-list@redhat.com Date: Sun, 17 Feb 2019 17:04:00 +0400 Message-Id: <20190217130405.4328-2-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.25]); Sun, 17 Feb 2019 13:04:24 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Sun, 17 Feb 2019 13:04:24 +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.83 on 10.5.110.25 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Roman Bogorodskiy Subject: [libvirt] [PATCH v2 1/6] conf: add 'isa' controller type 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Sun, 17 Feb 2019 13:04:37 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Introduce 'isa' controller type. The only supported model now is 'isa-bridge'. In domain XML it looks this way: ...
... Currently, this is needed for 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 | 13 +++++++++++++ src/conf/domain_conf.c | 10 ++++++++++ src/conf/domain_conf.h | 9 +++++++++ src/qemu/qemu_command.c | 1 + src/qemu/qemu_domain.c | 2 ++ src/qemu/qemu_domain_address.c | 1 + src/vbox/vbox_common.c | 1 + 7 files changed, 37 insertions(+) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index ba80440c72..2bf67eaa5a 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2201,6 +2201,19 @@ + + + + isa + + + + + isa-bridge + + + + diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cd69323f28..4d5fbed6f4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -341,6 +341,7 @@ VIR_ENUM_IMPL(virDomainController, VIR_DOMAIN_CONTROLLE= R_TYPE_LAST, "ccid", "usb", "pci", + "isa", ); =20 VIR_ENUM_IMPL(virDomainControllerModelPCI, VIR_DOMAIN_CONTROLLER_MODEL_PCI= _LAST, @@ -404,6 +405,10 @@ VIR_ENUM_IMPL(virDomainControllerModelIDE, VIR_DOMAIN_= CONTROLLER_MODEL_IDE_LAST, "ich6", ); =20 +VIR_ENUM_IMPL(virDomainControllerModelISA, VIR_DOMAIN_CONTROLLER_MODEL_ISA= _LAST, + "isa-bridge", +); + VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, "mount", "block", @@ -2041,6 +2046,7 @@ virDomainControllerDefNew(virDomainControllerType typ= e) case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: case VIR_DOMAIN_CONTROLLER_TYPE_SATA: case VIR_DOMAIN_CONTROLLER_TYPE_CCID: + case VIR_DOMAIN_CONTROLLER_TYPE_ISA: case VIR_DOMAIN_CONTROLLER_TYPE_LAST: break; } @@ -10445,6 +10451,8 @@ virDomainControllerModelTypeFromString(const virDom= ainControllerDef *def, return virDomainControllerModelPCITypeFromString(model); else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE) return virDomainControllerModelIDETypeFromString(model); + else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_ISA) + return virDomainControllerModelISATypeFromString(model); =20 return -1; } @@ -10462,6 +10470,8 @@ virDomainControllerModelTypeToString(virDomainContr= ollerDefPtr def, return virDomainControllerModelPCITypeToString(model); else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE) return virDomainControllerModelIDETypeToString(model); + else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_ISA) + return virDomainControllerModelISATypeToString(model); =20 return NULL; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 2bc3f879f7..3c595aab62 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -687,6 +687,7 @@ typedef enum { VIR_DOMAIN_CONTROLLER_TYPE_CCID, VIR_DOMAIN_CONTROLLER_TYPE_USB, VIR_DOMAIN_CONTROLLER_TYPE_PCI, + VIR_DOMAIN_CONTROLLER_TYPE_ISA, =20 VIR_DOMAIN_CONTROLLER_TYPE_LAST } virDomainControllerType; @@ -767,6 +768,13 @@ typedef enum { VIR_DOMAIN_CONTROLLER_MODEL_IDE_LAST } virDomainControllerModelIDE; =20 +typedef enum { + VIR_DOMAIN_CONTROLLER_MODEL_ISA_DEFAULT =3D -1, + VIR_DOMAIN_CONTROLLER_MODEL_ISA_BRIDGE, + + VIR_DOMAIN_CONTROLLER_MODEL_ISA_LAST +} virDomainControllerModelISA; + # define IS_USB2_CONTROLLER(ctrl) \ (((ctrl)->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB) && \ ((ctrl)->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_EHCI1 || \ @@ -3423,6 +3431,7 @@ VIR_ENUM_DECL(virDomainControllerPCIModelName); VIR_ENUM_DECL(virDomainControllerModelSCSI); VIR_ENUM_DECL(virDomainControllerModelUSB); VIR_ENUM_DECL(virDomainControllerModelIDE); +VIR_ENUM_DECL(virDomainControllerModelISA); VIR_ENUM_DECL(virDomainFS); VIR_ENUM_DECL(virDomainFSDriver); VIR_ENUM_DECL(virDomainFSAccessMode); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f511193fca..7203a2762c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3024,6 +3024,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, =20 case VIR_DOMAIN_CONTROLLER_TYPE_IDE: case VIR_DOMAIN_CONTROLLER_TYPE_FDC: + case VIR_DOMAIN_CONTROLLER_TYPE_ISA: case VIR_DOMAIN_CONTROLLER_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported controller type: %s"), diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ac01e861f7..306f957eb7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5851,6 +5851,7 @@ qemuDomainDeviceDefValidateController(const virDomain= ControllerDef *controller, case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: case VIR_DOMAIN_CONTROLLER_TYPE_CCID: case VIR_DOMAIN_CONTROLLER_TYPE_USB: + case VIR_DOMAIN_CONTROLLER_TYPE_ISA: case VIR_DOMAIN_CONTROLLER_TYPE_LAST: break; } @@ -6469,6 +6470,7 @@ qemuDomainControllerDefPostParse(virDomainControllerD= efPtr cont, case VIR_DOMAIN_CONTROLLER_TYPE_CCID: case VIR_DOMAIN_CONTROLLER_TYPE_IDE: case VIR_DOMAIN_CONTROLLER_TYPE_FDC: + case VIR_DOMAIN_CONTROLLER_TYPE_ISA: case VIR_DOMAIN_CONTROLLER_TYPE_LAST: break; } diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 32fdd59566..3e072ee8fd 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -669,6 +669,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDevic= eDefPtr dev, =20 case VIR_DOMAIN_CONTROLLER_TYPE_FDC: case VIR_DOMAIN_CONTROLLER_TYPE_CCID: + case VIR_DOMAIN_CONTROLLER_TYPE_ISA: case VIR_DOMAIN_CONTROLLER_TYPE_LAST: /* should be 0 */ return pciFlags; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 664650f217..6b75a127f8 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -377,6 +377,7 @@ vboxSetStorageController(virDomainControllerDefPtr cont= roller, case VIR_DOMAIN_CONTROLLER_TYPE_CCID: case VIR_DOMAIN_CONTROLLER_TYPE_USB: case VIR_DOMAIN_CONTROLLER_TYPE_PCI: + case VIR_DOMAIN_CONTROLLER_TYPE_ISA: case VIR_DOMAIN_CONTROLLER_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("The vbox driver does not support %s controller t= ype"), --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list