[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v2 35/39] pc: Move icc_bridge variable to PCMachineSta
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [RFC v2 35/39] pc: Move icc_bridge variable to PCMachineState |
Date: |
Fri, 13 Jun 2014 16:44:14 -0300 |
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/i386/pc_piix.c | 9 ++++-----
hw/i386/pc_q35.c | 9 ++++-----
include/hw/i386/pc.h | 1 +
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index aecc3af..74168c8 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -82,15 +82,14 @@ static void pc_init1(MachineState *machine)
BusState *idebus[MAX_IDE_BUS];
ISADevice *rtc_state;
ISADevice *floppy;
- DeviceState *icc_bridge;
FWCfgState *fw_cfg = NULL;
PcGuestInfo *guest_info;
- icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE);
+ pcms->icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE);
object_property_add_child(qdev_get_machine(), "icc-bridge",
- OBJECT(icc_bridge), NULL);
+ OBJECT(pcms->icc_bridge), NULL);
- pc_cpus_init(machine->cpu_model, icc_bridge);
+ pc_cpus_init(machine->cpu_model, pcms->icc_bridge);
if (kvm_enabled() && kvmclock_enabled) {
kvmclock_create();
@@ -183,7 +182,7 @@ static void pc_init1(MachineState *machine)
if (pci_enabled) {
ioapic_init_gsi(gsi_state, "i440fx");
}
- qdev_init_nofail(icc_bridge);
+ qdev_init_nofail(pcms->icc_bridge);
pc_register_ferr_irq(gsi[13]);
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index d1d541e..f97b588 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -70,14 +70,13 @@ static void pc_q35_init(MachineState *machine)
int i;
ICH9LPCState *ich9_lpc;
PCIDevice *ahci;
- DeviceState *icc_bridge;
PcGuestInfo *guest_info;
- icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE);
+ pcms->icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE);
object_property_add_child(qdev_get_machine(), "icc-bridge",
- OBJECT(icc_bridge), NULL);
+ OBJECT(pcms->icc_bridge), NULL);
- pc_cpus_init(machine->cpu_model, icc_bridge);
+ pc_cpus_init(machine->cpu_model, pcms->icc_bridge);
pc_acpi_init("q35-acpi-dsdt.aml");
kvmclock_create();
@@ -196,7 +195,7 @@ static void pc_q35_init(MachineState *machine)
if (pci_enabled) {
ioapic_init_gsi(gsi_state, NULL);
}
- qdev_init_nofail(icc_bridge);
+ qdev_init_nofail(pcms->icc_bridge);
pc_register_ferr_irq(gsi[13]);
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index b8c5055..ce4410b 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -34,6 +34,7 @@ struct PCMachineState {
MemoryRegion *ram_memory;
MemoryRegion *pci_memory;
MemoryRegion *rom_memory;
+ DeviceState *icc_bridge;
HotplugHandler *acpi_dev;
};
--
1.9.0
- [Qemu-devel] [RFC v2 04/39] piix: Move pc-0.1[23] rombar compat props to PC_COMPAT_0_13, (continued)
- [Qemu-devel] [RFC v2 04/39] piix: Move pc-0.1[23] rombar compat props to PC_COMPAT_0_13, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 25/39] pc: Move has_reserved_memory to PCMachineClass, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 26/39] pc: Move option_rom_has_mr/rom_file_has_mr to MachineClass, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 27/39] piix: Eliminate pc_init_pci(), Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 28/39] piix: Introduce struct PCI440FXMachineClass, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 29/39] pc: Create common machine init function, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 30/39] pc: Eliminate empty or trivial compat functions, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 31/39] piix: Move compat/init functions closer to corresponding class_init, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 32/39] pc: Rename pc_machine variable to pcms, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 34/39] pc: Move duplicate Xen init code to pc_machine_init(), Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 35/39] pc: Move icc_bridge variable to PCMachineState,
Eduardo Habkost <=
- [Qemu-devel] [RFC v2 36/39] pc: Move duplicate icc-bridge and CPU initalization to pc_machine_init(), Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 37/39] pc: Make pc_cpus_init() static, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 38/39] pc: Make pc_cpus_init() use PCMachineState, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 39/39] machine: Eliminate QEMUMachine.compat_props, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 19/39] pc: Move kvmclock_enabled to PCMachineClass, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 20/39] pc: Move smbios_legacy_mode to PCMachineClass, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 17/39] pc: Move pci_enabled parameter to PCMachineClass, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 18/39] q35: Use PCMachineClass.pci_enabled field, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 33/39] pc: Move {ram, pci, rom}_memory variables to PCMachineState, Eduardo Habkost, 2014/06/13
- Re: [Qemu-devel] [RFC v2 00/39] Convert PC machine-types to QOM classes, Eduardo Habkost, 2014/06/13