diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-12-11 16:42:32 -0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2016-02-06 20:44:10 +0200 |
| commit | dd4c2f01ab92ae0a158958a8fc61fcd09e34987a (patch) | |
| tree | e06bde3c39a5045e1c4e52d0183b0ccf7d6bdfbc /include/hw/i386/pc.h | |
| parent | f264d360e0bebf4fae054e624bf7204788aff99d (diff) | |
| download | focaccia-qemu-dd4c2f01ab92ae0a158958a8fc61fcd09e34987a.tar.gz focaccia-qemu-dd4c2f01ab92ae0a158958a8fc61fcd09e34987a.zip | |
pc: Move APIC and NUMA data from PcGuestInfo to PCMachineState
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Diffstat (limited to 'include/hw/i386/pc.h')
| -rw-r--r-- | include/hw/i386/pc.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 40249b6b02..0cf67ed6f3 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -35,11 +35,6 @@ /* Machine info for ACPI build: */ struct PcGuestInfo { - unsigned apic_id_limit; - bool apic_xrupt_override; - uint64_t numa_nodes; - uint64_t *node_mem; - uint64_t *node_cpu; }; /** @@ -71,6 +66,15 @@ struct PCMachineState { /* RAM information (sizes, addresses, configuration): */ ram_addr_t below_4g_mem_size, above_4g_mem_size; + + /* CPU and apic information: */ + bool apic_xrupt_override; + unsigned apic_id_limit; + + /* NUMA information: */ + uint64_t numa_nodes; + uint64_t *node_mem; + uint64_t *node_cpu; }; #define PC_MACHINE_ACPI_DEVICE_PROP "acpi-device" |