[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 23/29] pc: Implement QEMUMachine::hot_add_cpu hook
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 23/29] pc: Implement QEMUMachine::hot_add_cpu hook |
Date: |
Thu, 2 May 2013 15:35:49 +0200 |
From: Igor Mammedov <address@hidden>
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 | 26 ++++++++++++++++++++++++++
hw/i386/pc_piix.c | 1 +
hw/i386/pc_q35.c | 1 +
include/hw/i386/pc.h | 1 +
4 files changed, 29 insertions(+)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 28f958d..197d218 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -54,6 +54,7 @@
#include "qemu/config-file.h"
#include "hw/acpi/acpi.h"
#include "hw/cpu/icc_bus.h"
+#include "hw/boards.h"
/* debug PC/ISA interrupts */
//#define DEBUG_IRQ
@@ -919,6 +920,30 @@ static X86CPU *pc_new_cpu(const char *cpu_model, int64_t
apic_id,
return cpu;
}
+static const char *current_cpu_model;
+
+void pc_hot_add_cpu(const int64_t id, Error **errp)
+{
+ DeviceState *icc_bridge;
+ int64_t apic_id = x86_cpu_apic_id_from_index(id);
+
+ if (cpu_exists(apic_id)) {
+ error_setg(errp, "Unable to add CPU: %" PRIi64
+ ", it already exists", id);
+ return;
+ }
+
+ if (id >= max_cpus) {
+ error_setg(errp, "Unable to add CPU: %" PRIi64
+ ", max allowed: %d", id, max_cpus - 1);
+ return;
+ }
+
+ icc_bridge = DEVICE(object_resolve_path_type("icc-bridge",
+ TYPE_ICC_BRIDGE, NULL));
+ pc_new_cpu(current_cpu_model, apic_id, icc_bridge, errp);
+}
+
void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge)
{
int i;
@@ -933,6 +958,7 @@ void pc_cpus_init(const char *cpu_model, DeviceState
*icc_bridge)
cpu_model = "qemu32";
#endif
}
+ current_cpu_model = cpu_model;
for (i = 0; i < smp_cpus; i++) {
cpu = pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i),
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 251e18f..fe52e5f 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -335,6 +335,7 @@ static QEMUMachine pc_i440fx_machine_v1_5 = {
.alias = "pc",
.desc = "Standard PC (i440FX + PIIX, 1996)",
.init = pc_init_pci,
+ .hot_add_cpu = pc_hot_add_cpu,
.max_cpus = 255,
.is_default = 1,
DEFAULT_MACHINE_OPTIONS,
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index f46295b..52511e2 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -220,6 +220,7 @@ static QEMUMachine pc_q35_machine_v1_5 = {
.alias = "q35",
.desc = "Standard PC (Q35 + ICH9, 2009)",
.init = pc_q35_init,
+ .hot_add_cpu = pc_hot_add_cpu,
.max_cpus = 255,
DEFAULT_MACHINE_OPTIONS,
};
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index d0bc972..41869e5 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -79,6 +79,7 @@ void pc_register_ferr_irq(qemu_irq irq);
void pc_acpi_smi_interrupt(void *opaque, int irq, int level);
void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge);
+void pc_hot_add_cpu(const int64_t id, Error **errp);
void pc_acpi_init(const char *default_dsdt);
void *pc_memory_init(MemoryRegion *system_memory,
const char *kernel_filename,
--
1.8.1.4
- [Qemu-devel] [PATCH 09/29] cpus: Use qemu_for_each_cpu() in TCG thread, (continued)
- [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
- [Qemu-devel] [PATCH 22/29] QMP: Add cpu-add command, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 23/29] pc: Implement QEMUMachine::hot_add_cpu hook,
Andreas Färber <=
- [Qemu-devel] [PATCH 29/29] Drop redundant resume_all_vcpus() from main(), Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 18/29] target-i386: Introduce ICC bus/device/bridge, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 28/29] cpus: Fix pausing TCG CPUs while in vCPU thread, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 16/29] kvmvapic: Make dependency on sysbus.h explicit, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 25/29] target-i386/kvm.c: Code formatting changes, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 07/29] cpu: Introduce get_arch_id() method and override it for X86CPU, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 15/29] target-i386: Replace MSI_SPACE_SIZE with APIC_SPACE_SIZE, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 24/29] target-i386: Group together level, xlevel, xlevel2 fields, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 26/29] target-i386: Break CPUID feature definition lines, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 17/29] cpu: Move cpu_write_elfXX_note() functions to CPUState, Andreas Färber, 2013/05/02