From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=47093 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJaUD-0000Tz-Gk for qemu-devel@nongnu.org; Tue, 01 Jun 2010 19:03:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJaUC-0001Bo-BY for qemu-devel@nongnu.org; Tue, 01 Jun 2010 19:03:05 -0400 Received: from qmta05.emeryville.ca.mail.comcast.net ([76.96.30.48]:56055) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJaUC-0001Bi-20 for qemu-devel@nongnu.org; Tue, 01 Jun 2010 19:03:04 -0400 From: Alex Williamson Date: Tue, 01 Jun 2010 17:03:00 -0600 Message-ID: <20100601230235.14944.69041.stgit@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] pc: push setting default cpu_model down a level List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, kvm@vger.kernel.org Not that CPU hotplug currently works, but if you make the mistake of trying it on a VM started without specifying a -cpu value, you hit a segfault from trying to strdup(NULL) in cpu_x86_find_by_name(). Signed-off-by: Alex Williamson --- hw/pc.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 9b85c42..a79586c 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -771,6 +771,14 @@ static CPUState *pc_new_cpu(const char *cpu_model) { CPUState *env; + if (cpu_model == NULL) { +#ifdef TARGET_X86_64 + cpu_model = "qemu64"; +#else + cpu_model = "qemu32"; +#endif + } + env = cpu_init(cpu_model); if (!env) { fprintf(stderr, "Unable to find x86 CPU definition\n"); @@ -791,14 +799,6 @@ void pc_cpus_init(const char *cpu_model) int i; /* init CPUs */ - if (cpu_model == NULL) { -#ifdef TARGET_X86_64 - cpu_model = "qemu64"; -#else - cpu_model = "qemu32"; -#endif - } - for(i = 0; i < smp_cpus; i++) { pc_new_cpu(cpu_model); }