Re: [libvirt] [PATCH v5 09/12] qemu: Validate PCI controller options (chassisNr)

[Laine Stump]

On 03/02/2018 10:13 AM, Andrea Bolognani wrote:
> https://bugzilla.redhat.com/show_bug.cgi?id=1483816
>
> Signed-off-by: Andrea Bolognani 

Reviewed-by: Laine Stump 

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH v5 09/12] qemu: Validate PCI controller options (chassisNr)

[Andrea Bolognani]

https://bugzilla.redhat.com/show_bug.cgi?id=1483816

Signed-off-by: Andrea Bolognani 
---
 src/qemu/qemu_domain.c | 40 ++--
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 07ed006f70..d4ac4e2038 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4290,12 +4290,6 @@ qemuDomainDeviceDefValidateControllerPCIOld(const 
virDomainControllerDef *contro
 /* Second pass - now the model specific checks */
 switch (model) {
 case VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE:
-if (pciopts->chassisNr == -1) {
-virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-   _("autogenerated pci-bridge options not set"));
-return -1;
-}
-
 if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_PCI_BRIDGE)) {
 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("the pci-bridge controller is not supported "
@@ -4799,6 +4793,40 @@ qemuDomainDeviceDefValidateControllerPCI(const 
virDomainControllerDef *cont,
 return -1;
 }
 
+/* chassisNr */
+switch ((virDomainControllerModelPCI) cont->model) {
+case VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE:
+if (pciopts->chassisNr == -1) {
+virReportError(VIR_ERR_INTERNAL_ERROR,
+   _("Option '%s' not set for '%s' controller"),
+   "chassisNr", model);
+return -1;
+}
+break;
+
+case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT:
+case VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE:
+case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT:
+case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT:
+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_PCIE_ROOT:
+if (pciopts->chassisNr != -1) {
+virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+   _("Option '%s' is not valid for '%s' controller"),
+   "chassisNr", model);
+return -1;
+}
+break;
+
+case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT:
+case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST:
+default:
+virReportEnumRangeError(virDomainControllerModelPCI, cont->model);
+return -1;
+}
+
 return qemuDomainDeviceDefValidateControllerPCIOld(cont, def, qemuCaps);
 }
 
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list