diff options
| author | Michael S. Tsirkin | 2013-07-24 17:56:09 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2013-10-14 16:48:52 +0200 |
| commit | b20c9bd5f6d8860856f6078836d197c6c2e27ef1 (patch) | |
| tree | 38c953438591b2e7e6f097fabf6db4cdee0af178 /hw/i386 | |
| parent | loader: allow adding ROMs in done callbacks (diff) | |
| download | qemu-b20c9bd5f6d8860856f6078836d197c6c2e27ef1.tar.gz qemu-b20c9bd5f6d8860856f6078836d197c6c2e27ef1.tar.xz qemu-b20c9bd5f6d8860856f6078836d197c6c2e27ef1.zip | |
i386: define pc guest info
This defines a structure that will be used to fill in acpi tables
where relevant properties are not yet available using QOM.
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Tested-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/pc.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 0c313feb0b..d17d1d94b7 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1047,6 +1047,27 @@ PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size, { PcGuestInfoState *guest_info_state = g_malloc0(sizeof *guest_info_state); PcGuestInfo *guest_info = &guest_info_state->info; + int i, j; + + guest_info->ram_size = below_4g_mem_size + above_4g_mem_size; + guest_info->apic_id_limit = pc_apic_id_limit(max_cpus); + guest_info->apic_xrupt_override = kvm_allows_irq0_override(); + guest_info->numa_nodes = nb_numa_nodes; + guest_info->node_mem = g_memdup(node_mem, guest_info->numa_nodes * + sizeof *guest_info->node_mem); + guest_info->node_cpu = g_malloc0(guest_info->apic_id_limit * + sizeof *guest_info->node_cpu); + + for (i = 0; i < max_cpus; i++) { + unsigned int apic_id = x86_cpu_apic_id_from_index(i); + assert(apic_id < guest_info->apic_id_limit); + for (j = 0; j < nb_numa_nodes; j++) { + if (test_bit(i, node_cpumask[j])) { + guest_info->node_cpu[apic_id] = j; + break; + } + } + } guest_info_state->machine_done.notify = pc_guest_info_machine_done; qemu_add_machine_init_done_notifier(&guest_info_state->machine_done); |