[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v2 38/39] pc: Make pc_cpus_init() use PCMachineState
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [RFC v2 38/39] pc: Make pc_cpus_init() use PCMachineState |
Date: |
Fri, 13 Jun 2014 16:44:17 -0300 |
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/i386/pc.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 2836b5f..1c30754 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1019,10 +1019,12 @@ void pc_hot_add_cpu(const int64_t id, Error **errp)
static void pc_cpus_init(PCMachineState *pcms)
{
+ MachineState *machine = MACHINE(pcms);
int i;
X86CPU *cpu = NULL;
Error *error = NULL;
unsigned long apic_id_limit;
+ const char *cpu_model = machine->cpu_model;
/* init CPUs */
if (cpu_model == NULL) {
@@ -1043,7 +1045,7 @@ static void pc_cpus_init(PCMachineState *pcms)
for (i = 0; i < smp_cpus; i++) {
cpu = pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i),
- icc_bridge, &error);
+ pcms->icc_bridge, &error);
if (error) {
error_report("%s", error_get_pretty(error));
error_free(error);
@@ -1054,7 +1056,7 @@ static void pc_cpus_init(PCMachineState *pcms)
/* map APIC MMIO area if CPU has APIC */
if (cpu && cpu->apic_state) {
/* XXX: what if the base changes? */
- sysbus_mmio_map_overlap(SYS_BUS_DEVICE(icc_bridge), 0,
+ sysbus_mmio_map_overlap(SYS_BUS_DEVICE(pcms->icc_bridge), 0,
APIC_DEFAULT_ADDRESS, 0x1000);
}
@@ -1626,7 +1628,7 @@ static void pc_machine_init(MachineState *machine)
object_property_add_child(qdev_get_machine(), "icc-bridge",
OBJECT(pcms->icc_bridge), NULL);
- pc_cpus_init(machine->cpu_model, icc_bridge);
+ pc_cpus_init(pcms);
if (pcmc->finish_init) {
pcmc->finish_init(machine);
--
1.9.0
- [Qemu-devel] [RFC v2 27/39] piix: Eliminate pc_init_pci(), (continued)
- [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, 2014/06/13
- [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 <=
- [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