From patchwork Wed Apr 29 21:20:31 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 20828 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n3TLLPwB009861 for ; Wed, 29 Apr 2009 21:21:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758739AbZD2VVZ (ORCPT ); Wed, 29 Apr 2009 17:21:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758397AbZD2VVY (ORCPT ); Wed, 29 Apr 2009 17:21:24 -0400 Received: from e4.ny.us.ibm.com ([32.97.182.144]:36087 "EHLO e4.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757447AbZD2VVV (ORCPT ); Wed, 29 Apr 2009 17:21:21 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e4.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n3TLHTpu024537 for ; Wed, 29 Apr 2009 17:17:29 -0400 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n3TLLLtp147708 for ; Wed, 29 Apr 2009 17:21:21 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n3TLLKCo001467 for ; Wed, 29 Apr 2009 17:21:21 -0400 Received: from localhost.localdomain (sig-9-65-58-151.mts.ibm.com [9.65.58.151]) by d01av01.pok.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n3TLKdgP031204; Wed, 29 Apr 2009 17:21:17 -0400 From: Anthony Liguori To: kvm@vger.kernel.org Cc: Anthony Liguori , Avi Kivity Subject: [PATCH 14/21] Remove -cpu-vendor-string Date: Wed, 29 Apr 2009 16:20:31 -0500 Message-Id: <1241040038-17183-15-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1241040038-17183-1-git-send-email-aliguori@us.ibm.com> References: <1241040038-17183-1-git-send-email-aliguori@us.ibm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This isn't in upstream QEMU and is of little utility to KVM. It's unlikely to appear in upstream QEMU either. Signed-off-by: Anthony Liguori --- linux-user/main.c | 1 - qemu-options.hx | 2 -- target-i386/helper.c | 5 ----- vl.c | 4 ---- 4 files changed, 0 insertions(+), 12 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 5967fa3..dc39b05 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -43,7 +43,6 @@ int singlestep; static const char *interp_prefix = CONFIG_QEMU_PREFIX; const char *qemu_uname_release = CONFIG_UNAME_RELEASE; -const char *cpu_vendor_string = NULL; #if defined(__i386__) && !defined(CONFIG_STATIC) /* Force usage of an ELF interpreter even if it is an ELF shared diff --git a/qemu-options.hx b/qemu-options.hx index a11ead9..f7d83c9 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1545,8 +1545,6 @@ DEF("pcidevice", HAS_ARG, QEMU_OPTION_pcidevice, #endif DEF("enable-nesting", 0, QEMU_OPTION_enable_nesting, "-enable-nesting enable support for running a VM inside the VM (AMD only)\n") -DEF("cpu-vendor", HAS_ARG, QEMU_OPTION_cpu_vendor, - "-cpu-vendor STRING override the cpuid vendor string\n") DEF("nvram", HAS_ARG, QEMU_OPTION_nvram, "-nvram FILE provide ia64 nvram contents\n") DEF("tdf", 0, QEMU_OPTION_tdf, diff --git a/target-i386/helper.c b/target-i386/helper.c index 24fcea8..7440983 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -91,8 +91,6 @@ static void add_flagname_to_bitmaps(char *flagname, uint32_t *features, fprintf(stderr, "CPU feature %s not found\n", flagname); } -extern const char *cpu_vendor_string; - typedef struct x86_def_t { const char *name; uint32_t level; @@ -431,9 +429,6 @@ static int cpu_x86_register (CPUX86State *env, const char *cpu_model) { const char *model_id = def->model_id; int c, len, i; - - if (cpu_vendor_string != NULL) - model_id = cpu_vendor_string; if (!model_id) model_id = ""; len = strlen(model_id); diff --git a/vl.c b/vl.c index 15f85e2..3b0e3dc 100644 --- a/vl.c +++ b/vl.c @@ -268,7 +268,6 @@ const char *mem_path = NULL; int mem_prealloc = 1; /* force preallocation of physical target memory */ #endif long hpagesize = 0; -const char *cpu_vendor_string; #ifdef TARGET_ARM int old_param = 0; #endif @@ -5228,9 +5227,6 @@ int main(int argc, char **argv, char **envp) nb_prom_envs++; break; #endif - case QEMU_OPTION_cpu_vendor: - cpu_vendor_string = optarg; - break; #ifdef TARGET_ARM case QEMU_OPTION_old_param: old_param = 1;