[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/29] target-i386: Introduce apic-id CPU property
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 13/29] target-i386: Introduce apic-id CPU property |
Date: |
Thu, 2 May 2013 15:35:39 +0200 |
From: Igor Mammedov <address@hidden>
The property is used from board level to set APIC ID for CPUs it
creates. Do so in a new pc_new_cpu() helper, to be reused for hot-plug.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/i386/pc.c | 29 ++++++++++++++++++++++++++++-
target-i386/cpu.c | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 68 insertions(+), 1 deletion(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 867add7..6568173 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -894,9 +894,33 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int
level)
}
}
+static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id, Error **errp)
+{
+ X86CPU *cpu;
+ Error *local_err = NULL;
+
+ cpu = cpu_x86_create(cpu_model, errp);
+ if (!cpu) {
+ return cpu;
+ }
+
+ object_property_set_int(OBJECT(cpu), apic_id, "apic-id", &local_err);
+ object_property_set_bool(OBJECT(cpu), true, "realized", &local_err);
+
+ if (local_err) {
+ if (cpu != NULL) {
+ object_unref(OBJECT(cpu));
+ cpu = NULL;
+ }
+ error_propagate(errp, local_err);
+ }
+ return cpu;
+}
+
void pc_cpus_init(const char *cpu_model)
{
int i;
+ Error *error = NULL;
/* init CPUs */
if (cpu_model == NULL) {
@@ -908,7 +932,10 @@ void pc_cpus_init(const char *cpu_model)
}
for (i = 0; i < smp_cpus; i++) {
- if (!cpu_x86_init(cpu_model)) {
+ pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i), &error);
+ if (error) {
+ fprintf(stderr, "%s\n", error_get_pretty(error));
+ error_free(error);
exit(1);
}
}
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 697848d..f1cecc0 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1271,6 +1271,43 @@ static void x86_cpuid_set_tsc_freq(Object *obj, Visitor
*v, void *opaque,
cpu->env.tsc_khz = value / 1000;
}
+static void x86_cpuid_get_apic_id(Object *obj, Visitor *v, void *opaque,
+ const char *name, Error **errp)
+{
+ X86CPU *cpu = X86_CPU(obj);
+ int64_t value = cpu->env.cpuid_apic_id;
+
+ visit_type_int(v, &value, name, errp);
+}
+
+static void x86_cpuid_set_apic_id(Object *obj, Visitor *v, void *opaque,
+ const char *name, Error **errp)
+{
+ X86CPU *cpu = X86_CPU(obj);
+ const int64_t min = 0;
+ const int64_t max = UINT32_MAX;
+ Error *error = NULL;
+ int64_t value;
+
+ visit_type_int(v, &value, name, &error);
+ if (error) {
+ error_propagate(errp, error);
+ return;
+ }
+ if (value < min || value > max) {
+ error_setg(errp, "Property %s.%s doesn't take value %" PRId64
+ " (minimum: %" PRId64 ", maximum: %" PRId64 ")" ,
+ object_get_typename(obj), name, value, min, max);
+ return;
+ }
+
+ if ((value != cpu->env.cpuid_apic_id) && cpu_exists(value)) {
+ error_setg(errp, "CPU with APIC ID %" PRIi64 " exists", value);
+ return;
+ }
+ cpu->env.cpuid_apic_id = value;
+}
+
static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *name)
{
x86_def_t *def;
@@ -2270,6 +2307,9 @@ static void x86_cpu_initfn(Object *obj)
object_property_add(obj, "tsc-frequency", "int",
x86_cpuid_get_tsc_freq,
x86_cpuid_set_tsc_freq, NULL, NULL, NULL);
+ object_property_add(obj, "apic-id", "int",
+ x86_cpuid_get_apic_id,
+ x86_cpuid_set_apic_id, NULL, NULL, NULL);
env->cpuid_apic_id = x86_cpu_apic_id_from_index(cs->cpu_index);
--
1.8.1.4
- [Qemu-devel] [PULL for-1.5 00/29] QOM CPUState patch queue 2013-05-02, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 02/29] cpu: Call cpu_synchronize_post_init() from DeviceClass::realize(), Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 01/29] cpu: Make kvm-stub.o available outside softmmu, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 10/29] cpu: Add helper cpu_exists(), to check if CPU with specified id exists, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 12/29] target-i386: Introduce feat2prop() for CPU properties, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 13/29] target-i386: Introduce apic-id CPU property,
Andreas Färber <=
- [Qemu-devel] [PATCH 05/29] cpu: Introduce CPU hot-plug notifier, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 09/29] cpus: Use qemu_for_each_cpu() in TCG thread, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 04/29] cpu: Resume CPU from DeviceClass::realize() if hot-plugged, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 08/29] cpu: Add qemu_for_each_cpu(), Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 21/29] Add hot_add_cpu hook to QEMUMachine, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 14/29] target-i386: Do not allow to set apic-id once CPU is realized, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 03/29] cpu: Introduce cpu_resume(), for single CPU, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 11/29] acpi_piix4: Add infrastructure to send CPU hot-plug GPE to guest, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 06/29] pc: Update rtc_cmos on CPU hot-plug, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 19/29] target-i386: Attach ICC bus to CPU on its creation, Andreas Färber, 2013/05/02