[v2] Simplify initialization of PC machines

[PATCH v2 2/6] hw/i386/pc: Rename "bus" attribute to "pcibus"

Posted by Bernhard Beschow 9 months ago

The attribute is of type PCIBus; reflect that in the name. It will also make the
next change more intuitive.

Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 include/hw/i386/pc.h     | 2 +-
 hw/i386/acpi-build.c     | 2 +-
 hw/i386/amd_iommu.c      | 2 +-
 hw/i386/intel_iommu.c    | 2 +-
 hw/i386/kvm/xen_evtchn.c | 2 +-
 hw/i386/pc.c             | 8 ++++----
 hw/i386/pc_piix.c        | 6 +++---
 hw/i386/pc_q35.c         | 2 +-
 hw/i386/x86-iommu.c      | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index e88468131a..27834043c3 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -31,7 +31,7 @@ typedef struct PCMachineState {
     Notifier machine_done;
 
     /* Pointers to devices and objects: */
-    PCIBus *bus;
+    PCIBus *pcibus;
     I2CBus *smbus;
     PFlashCFI01 *flash[2];
     ISADevice *pcspk;
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index d3ce96dd9f..cd3f2d0148 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1556,7 +1556,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
     }
 
     crs_range_set_init(&crs_range_set);
-    bus = PC_MACHINE(machine)->bus;
+    bus = PC_MACHINE(machine)->pcibus;
     if (bus) {
         QLIST_FOREACH(bus, &bus->child, sibling) {
             uint8_t bus_num = pci_bus_num(bus);
diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c
index 7329553ad3..6d4fde72f9 100644
--- a/hw/i386/amd_iommu.c
+++ b/hw/i386/amd_iommu.c
@@ -1584,7 +1584,7 @@ static void amdvi_sysbus_realize(DeviceState *dev, Error **errp)
     MachineState *ms = MACHINE(qdev_get_machine());
     PCMachineState *pcms = PC_MACHINE(ms);
     X86MachineState *x86ms = X86_MACHINE(ms);
-    PCIBus *bus = pcms->bus;
+    PCIBus *bus = pcms->pcibus;
 
     s->iotlb = g_hash_table_new_full(amdvi_uint64_hash,
                                      amdvi_uint64_equal, g_free, g_free);
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index cf933189d3..cc8e59674e 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -4183,7 +4183,7 @@ static void vtd_realize(DeviceState *dev, Error **errp)
     MachineState *ms = MACHINE(qdev_get_machine());
     PCMachineState *pcms = PC_MACHINE(ms);
     X86MachineState *x86ms = X86_MACHINE(ms);
-    PCIBus *bus = pcms->bus;
+    PCIBus *bus = pcms->pcibus;
     IntelIOMMUState *s = INTEL_IOMMU_DEVICE(dev);
     X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(s);
 
diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c
index 0171ef6d59..a5052c0ea3 100644
--- a/hw/i386/kvm/xen_evtchn.c
+++ b/hw/i386/kvm/xen_evtchn.c
@@ -371,7 +371,7 @@ static int set_callback_pci_intx(XenEvtchnState *s, uint64_t param)
         return 0;
     }
 
-    pdev = pci_find_device(pcms->bus, bus, devfn);
+    pdev = pci_find_device(pcms->pcibus, bus, devfn);
     if (!pdev) {
         return 0;
     }
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index f8eb684a49..353edeb2ea 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -675,7 +675,7 @@ void pc_machine_done(Notifier *notifier, void *data)
                                         PCMachineState, machine_done);
     X86MachineState *x86ms = X86_MACHINE(pcms);
 
