From 1621292e73770aabbc146e72036de5e26f901e86 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sat, 7 May 2011 02:51:11 +0300 Subject: [PATCH] kvm tools: Enable SMP support This patch enables SMP support: [ 0.155072] Brought up 3 CPUs [ 0.155074] Total of 3 processors activated (15158.58 BogoMIPS). virtio-console was being loaded no matter the cmdline options and it was causing some hangs (have to look into that). I'll send this patch to a larger audience once someone else can confirm it actually works/doesn't work. Signed-off-by: Sasha Levin Signed-off-by: Pekka Enberg --- kvm-cpu.c | 2 ++ kvm-run.c | 11 +++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/kvm-cpu.c b/kvm-cpu.c index e66f03e..d7febb3 100644 --- a/kvm-cpu.c +++ b/kvm-cpu.c @@ -378,6 +378,8 @@ int kvm_cpu__start(struct kvm_cpu *cpu) kvm_cpu__run(cpu); switch (cpu->kvm_run->exit_reason) { + case KVM_EXIT_UNKNOWN: + break; case KVM_EXIT_DEBUG: kvm_cpu__show_registers(cpu); kvm_cpu__show_code(cpu); diff --git a/kvm-run.c b/kvm-run.c index d5a952f..2685f04 100644 --- a/kvm-run.c +++ b/kvm-run.c @@ -372,12 +372,6 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) if (nrcpus < 1 || nrcpus > KVM_NR_CPUS) die("Number of CPUs %d is out of [1;%d] range", nrcpus, KVM_NR_CPUS); - /* FIXME: Remove as only SMP gets fully supported */ - if (nrcpus > 1) { - warning("Limiting CPUs to 1, true SMP is not yet implemented"); - nrcpus = 1; - } - if (ram_size < MIN_RAM_SIZE_MB) die("Not enough memory specified: %lluMB (min %lluMB)", ram_size, MIN_RAM_SIZE_MB); @@ -410,7 +404,7 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) kvm->nrcpus = nrcpus; memset(real_cmdline, 0, sizeof(real_cmdline)); - strcpy(real_cmdline, "notsc nolapic noacpi pci=conf1 console=ttyS0 "); + strcpy(real_cmdline, "notsc noapic noacpi pci=conf1 console=ttyS0 "); if (kernel_cmdline) strlcat(real_cmdline, kernel_cmdline, sizeof(real_cmdline)); @@ -452,7 +446,8 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) pci__init(); - virtio_console__init(kvm); + if (active_console == CONSOLE_VIRTIO) + virtio_console__init(kvm); if (virtio_rng) virtio_rng__init(kvm);