From 6b7a2cf6d93294a4e7c79fe101d31fc19d04fb48 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Wed, 12 Oct 2011 22:40:34 +0000 Subject: pseries: Under kvm use guest cpu = host cpu by default 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 Signed-off-by: Alexander Graf --- hw/spapr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/spapr.c') diff --git a/hw/spapr.c b/hw/spapr.c index 4d2a55e35..08c7399fe 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); -- cgit v1.2.3