From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51153) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TB0ZX-0002tw-Hi for qemu-devel@nongnu.org; Mon, 10 Sep 2012 05:46:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TB0ZT-0007di-5P for qemu-devel@nongnu.org; Mon, 10 Sep 2012 05:46:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24913) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TB0ZS-0007d6-SK for qemu-devel@nongnu.org; Mon, 10 Sep 2012 05:46:23 -0400 Date: Mon, 10 Sep 2012 11:46:15 +0200 From: Igor Mammedov Message-ID: <20120910114615.279d6524@nial.usersys.redhat.com> In-Reply-To: <1346877673-9136-3-git-send-email-ehabkost@redhat.com> References: <1346877673-9136-1-git-send-email-ehabkost@redhat.com> <1346877673-9136-3-git-send-email-ehabkost@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/7] Drop cpu_list_id macro List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: Peter Maydell , qemu-devel@nongnu.org, Anthony Liguori , Andreas =?ISO-8859-1?B?RuRyYmVy?= On Wed, 5 Sep 2012 17:41:08 -0300 Eduardo Habkost wrote: > From: Peter Maydell > > 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 > Signed-off-by: Eduardo Habkost > 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 e476a3c..4b726ef 100644 > --- a/cpus.c > +++ b/cpus.c > @@ -1192,10 +1192,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 1a1c661..6e66e5d 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 5c98064..d2af0ff 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1073,8 +1073,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 0677502..49e0259 100644 > --- a/target-i386/cpu.h > +++ b/target-i386/cpu.h > @@ -792,7 +792,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); > > @@ -976,7 +976,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 Reviewed-by: Igor Mammedov