|
 |
6d3351 |
From 851635352b217b63e7defc703f8a3f2a6719b490 Mon Sep 17 00:00:00 2001
|
|
|
6d3351 |
Message-Id: <851635352b217b63e7defc703f8a3f2a6719b490@dist-git>
|
|
|
6d3351 |
From: Andrea Bolognani <abologna@redhat.com>
|
|
|
6d3351 |
Date: Mon, 17 Jul 2017 12:09:08 +0200
|
|
|
6d3351 |
Subject: [PATCH] conf: Add 'spapr-pci-host-bridge' controller model
|
|
|
6d3351 |
|
|
|
6d3351 |
Adding it to the virDomainControllerPCIModelName enumeration
|
|
|
6d3351 |
is enough for existing code to handle it, so parsing and
|
|
|
6d3351 |
formatting will work without further tweaking.
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
6d3351 |
Reviewed-by: Laine Stump <laine@laine.org>
|
|
|
6d3351 |
(cherry picked from commit 90855eca3f7ceee964727c1d0f54541373d31908)
|
|
|
6d3351 |
|
|
|
6d3351 |
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1431193
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
6d3351 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
---
|
|
|
6d3351 |
docs/schemas/domaincommon.rng | 2 ++
|
|
|
6d3351 |
src/conf/domain_conf.c | 1 +
|
|
|
6d3351 |
src/conf/domain_conf.h | 1 +
|
|
|
6d3351 |
3 files changed, 4 insertions(+)
|
|
|
6d3351 |
|
|
|
6d3351 |
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
|
|
|
6d3351 |
index 78023ff4af..964e5c5bd5 100644
|
|
|
6d3351 |
--- a/docs/schemas/domaincommon.rng
|
|
|
6d3351 |
+++ b/docs/schemas/domaincommon.rng
|
|
|
6d3351 |
@@ -1900,6 +1900,8 @@
|
|
|
6d3351 |
<element name="model">
|
|
|
6d3351 |
<attribute name="name">
|
|
|
6d3351 |
<choice>
|
|
|
6d3351 |
+
|
|
|
6d3351 |
+ <value>spapr-pci-host-bridge</value>
|
|
|
6d3351 |
|
|
|
6d3351 |
<value>pci-bridge</value>
|
|
|
6d3351 |
|
|
|
6d3351 |
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
|
|
6d3351 |
index 8e5c487df8..8a030c9b68 100644
|
|
|
6d3351 |
--- a/src/conf/domain_conf.c
|
|
|
6d3351 |
+++ b/src/conf/domain_conf.c
|
|
|
6d3351 |
@@ -349,6 +349,7 @@ VIR_ENUM_IMPL(virDomainControllerPCIModelName,
|
|
|
6d3351 |
"pxb",
|
|
|
6d3351 |
"pxb-pcie",
|
|
|
6d3351 |
"pcie-root-port",
|
|
|
6d3351 |
+ "spapr-pci-host-bridge",
|
|
|
6d3351 |
);
|
|
|
6d3351 |
|
|
|
6d3351 |
VIR_ENUM_IMPL(virDomainControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST,
|
|
|
6d3351 |
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
|
|
|
6d3351 |
index 4c33b0d15e..e287e6d7f3 100644
|
|
|
6d3351 |
--- a/src/conf/domain_conf.h
|
|
|
6d3351 |
+++ b/src/conf/domain_conf.h
|
|
|
6d3351 |
@@ -710,6 +710,7 @@ typedef enum {
|
|
|
6d3351 |
VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_PXB,
|
|
|
6d3351 |
VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_PXB_PCIE,
|
|
|
6d3351 |
VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_PCIE_ROOT_PORT,
|
|
|
6d3351 |
+ VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_SPAPR_PCI_HOST_BRIDGE,
|
|
|
6d3351 |
|
|
|
6d3351 |
VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_LAST
|
|
|
6d3351 |
} virDomainControllerPCIModelName;
|
|
|
6d3351 |
--
|
|
|
6d3351 |
2.13.3
|
|
|
6d3351 |
|