[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 29/39] i386: define pc guest info
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 29/39] i386: define pc guest info |
Date: |
Tue, 15 Oct 2013 09:32:09 +0300 |
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 <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Tested-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Tested-by: Igor Mammedov <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/i386/pc.h | 9 +++++++++
hw/i386/pc.c | 21 +++++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 9b2ddc4..085a621 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -9,6 +9,9 @@
#include "hw/i386/ioapic.h"
#include "qemu/range.h"
+#include "qemu/bitmap.h"
+#include "sysemu/sysemu.h"
+#include "hw/pci/pci.h"
/* PC-style peripherals (also used by other machines). */
@@ -20,6 +23,12 @@ typedef struct PcPciInfo {
struct PcGuestInfo {
bool has_pci_info;
bool isapc_ram_fw;
+ hwaddr ram_size;
+ unsigned apic_id_limit;
+ bool apic_xrupt_override;
+ uint64_t numa_nodes;
+ uint64_t *node_mem;
+ uint64_t *node_cpu;
FWCfgState *fw_cfg;
};
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 0c313fe..d17d1d9 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);
--
MST
- [Qemu-devel] [PULL v2 19/39] pcie_host: expose address format, (continued)
- [Qemu-devel] [PULL v2 19/39] pcie_host: expose address format, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 20/39] q35: use macro for MCFG property name, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 21/39] q35: expose mmcfg size as a property, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 23/39] acpi: add rules to compile ASL source, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 22/39] i386: add ACPI table files from seabios, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 25/39] acpi: ssdt pcihp: updat generated file, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 26/39] loader: use file path size from fw_cfg.h, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 24/39] acpi: pre-compiled ASL files, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 27/39] i386: add bios linker/loader, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 28/39] loader: allow adding ROMs in done callbacks, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 29/39] i386: define pc guest info,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 30/39] acpi/piix: add macros for acpi property names, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 31/39] piix: APIs for pc guest info, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 32/39] ich9: APIs for pc guest info, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 33/39] pvpanic: add API to access io port, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 35/39] acpi: add interface to access user-installed tables, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 34/39] hpet: add API to find it, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 36/39] pc: use new api to add builtin tables, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 37/39] i386: ACPI table generation code from seabios, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 38/39] ssdt: fix PBLK length, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 39/39] ssdt-proc: update generated file, Michael S. Tsirkin, 2013/10/15