From patchwork Fri Aug 10 14:35:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 10681 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 129B623E02 for ; Fri, 10 Aug 2012 14:35:26 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id CAF28A18BBD for ; Fri, 10 Aug 2012 14:35:25 +0000 (UTC) Received: by yenq6 with SMTP id q6so1638820yen.11 for ; Fri, 10 Aug 2012 07:35:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=DVhnVVp/hznfTV4ynpAKhe8XXkbmMmi9/peWitTchmE=; b=QKycX/Y5jNtzivM7BMDlP7FXIGixq6W04SCTqiRMpBHWMtdbB1m/3R0W0R8/w/UOw1 unWwE0QyuNm+hmSsnd5x7J9peT5cp7UHw8uf/o8wox8UesnGarelSAj9+HWcBLGxxzTa UVWa/C7iv2rBWIZREgxpYBZGLj/N6miF+d0HVHwGGbC0EcGdDC9OXr+GfcrX81/JqNAU /9IyaT1siXrlMpAa1oKoQptj9QO4I+GXkAWBCkRfANkl8ID8FzVFrsNJehnDQ6ZiynyN KNwlQx0H9BMwnMH2t82f9Z7R8cMjuXNwGZUMqj7BuERNrJZ9Z2cH8fw9ev6wrL512/Dv htWQ== Received: by 10.50.154.132 with SMTP id vo4mr1995583igb.31.1344609325266; Fri, 10 Aug 2012 07:35:25 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.200 with SMTP id ew8csp63719igc; Fri, 10 Aug 2012 07:35:24 -0700 (PDT) Received: by 10.205.119.210 with SMTP id fv18mr1312093bkc.10.1344609323847; Fri, 10 Aug 2012 07:35:23 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id hu14si5430213bkc.66.2012.08.10.07.35.23 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 10 Aug 2012 07:35:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1SzqJ4-0006VU-SF; Fri, 10 Aug 2012 15:35:18 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Anthony Liguori , Eduardo Habkost , Eric Blake Subject: [PATCH 2/2] Drop cpu_list_id macro Date: Fri, 10 Aug 2012 15:35:18 +0100 Message-Id: <1344609318-24983-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1344609318-24983-1-git-send-email-peter.maydell@linaro.org> References: <1344609318-24983-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQnPiIyMhatEjljupSXSw52twUQtt9oCTEwHFX1XPigPPIUfUILhmLjEKNhqHVWzoRDkfvrI Since the only user of the extended cpu_list_id() format was the x86 ?model/?dump/?cpuid output, we can drop it completely. Signed-off-by: Peter Maydell Reviewed-by: Eduardo Habkost --- cpus.c | 6 ++---- linux-user/main.c | 6 ++---- target-i386/cpu.c | 4 ++-- target-i386/cpu.h | 4 ++-- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/cpus.c b/cpus.c index 3de2e27..c965b3a 100644 --- a/cpus.c +++ b/cpus.c @@ -1191,10 +1191,8 @@ void set_cpu_log_filename(const char *optarg) void list_cpus(FILE *f, fprintf_function cpu_fprintf, const char *optarg) { /* XXX: implement xxx_cpu_list for targets that still miss it */ -#if defined(cpu_list_id) - cpu_list_id(f, cpu_fprintf, optarg); -#elif defined(cpu_list) - cpu_list(f, cpu_fprintf); /* deprecated */ +#if defined(cpu_list) + cpu_list(f, cpu_fprintf); #endif } diff --git a/linux-user/main.c b/linux-user/main.c index 53714de..8b50163 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3143,10 +3143,8 @@ static void handle_arg_cpu(const char *arg) cpu_model = strdup(arg); if (cpu_model == NULL || is_help_option(cpu_model)) { /* XXX: implement xxx_cpu_list for targets that still miss it */ -#if defined(cpu_list_id) - cpu_list_id(stdout, &fprintf, ""); -#elif defined(cpu_list) - cpu_list(stdout, &fprintf); /* deprecated */ +#if defined(cpu_list) + cpu_list(stdout, &fprintf); #endif exit(1); } diff --git a/target-i386/cpu.c b/target-i386/cpu.c index d3a2b47..a902502 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1059,8 +1059,8 @@ static void listflags(char *buf, int bufsize, uint32_t fbits, } } -/* generate CPU information */ -void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf, const char *optarg) +/* generate CPU information. */ +void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf) { x86_def_t *def; char buf[256]; diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 60f9e97..751f44d 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -791,7 +791,7 @@ typedef struct CPUX86State { X86CPU *cpu_x86_init(const char *cpu_model); int cpu_x86_exec(CPUX86State *s); -void x86_cpu_list (FILE *f, fprintf_function cpu_fprintf, const char *optarg); +void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf); void x86_cpudef_setup(void); int cpu_x86_support_mca_broadcast(CPUX86State *env); @@ -975,7 +975,7 @@ static inline CPUX86State *cpu_init(const char *cpu_model) #define cpu_exec cpu_x86_exec #define cpu_gen_code cpu_x86_gen_code #define cpu_signal_handler cpu_x86_signal_handler -#define cpu_list_id x86_cpu_list +#define cpu_list x86_cpu_list #define cpudef_setup x86_cpudef_setup #define CPU_SAVE_VERSION 12