-    cxl_hook_up_pxb_registers(pcms->bus, &pcms->cxl_devices_state,
+    cxl_hook_up_pxb_registers(pcms->pcibus, &pcms->cxl_devices_state,
                               &error_fatal);
 
     if (pcms->cxl_devices_state.is_enabled) {
@@ -685,7 +685,7 @@ void pc_machine_done(Notifier *notifier, void *data)
     /* set the number of CPUs */
     x86_rtc_set_cpus_count(x86ms->rtc, x86ms->boot_cpus);
 
-    fw_cfg_add_extra_pci_roots(pcms->bus, x86ms->fw_cfg);
+    fw_cfg_add_extra_pci_roots(pcms->pcibus, x86ms->fw_cfg);
 
     acpi_setup();
     if (x86ms->fw_cfg) {
@@ -1250,8 +1250,8 @@ void pc_basic_device_init(struct PCMachineState *pcms,
         xen_evtchn_create(IOAPIC_NUM_PINS, gsi);
         xen_gnttab_create();
         xen_xenstore_create();
-        if (pcms->bus) {
-            pci_create_simple(pcms->bus, -1, "xen-platform");
+        if (pcms->pcibus) {
+            pci_create_simple(pcms->pcibus, -1, "xen-platform");
         }
         xen_bus_init();
         xen_be_init();
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 7724396ead..3393b93007 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -216,7 +216,7 @@ static void pc_init1(MachineState *machine,
         pci_bus_map_irqs(pci_bus,
                          xen_enabled() ? xen_pci_slot_get_pirq
                                        : pc_pci_slot_get_pirq);
-        pcms->bus = pci_bus;
+        pcms->pcibus = pci_bus;
 
         hole64_size = object_property_get_uint(phb,
                                                PCI_HOST_PROP_PCI_HOLE64_SIZE,
@@ -480,8 +480,8 @@ static void pc_xen_hvm_init(MachineState *machine)
     }
 
     pc_xen_hvm_init_pci(machine);
-    xen_igd_reserve_slot(pcms->bus);
-    pci_create_simple(pcms->bus, -1, "xen-platform");
+    xen_igd_reserve_slot(pcms->pcibus);
+    pci_create_simple(pcms->pcibus, -1, "xen-platform");
 }
 #endif
 
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index c89ff63579..734d9bedb2 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -217,7 +217,7 @@ static void pc_q35_init(MachineState *machine)
 
     /* pci */
     host_bus = PCI_BUS(qdev_get_child_bus(DEVICE(phb), "pcie.0"));
-    pcms->bus = host_bus;
+    pcms->pcibus = host_bus;
 
     /* irq lines */
     gsi_state = pc_gsi_create(&x86ms->gsi, true);
diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c
index 726e9e1d16..60af896225 100644
--- a/hw/i386/x86-iommu.c
+++ b/hw/i386/x86-iommu.c
@@ -101,7 +101,7 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp)
     QLIST_INIT(&x86_iommu->iec_notifiers);
     bool irq_all_kernel = kvm_irqchip_in_kernel() && !kvm_irqchip_is_split();
 
-    if (!pcms || !pcms->bus) {
+    if (!pcms || !pcms->pcibus) {
         error_setg(errp, "Machine-type '%s' not supported by IOMMU",
                    mc->name);
         return;
-- 
2.44.0

Re: [PATCH v2 2/6] hw/i386/pc: Rename "bus" attribute to "pcibus"

Posted by Zhao Liu 9 months ago

On Sat, Feb 24, 2024 at 02:58:47PM +0100, Bernhard Beschow wrote:
> Date: Sat, 24 Feb 2024 14:58:47 +0100
> From: Bernhard Beschow <shentey@gmail.com>
> Subject: [PATCH v2 2/6] hw/i386/pc: Rename "bus" attribute to "pcibus"
> X-Mailer: git-send-email 2.44.0
> 
> The attribute is of type PCIBus; reflect that in the name. It will also make the
> next change more intuitive.
> 
> Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
>  include/hw/i386/pc.h     | 2 +-
>  hw/i386/acpi-build.c     | 2 +-
>  hw/i386/amd_iommu.c      | 2 +-
>  hw/i386/intel_iommu.c    | 2 +-
>  hw/i386/kvm/xen_evtchn.c | 2 +-
>  hw/i386/pc.c             | 8 ++++----
>  hw/i386/pc_piix.c        | 6 +++---
>  hw/i386/pc_q35.c         | 2 +-
>  hw/i386/x86-iommu.c      | 2 +-
>  9 files changed, 14 insertions(+), 14 deletions(-)

Reviewed-by: Zhao Liu <zhao1.liu@intel.com>

> 
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index e88468131a..27834043c3 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -31,7 +31,7 @@ typedef struct PCMachineState {
>      Notifier machine_done;
>  
>      /* Pointers to devices and objects: */
> -    PCIBus *bus;
> +    PCIBus *pcibus;
>      I2CBus *smbus;
>      PFlashCFI01 *flash[2];
>      ISADevice *pcspk;
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index d3ce96dd9f..cd3f2d0148 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -1556,7 +1556,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
>      }
>  
>      crs_range_set_init(&crs_range_set);
> -    bus = PC_MACHINE(machine)->bus;
> +    bus = PC_MACHINE(machine)->pcibus;
>      if (bus) {
>          QLIST_FOREACH(bus, &bus->child, sibling) {
>              uint8_t bus_num = pci_bus_num(bus);
> diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c
> index 7329553ad3..6d4fde72f9 100644
> --- a/hw/i386/amd_iommu.c
> +++ b/hw/i386/amd_iommu.c
> @@ -1584,7 +1584,7 @@ static void amdvi_sysbus_realize(DeviceState *dev, Error **errp)
>      MachineState *ms = MACHINE(qdev_get_machine());
>      PCMachineState *pcms = PC_MACHINE(ms);
>      X86MachineState *x86ms = X86_MACHINE(ms);
> -    PCIBus *bus = pcms->bus;
> +    PCIBus *bus = pcms->pcibus;
>  
>      s->iotlb = g_hash_table_new_full(amdvi_uint64_hash,
>                                       amdvi_uint64_equal, g_free, g_free);
> diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
> index cf933189d3..cc8e59674e 100644
> --- a/hw/i386/intel_iommu.c
> +++ b/hw/i386/intel_iommu.c
> @@ -4183,7 +4183,7 @@ static void vtd_realize(DeviceState *dev, Error **errp)
>      MachineState *ms = MACHINE(qdev_get_machine());
>      PCMachineState *pcms = PC_MACHINE(ms);
>      X86MachineState *x86ms = X86_MACHINE(ms);
> -    PCIBus *bus = pcms->bus;
> +    PCIBus *bus = pcms->pcibus;
>      IntelIOMMUState *s = INTEL_IOMMU_DEVICE(dev);
>      X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(s);
>  
> diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c
> index 0171ef6d59..a5052c0ea3 100644
> --- a/hw/i386/kvm/xen_evtchn.c
> +++ b/hw/i386/kvm/xen_evtchn.c
> @@ -371,7 +371,7 @@ static int set_callback_pci_intx(XenEvtchnState *s, uint64_t param)
>          return 0;
>      }
>  
> -    pdev = pci_find_device(pcms->bus, bus, devfn);
> +    pdev = pci_find_device(pcms->pcibus, bus, devfn);
>      if (!pdev) {
>          return 0;
>      }
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index f8eb684a49..353edeb2ea 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -675,7 +675,7 @@ void pc_machine_done(Notifier *notifier, void *data)
>                                          PCMachineState, machine_done);
>      X86MachineState *x86ms = X86_MACHINE(pcms);
>  
> -    cxl_hook_up_pxb_registers(pcms->bus, &pcms->cxl_devices_state,
> +    cxl_hook_up_pxb_registers(pcms->pcibus, &pcms->cxl_devices_state,
>                                &error_fatal);
>  
>      if (pcms->cxl_devices_state.is_enabled) {
> @@ -685,7 +685,7 @@ void pc_machine_done(Notifier *notifier, void *data)
>      /* set the number of CPUs */
>      x86_rtc_set_cpus_count(x86ms->rtc, x86ms->boot_cpus);
>  
> -    fw_cfg_add_extra_pci_roots(pcms->bus, x86ms->fw_cfg);
> +    fw_cfg_add_extra_pci_roots(pcms->pcibus, x86ms->fw_cfg);
>  
>      acpi_setup();
>      if (x86ms->fw_cfg) {
> @@ -1250,8 +1250,8 @@ void pc_basic_device_init(struct PCMachineState *pcms,
>          xen_evtchn_create(IOAPIC_NUM_PINS, gsi);
>          xen_gnttab_create();
>          xen_xenstore_create();
> -        if (pcms->bus) {
> -            pci_create_simple(pcms->bus, -1, "xen-platform");
> +        if (pcms->pcibus) {
> +            pci_create_simple(pcms->pcibus, -1, "xen-platform");
>          }
>          xen_bus_init();
>          xen_be_init();
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 7724396ead..3393b93007 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -216,7 +216,7 @@ static void pc_init1(MachineState *machine,
>          pci_bus_map_irqs(pci_bus,
>                           xen_enabled() ? xen_pci_slot_get_pirq
>                                         : pc_pci_slot_get_pirq);
> -        pcms->bus = pci_bus;
> +        pcms->pcibus = pci_bus;
>  
>          hole64_size = object_property_get_uint(phb,
>                                                 PCI_HOST_PROP_PCI_HOLE64_SIZE,
> @@ -480,8 +480,8 @@ static void pc_xen_hvm_init(MachineState *machine)
>      }
>  
>      pc_xen_hvm_init_pci(machine);
> -    xen_igd_reserve_slot(pcms->bus);
> -    pci_create_simple(pcms->bus, -1, "xen-platform");
> +    xen_igd_reserve_slot(pcms->pcibus);
> +    pci_create_simple(pcms->pcibus, -1, "xen-platform");
>  }
>  #endif
>  
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index c89ff63579..734d9bedb2 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -217,7 +217,7 @@ static void pc_q35_init(MachineState *machine)
>  
>      /* pci */
>      host_bus = PCI_BUS(qdev_get_child_bus(DEVICE(phb), "pcie.0"));
> -    pcms->bus = host_bus;
> +    pcms->pcibus = host_bus;
>  
>      /* irq lines */
>      gsi_state = pc_gsi_create(&x86ms->gsi, true);
> diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c
> index 726e9e1d16..60af896225 100644
> --- a/hw/i386/x86-iommu.c
> +++ b/hw/i386/x86-iommu.c
> @@ -101,7 +101,7 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp)
>      QLIST_INIT(&x86_iommu->iec_notifiers);
>      bool irq_all_kernel = kvm_irqchip_in_kernel() && !kvm_irqchip_is_split();
>  
> -    if (!pcms || !pcms->bus) {
> +    if (!pcms || !pcms->pcibus) {
>          error_setg(errp, "Machine-type '%s' not supported by IOMMU",
>                     mc->name);
>          return;
> -- 
> 2.44.0
> 
>

Re: [PATCH v2 2/6] hw/i386/pc: Rename "bus" attribute to "pcibus"

Posted by Philippe Mathieu-Daudé 9 months ago

On 24/2/24 14:58, Bernhard Beschow wrote:
> The attribute is of type PCIBus; reflect that in the name. It will also make the
> next change more intuitive.
> 
> Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
>   include/hw/i386/pc.h     | 2 +-
>   hw/i386/acpi-build.c     | 2 +-
>   hw/i386/amd_iommu.c      | 2 +-
>   hw/i386/intel_iommu.c    | 2 +-
>   hw/i386/kvm/xen_evtchn.c | 2 +-
>   hw/i386/pc.c             | 8 ++++----
>   hw/i386/pc_piix.c        | 6 +++---
>   hw/i386/pc_q35.c         | 2 +-
>   hw/i386/x86-iommu.c      | 2 +-
>   9 files changed, 14 insertions(+), 14 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

[PATCH v2 1/6] hw/i386/x86: Let ioapic_init_gsi() take parent as pointer
[PATCH v2 2/6] hw/i386/pc: Rename "bus" attribute to "pcibus"
[PATCH v2 3/6] hw/i386/pc_{piix, q35}: Eliminate local pci_bus/pci_host variables
[PATCH v2 4/6] hw/i386/pc: Remove unneeded class attribute "kvmclock_enabled"
[PATCH v2 5/6] hw/i386/pc: Populate RTC attribute directly
[PATCH v2 6/6] hw/i386/pc: Inline pc_cmos_init() into pc_cmos_init_late() and remove it