[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/22] cpu: introduce get_firmware_id() method and o
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 11/22] cpu: introduce get_firmware_id() method and override it for target-i386 |
Date: |
Fri, 5 Apr 2013 16:37:03 +0200 |
get_firmware_id() adds possibily for generic code to get guest visible
CPI id without accessing CPUArchState. If target doesn't override it,
it will return cpu_index.
Override it on target-i386 to return APIC ID.
Signed-off-by: Igor Mammedov <address@hidden>
---
* it will be used later by new cpu_exists() generic function and
acpi_piix.
---
include/qom/cpu.h | 4 ++--
qom/cpu.c | 6 ++++++
target-i386/cpu.c | 10 ++++++++++
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index 210aca3..0d33009 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -46,7 +46,7 @@ typedef struct CPUState CPUState;
* @reset: Callback to reset the #CPUState to its initial state.
* @do_interrupt: Callback for interrupt handling.
* @resume: Callback for putting CPU in runable state
- * @get_firmware_id: Callback for getting arch depended CPU id
+ * @get_firmware_id: Callback for getting arch depended CPU ID
* @vmsd: State description for migration.
*
* Represents a CPU family or model.
@@ -61,7 +61,7 @@ typedef struct CPUClass {
void (*reset)(CPUState *cpu);
void (*do_interrupt)(CPUState *cpu);
void (*resume)(CPUState *cpu);
- void (*get_firmware_id)(CPUState *cpu);
+ int64_t (*get_firmware_id)(CPUState *cpu);
const struct VMStateDescription *vmsd;
} CPUClass;
diff --git a/qom/cpu.c b/qom/cpu.c
index 10ceaed..a54d4d1 100644
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -80,6 +80,11 @@ static void cpu_common_realizefn(DeviceState *dev, Error
**errp)
}
}
+static int64_t cpu_common_get_firmware_id(CPUState *cpu)
+{
+ return cpu->cpu_index;
+}
+
static void cpu_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
@@ -87,6 +92,7 @@ static void cpu_class_init(ObjectClass *klass, void *data)
k->class_by_name = cpu_common_class_by_name;
k->reset = cpu_common_reset;
+ k->get_firmware_id = cpu_common_get_firmware_id;
dc->realize = cpu_common_realizefn;
dc->no_user = 1;
}
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 269a681..858fd54 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -2269,6 +2269,14 @@ static void x86_cpu_initfn(Object *obj)
}
}
+static int64_t x86_cpu_get_firmware_id(CPUState *cpu)
+{
+ X86CPU *x86cpu = X86_CPU(cpu);
+ CPUX86State *env = &x86cpu->env;
+
+ return env->cpuid_apic_id;
+}
+
static void x86_cpu_common_class_init(ObjectClass *oc, void *data)
{
X86CPUClass *xcc = X86_CPU_CLASS(oc);
@@ -2283,6 +2291,8 @@ static void x86_cpu_common_class_init(ObjectClass *oc,
void *data)
cc->do_interrupt = x86_cpu_do_interrupt;
cpu_class_set_vmsd(cc, &vmstate_x86_cpu);
+
+ cc->get_firmware_id = x86_cpu_get_firmware_id;
}
static const TypeInfo x86_cpu_type_info = {
--
1.8.1.4
- Re: [Qemu-devel] [PATCH 08/22] target-i386: ioapic: replace FROM_SYSBUS() with QOM type cast, (continued)
- [Qemu-devel] [PATCH 06/22] cpu: introduce CPUClass.resume() method, Igor Mammedov, 2013/04/05
- [Qemu-devel] [PATCH 13/22] acpi_piix4: add infrastructure to send CPU hot-plug GPE to guest, Igor Mammedov, 2013/04/05
- [Qemu-devel] [PATCH 10/22] rtc: update rtc_cmos on CPU hot-plug, Igor Mammedov, 2013/04/05
- [Qemu-devel] [PATCH 11/22] cpu: introduce get_firmware_id() method and override it for target-i386,
Igor Mammedov <=
- [Qemu-devel] [PATCH 17/22] target-i386: replace MSI_SPACE_SIZE with APIC_SPACE_SIZE, Igor Mammedov, 2013/04/05
- [Qemu-devel] [PATCH 16/22] target-i386: cpu: attach ICC bus to CPU on its creation, Igor Mammedov, 2013/04/05
- [Qemu-devel] [PATCH 18/22] target-i386: move APIC to ICC bus, Igor Mammedov, 2013/04/05
- [Qemu-devel] [PATCH 14/22] target-i386: introduce apic-id property, Igor Mammedov, 2013/04/05