From patchwork Mon May 23 21:47:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john cooper X-Patchwork-Id: 97098 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 43A31B6F9E for ; Tue, 24 May 2011 08:10:52 +1000 (EST) Received: from localhost ([::1]:42967 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOdKr-0002T5-HN for incoming@patchwork.ozlabs.org; Mon, 23 May 2011 18:10:49 -0400 Received: from eggs.gnu.org ([140.186.70.92]:38049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOdKa-0002Or-8S for qemu-devel@nongnu.org; Mon, 23 May 2011 18:10:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QOdKZ-0008Gm-3f for qemu-devel@nongnu.org; Mon, 23 May 2011 18:10:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13439) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOdKY-0008Gc-Re for qemu-devel@nongnu.org; Mon, 23 May 2011 18:10:31 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p4NMAUjP000756 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 23 May 2011 18:10:30 -0400 Received: from anvil.naka.net (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p4NMATNf010054; Mon, 23 May 2011 18:10:29 -0400 Message-ID: <4DDAD600.20904@redhat.com> Date: Mon, 23 May 2011 17:47:44 -0400 From: john cooper User-Agent: Thunderbird 2.0.0.9 (X11/20071115) MIME-Version: 1.0 To: qemu-devel@nongnu.org X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: john cooper , Anthony Liguori Subject: [Qemu-devel] [PATCH 7/7] cpu model bug fixes and definition corrections X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Launching qemu with "-cpu [check|enforce]" without explicitly prefixing a valid model name doesn't do as intuitively expected. Rather qemu exits with a CLI parse error. Unfortunately due to qemu's CLI argument parsing structure and the fact cpu models are initialized depending on build configuration, supporting the above implicitly for the default model is far more clunky than it ought to be. So as a minor concession to a far more simple solution, a pseudo model name of "default" is added which expands internally to qemu's build configuration default and is then interpreted conventionally. The result is then the following example usage: # x86_64-softmmu/qemu-system-x86_64 -cpu default,check Using CPU model "qemu64,check" warning: host cpuid 0000_0001 lacks requested flag 'popcnt' [0x00800000] warning: host cpuid 8000_0001 lacks requested flag 'abm' [0x00000020] warning: host cpuid 8000_0001 lacks requested flag 'sse4a' [0x00000040] # x86_64-softmmu/qemu-system-x86_64 -cpu default,+aes,enforce Using CPU model "qemu64,+aes,enforce" warning: host cpuid 0000_0001 lacks requested flag 'popcnt' [0x00800000] warning: host cpuid 0000_0001 lacks requested flag 'aes' [0x02000000] warning: host cpuid 8000_0001 lacks requested flag 'abm' [0x00000020] warning: host cpuid 8000_0001 lacks requested flag 'sse4a' [0x00000040] Unable to support requested x86 CPU definition etc.. allowing both the ability here to "check|enforce" the default model, as well as accepting arbitrary feature flags due to fan into the existing flag parsing. The resulting patch, which also indicates the CPU model in use, is minimal. Please review and apply. Signed-off-by: john cooper diff --git a/hw/pc.c b/hw/pc.c index 5b94e53..7949f18 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -939,18 +939,49 @@ static CPUState *pc_new_cpu(const char *cpu_model) return env; } +/* CLI cpu model name which expands to the actual configuration default + */ +#define CMDEF_KEYWORD "default" +#define CMDEF_KEYWORD_LN (sizeof(CMDEF_KEYWORD) - 1) + +/* set configuration default cpu model if current model string is + * uninitialized, or if user explicitly requests use of the config'ed + * default by specifying a cpu model name of "default". + * Use of "default" as a cpu model pseudo-name exists primarily to + * ease treatment of qualifier flags requested by the user without + * requiring knowledge of all cpu model names in advance of full "-cpu" + * option parsing. + */ +static const char *setdef_cpu_model(const char *model_str, + const char *default_str) +{ + int default_str_ln = strlen(default_str); + + if (!model_str || !*model_str) { + return default_str; + } else if (strncmp(model_str, CMDEF_KEYWORD, CMDEF_KEYWORD_LN)) { + return model_str; + } else { + char *new = qemu_malloc(strlen(model_str) - CMDEF_KEYWORD_LN + + default_str_ln + 1); + + strcpy(new, default_str); + strcpy(new + default_str_ln, model_str + CMDEF_KEYWORD_LN); + return new; + } +} + void pc_cpus_init(const char *cpu_model) { int i; /* init CPUs */ - if (cpu_model == NULL) { + cpu_model = setdef_cpu_model(cpu_model, #ifdef TARGET_X86_64 - cpu_model = "qemu64"; + "qemu64"); #else - cpu_model = "qemu32"; + "qemu32"); #endif - } for(i = 0; i < smp_cpus; i++) { pc_new_cpu(cpu_model); diff --git a/target-i386/helper.c b/target-i386/helper.c index 73f44e8..0b37063 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1251,6 +1251,7 @@ CPUX86State *cpu_x86_init(const char *cpu_model) env = qemu_mallocz(sizeof(CPUX86State)); cpu_exec_init(env); env->cpu_model_str = cpu_model; + fprintf(stderr, "Using CPU model \"%s\"\n", cpu_model); /* init various static tables */ if (!inited) {