[Qemu-devel] [PATCH qom-cpu for-1.4] target-openrisc: Drop OpenRISCCPUList

[Qemu-devel] [PATCH qom-cpu for-1.4] target-openrisc: Drop OpenRISCCPUList

[Andreas Färber]

It was missed in the previous cleanup because its naming did not match
the *CPUListState pattern. Use the generalized CPUListState instead.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 target-openrisc/cpu.c |    9 ++-------
 1 Datei geändert, 2 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-)

diff --git a/target-openrisc/cpu.c b/target-openrisc/cpu.c
index 56544d8..7a55112 100644
--- a/target-openrisc/cpu.c
+++ b/target-openrisc/cpu.c
@@ -170,11 +170,6 @@ OpenRISCCPU *cpu_openrisc_init(const char *cpu_model)
     return cpu;
 }
 
-typedef struct OpenRISCCPUList {
-    fprintf_function cpu_fprintf;
-    FILE *file;
-} OpenRISCCPUList;
-
 /* Sort alphabetically by type name, except for "any". */
 static gint openrisc_cpu_list_compare(gconstpointer a, gconstpointer b)
 {
@@ -196,7 +191,7 @@ static gint openrisc_cpu_list_compare(gconstpointer a, gconstpointer b)
 static void openrisc_cpu_list_entry(gpointer data, gpointer user_data)
 {
     ObjectClass *oc = data;
-    OpenRISCCPUList *s = user_data;
+    CPUListState *s = user_data;
 
     (*s->cpu_fprintf)(s->file, "  %s\n",
                       object_class_get_name(oc));
@@ -204,7 +199,7 @@ static void openrisc_cpu_list_entry(gpointer data, gpointer user_data)
 
 void cpu_openrisc_list(FILE *f, fprintf_function cpu_fprintf)
 {
-    OpenRISCCPUList s = {
+    CPUListState s = {
         .file = f,
         .cpu_fprintf = cpu_fprintf,
     };
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH qom-cpu for-1.4] target-openrisc: Drop OpenRISCCPUList

[Andreas Färber]

Am 16.01.2013 04:57, schrieb Andreas Färber:
> It was missed in the previous cleanup because its naming did not match
> the *CPUListState pattern. Use the generalized CPUListState instead.
> 
> Signed-off-by: Andreas Färber <afaerber@suse.de>

Jia, please add a MAINTAINERS entry for target-openrisc/ so that you
automatically get cc'ed on patches.

Thanks,
Andreas

> ---
>  target-openrisc/cpu.c |    9 ++-------
>  1 Datei geändert, 2 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-)
> 
> diff --git a/target-openrisc/cpu.c b/target-openrisc/cpu.c
> index 56544d8..7a55112 100644
> --- a/target-openrisc/cpu.c
> +++ b/target-openrisc/cpu.c
> @@ -170,11 +170,6 @@ OpenRISCCPU *cpu_openrisc_init(const char *cpu_model)
>      return cpu;
>  }
>  
> -typedef struct OpenRISCCPUList {
> -    fprintf_function cpu_fprintf;
> -    FILE *file;
> -} OpenRISCCPUList;
> -
>  /* Sort alphabetically by type name, except for "any". */
>  static gint openrisc_cpu_list_compare(gconstpointer a, gconstpointer b)
>  {
> @@ -196,7 +191,7 @@ static gint openrisc_cpu_list_compare(gconstpointer a, gconstpointer b)
>  static void openrisc_cpu_list_entry(gpointer data, gpointer user_data)
>  {
>      ObjectClass *oc = data;
> -    OpenRISCCPUList *s = user_data;
> +    CPUListState *s = user_data;
>  
>      (*s->cpu_fprintf)(s->file, "  %s\n",
>                        object_class_get_name(oc));
> @@ -204,7 +199,7 @@ static void openrisc_cpu_list_entry(gpointer data, gpointer user_data)
>  
>  void cpu_openrisc_list(FILE *f, fprintf_function cpu_fprintf)
>  {
> -    OpenRISCCPUList s = {
> +    CPUListState s = {
>          .file = f,
>          .cpu_fprintf = cpu_fprintf,
>      };

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH qom-cpu for-1.4] target-openrisc: Drop OpenRISCCPUList

[Andreas Färber]

Am 16.01.2013 04:57, schrieb Andreas Färber:
> It was missed in the previous cleanup because its naming did not match
> the *CPUListState pattern. Use the generalized CPUListState instead.
> 
> Signed-off-by: Andreas Färber <afaerber@suse.de>

No objections yet, so applied to qom-cpu (mentioning commit hash):
https://github.com/afaerber/qemu-cpu/commits/qom-cpu

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg