diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-12-11 16:42:32 -0200 |
|---|---|---|
| committer | Timothy Pearson <tpearson@raptorengineering.com> | 2019-11-29 19:31:49 -0600 |
| commit | 28e627a062904dde5dcf77d6681b772ed3be38db (patch) | |
| tree | 4cb79d194826df75bd8f1ead34aedfc5aea6849b /include/hw | |
| parent | ab734a68b6b06fee877ea7f325c798bd79518833 (diff) | |
| download | hqemu-28e627a062904dde5dcf77d6681b772ed3be38db.zip hqemu-28e627a062904dde5dcf77d6681b772ed3be38db.tar.gz | |
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')
| -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 40249b6..0cf67ed 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" |
