motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 02:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/i386/pc: Rename "bus" attribute to "pcibus"

Browse source 
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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Message-ID: <20240224135851.100361-3-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Bernhard Beschow 2024-02-24 14:58:47 +01:00 • committed by Philippe Mathieu-Daudé
parent b6718da464
commit b54a9d46a0
9 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/i386/acpi-build.c
View file

@ -1546,7 +1546,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
} }
crs_range_set_init(&crs_range_set); crs_range_set_init(&crs_range_set);
bus = PC_MACHINE(machine)->bus; bus = PC_MACHINE(machine)->pcibus;
if (bus) { if (bus) {
QLIST_FOREACH(bus, &bus->child, sibling) { QLIST_FOREACH(bus, &bus->child, sibling) {
uint8_t bus_num = pci_bus_num(bus); uint8_t bus_num = pci_bus_num(bus);

2
hw/i386/amd_iommu.c
View file

@ -1584,7 +1584,7 @@ static void amdvi_sysbus_realize(DeviceState *dev, Error **errp)
MachineState *ms = MACHINE(qdev_get_machine()); MachineState *ms = MACHINE(qdev_get_machine());
PCMachineState *pcms = PC_MACHINE(ms); PCMachineState *pcms = PC_MACHINE(ms);
X86MachineState *x86ms = X86_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, s->iotlb = g_hash_table_new_full(amdvi_uint64_hash,
amdvi_uint64_equal, g_free, g_free); amdvi_uint64_equal, g_free, g_free);

2
hw/i386/intel_iommu.c
View file

@ -4183,7 +4183,7 @@ static void vtd_realize(DeviceState *dev, Error **errp)
MachineState *ms = MACHINE(qdev_get_machine()); MachineState *ms = MACHINE(qdev_get_machine());
PCMachineState *pcms = PC_MACHINE(ms); PCMachineState *pcms = PC_MACHINE(ms);
X86MachineState *x86ms = X86_MACHINE(ms); X86MachineState *x86ms = X86_MACHINE(ms);
PCIBus *bus = pcms->bus; PCIBus *bus = pcms->pcibus;
IntelIOMMUState *s = INTEL_IOMMU_DEVICE(dev); IntelIOMMUState *s = INTEL_IOMMU_DEVICE(dev);
X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(s); X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(s);

2
hw/i386/kvm/xen_evtchn.c
View file

@ -371,7 +371,7 @@ static int set_callback_pci_intx(XenEvtchnState *s, uint64_t param)
return 0; return 0;
} }
pdev = pci_find_device(pcms->bus, bus, devfn); pdev = pci_find_device(pcms->pcibus, bus, devfn);
if (!pdev) { if (!pdev) {
return 0; return 0;
} }

8
hw/i386/pc.c
View file

@ -675,7 +675,7 @@ void pc_machine_done(Notifier *notifier, void *data)
PCMachineState, machine_done); PCMachineState, machine_done);
X86MachineState *x86ms = X86_MACHINE(pcms); 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); &error_fatal);
if (pcms->cxl_devices_state.is_enabled) { if (pcms->cxl_devices_state.is_enabled) {
@ -685,7 +685,7 @@ void pc_machine_done(Notifier *notifier, void *data)
/* set the number of CPUs */ /* set the number of CPUs */
x86_rtc_set_cpus_count(x86ms->rtc, x86ms->boot_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(); acpi_setup();
if (x86ms->fw_cfg) { if (x86ms->fw_cfg) {
@ -1250,8 +1250,8 @@ void pc_basic_device_init(struct PCMachineState *pcms,
xen_evtchn_create(IOAPIC_NUM_PINS, gsi); xen_evtchn_create(IOAPIC_NUM_PINS, gsi);
xen_gnttab_create(); xen_gnttab_create();
xen_xenstore_create(); xen_xenstore_create();
if (pcms->bus) { if (pcms->pcibus) {
pci_create_simple(pcms->bus, -1, "xen-platform"); pci_create_simple(pcms->pcibus, -1, "xen-platform");
} }
xen_bus_init(); xen_bus_init();
xen_be_init(); xen_be_init();

6
hw/i386/pc_piix.c
View file

@ -216,7 +216,7 @@ static void pc_init1(MachineState *machine,
pci_bus_map_irqs(pci_bus, pci_bus_map_irqs(pci_bus,
xen_enabled() ? xen_pci_slot_get_pirq xen_enabled() ? xen_pci_slot_get_pirq
: pc_pci_slot_get_pirq); : pc_pci_slot_get_pirq);
pcms->bus = pci_bus; pcms->pcibus = pci_bus;
hole64_size = object_property_get_uint(phb, hole64_size = object_property_get_uint(phb,
PCI_HOST_PROP_PCI_HOLE64_SIZE, PCI_HOST_PROP_PCI_HOLE64_SIZE,
@ -480,8 +480,8 @@ static void pc_xen_hvm_init(MachineState *machine)
} }
pc_xen_hvm_init_pci(machine); pc_xen_hvm_init_pci(machine);
xen_igd_reserve_slot(pcms->bus); xen_igd_reserve_slot(pcms->pcibus);
pci_create_simple(pcms->bus, -1, "xen-platform"); pci_create_simple(pcms->pcibus, -1, "xen-platform");
} }
#endif #endif

2
hw/i386/pc_q35.c
View file

@ -218,7 +218,7 @@ static void pc_q35_init(MachineState *machine)
/* pci */ /* pci */
host_bus = PCI_BUS(qdev_get_child_bus(DEVICE(phb), "pcie.0")); host_bus = PCI_BUS(qdev_get_child_bus(DEVICE(phb), "pcie.0"));
pcms->bus = host_bus; pcms->pcibus = host_bus;
/* irq lines */ /* irq lines */
gsi_state = pc_gsi_create(&x86ms->gsi, true); gsi_state = pc_gsi_create(&x86ms->gsi, true);

2
hw/i386/x86-iommu.c
View file

@ -101,7 +101,7 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp)
QLIST_INIT(&x86_iommu->iec_notifiers); QLIST_INIT(&x86_iommu->iec_notifiers);
bool irq_all_kernel = kvm_irqchip_in_kernel() && !kvm_irqchip_is_split(); 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", error_setg(errp, "Machine-type '%s' not supported by IOMMU",
mc->name); mc->name);
return; return;

2
include/hw/i386/pc.h
View file

@ -31,7 +31,7 @@ typedef struct PCMachineState {
Notifier machine_done; Notifier machine_done;
/* Pointers to devices and objects: */ /* Pointers to devices and objects: */
PCIBus *bus; PCIBus *pcibus;
I2CBus *smbus; I2CBus *smbus;
PFlashCFI01 *flash[2]; PFlashCFI01 *flash[2];
ISADevice *pcspk; ISADevice *pcspk;