Patchwork [qemu-kvm,1/1] don't try to hotplug a cpu

login
register
mail settings
Submitter Serge Hallyn
Date Dec. 1, 2011, 5:14 p.m.
Message ID <20111201171419.GA13585@sergelap>
Download mbox | patch
Permalink /patch/128729/
State New
Headers show

Comments

Serge Hallyn - Dec. 1, 2011, 5:14 p.m.
When you do "cpu_set <n> online" where <n> > current number of cpus,
qemu-kvm will end up crashing when qdev finds hotplug is not enabled.
Let's instead gracefully refuse.

See https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/878422 for
the related bug report.

Signed-off-by: Serge Hallyn <serge.hallyn@canonical.com>
---
 hw/acpi_piix4.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

Patch

diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index 1b35707..5e95569 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -589,12 +589,17 @@  void qemu_system_cpu_hot_add(int cpu, int state)
     PIIX4PMState *s = global_piix4_pm_state;
 
     if (state && !qemu_get_cpu(cpu)) {
+#if 1
+        fprintf(stderr, "cpu hotplug not supported\n", cpu);
+        return;
+#else
         env = pc_new_cpu(global_cpu_model);
         if (!env) {
             fprintf(stderr, "cpu %d creation failed\n", cpu);
             return;
         }
         env->cpuid_apic_id = cpu;
+#endif
     }
 
     if (state)