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

2018-03-02 Thread 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 
> ---
>  src/qemu/qemu_domain.c | 68 
> +++---
>  1 file changed, 43 insertions(+), 25 deletions(-)
>
> diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
> index 13c2b557fb..3ef5d74e7a 100644
> --- a/src/qemu/qemu_domain.c
> +++ b/src/qemu/qemu_domain.c
> @@ -4285,31 +4285,6 @@ qemuDomainDeviceDefValidateControllerPCIOld(const 
> virDomainControllerDef *contro
>  controller->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT)
>  return 0;
>  
> -/* First pass - just check the controller index for the model's
> - * that we care to check... */
> -switch (model) {
> -case VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE:
> -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:
> -if (controller->idx == 0) {
> -virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> -   _("index for pci controllers of model '%s' must 
> be > 0"),
> -   virDomainControllerModelPCITypeToString(model));
> -return -1;
> -}
> -break;
> -
> -case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT:
> -case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT:
> -case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT:
> -case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST:
> -break;
> -}
> -
>  pciopts = >opts.pciopts;
>  
>  /* Second pass - now the model specific checks */
> @@ -4627,6 +4602,49 @@ qemuDomainDeviceDefValidateControllerPCI(const 
> virDomainControllerDef *cont,
>  return -1;
>  }
>  
> +/* index */
> +switch ((virDomainControllerModelPCI) cont->model) {
> +case VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE:
> +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:
> +if (cont->idx == 0) {
> +virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> +   _("Index for '%s' controllers must be > 0"),
> +   model);
> +return -1;
> +}
> +break;
> +
> +case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT:
> +case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT:
> +/* pSeries guests can have multiple PHBs, so it's expected that
> + * the index will not be zero for some of them */
> +if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT &&
> +pciopts->modelName == 
> VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_SPAPR_PCI_HOST_BRIDGE) {
> +break;
> +}
> +
> +/* For all other pci-root and pcie-root controllers, though,
> + * the index must be zero*/
> +if (cont->idx != 0) {
> +virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> +   _("Index for '%s' controllers must be 0"),
> +   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);
>  }
>  


Reviewed-by: Laine Stump 


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

[libvirt] [PATCH v5 04/12] qemu: Validate PCI controller options (index)

2018-03-02 Thread Andrea Bolognani 
https://bugzilla.redhat.com/show_bug.cgi?id=1483816

Signed-off-by: Andrea Bolognani 
---
 src/qemu/qemu_domain.c | 68 +++---
 1 file changed, 43 insertions(+), 25 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 13c2b557fb..3ef5d74e7a 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4285,31 +4285,6 @@ qemuDomainDeviceDefValidateControllerPCIOld(const 
virDomainControllerDef *contro
 controller->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT)
 return 0;
 
-/* First pass - just check the controller index for the model's
- * that we care to check... */
-switch (model) {
-case VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE:
-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:
-if (controller->idx == 0) {
-virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-   _("index for pci controllers of model '%s' must be 
> 0"),
-   virDomainControllerModelPCITypeToString(model));
-return -1;
-}
-break;
-
-case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT:
-case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT:
-case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT:
-case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST:
-break;
-}
-
 pciopts = >opts.pciopts;
 
 /* Second pass - now the model specific checks */
@@ -4627,6 +4602,49 @@ qemuDomainDeviceDefValidateControllerPCI(const 
virDomainControllerDef *cont,
 return -1;
 }
 
+/* index */
+switch ((virDomainControllerModelPCI) cont->model) {
+case VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE:
+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:
+if (cont->idx == 0) {
+virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+   _("Index for '%s' controllers must be > 0"),
+   model);
+return -1;
+}
+break;
+
+case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT:
+case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT:
+/* pSeries guests can have multiple PHBs, so it's expected that
+ * the index will not be zero for some of them */
+if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT &&
+pciopts->modelName == 
VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_SPAPR_PCI_HOST_BRIDGE) {
+break;
+}
+
+/* For all other pci-root and pcie-root controllers, though,
+ * the index must be zero*/
+if (cont->idx != 0) {
+virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+   _("Index for '%s' controllers must be 0"),
+   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