ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pc: Implement QEMUMachine::hot_add_cpu hook 

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Igor Mammedov 2013-04-30 18:00:53 +02:00 committed by Andreas Färber
parent 69ca3ea5e1
commit c649983b58
4 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/i386/pc.c
View File

@ -54,6 +54,7 @@
#include "qemu/config-file.h" #include "qemu/config-file.h"
#include "hw/acpi/acpi.h" #include "hw/acpi/acpi.h"
#include "hw/cpu/icc_bus.h" #include "hw/cpu/icc_bus.h"
#include "hw/boards.h"
/* debug PC/ISA interrupts */ /* debug PC/ISA interrupts */
//#define DEBUG_IRQ //#define DEBUG_IRQ
@ -919,6 +920,30 @@ static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id,
return cpu; 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) void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge)
{ {
int i; int i;
@ -933,6 +958,7 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge)
cpu_model = "qemu32"; cpu_model = "qemu32";
#endif #endif
} }
current_cpu_model = cpu_model;
for (i = 0; i < smp_cpus; i++) { for (i = 0; i < smp_cpus; i++) {
cpu = pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i), cpu = pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i),

1
hw/i386/pc_piix.c
View File

@ -335,6 +335,7 @@ static QEMUMachine pc_i440fx_machine_v1_5 = {
.alias = "pc", .alias = "pc",
.desc = "Standard PC (i440FX + PIIX, 1996)", .desc = "Standard PC (i440FX + PIIX, 1996)",
.init = pc_init_pci, .init = pc_init_pci,
.hot_add_cpu = pc_hot_add_cpu,
.max_cpus = 255, .max_cpus = 255,
.is_default = 1, .is_default = 1,
DEFAULT_MACHINE_OPTIONS, DEFAULT_MACHINE_OPTIONS,

1
hw/i386/pc_q35.c
View File

@ -220,6 +220,7 @@ static QEMUMachine pc_q35_machine_v1_5 = {
.alias = "q35", .alias = "q35",
.desc = "Standard PC (Q35 + ICH9, 2009)", .desc = "Standard PC (Q35 + ICH9, 2009)",
.init = pc_q35_init, .init = pc_q35_init,
.hot_add_cpu = pc_hot_add_cpu,
.max_cpus = 255, .max_cpus = 255,
DEFAULT_MACHINE_OPTIONS, DEFAULT_MACHINE_OPTIONS,
}; };

1
include/hw/i386/pc.h
View File

@ -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_acpi_smi_interrupt(void *opaque, int irq, int level);
void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge); 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_acpi_init(const char *default_dsdt);
void *pc_memory_init(MemoryRegion *system_memory, void *pc_memory_init(MemoryRegion *system_memory,
const char *kernel_filename, const char *kernel_filename,