[14/22] pseries: Under kvm use guest cpu = host cpu by default

Message ID 1320006193-15219-15-git-send-email-agraf@suse.de
State New
Headers show

Commit Message

Alexander Graf Oct. 30, 2011, 8:23 p.m.
From: David Gibson <david@gibson.dropbear.id.au>

Now that we've implemented -cpu host for ppc, this patch updates the
pseries machine to use the host cpu as the guest cpu by default when
running under KVM.  This is important because under KVM Book3S-HV the guest
cpu _cannot_ be of a different type to the host cpu (at the moment
KVM Book3S-HV will silently virtualize the host cpu instead of whatever was
requested, but in future it is likely to simply refuse to run the VM if
a cpu model other than the host's is requested).

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
 hw/spapr.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/hw/spapr.c b/hw/spapr.c
index 4d2a55e..08c7399 100644
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -406,7 +406,7 @@  static void ppc_spapr_init(ram_addr_t ram_size,
     /* init CPUs */
     if (cpu_model == NULL) {
-        cpu_model = "POWER7";
+        cpu_model = kvm_enabled() ? "host" : "POWER7";
     for (i = 0; i < smp_cpus; i++) {
         env = cpu_init(cpu_model);