qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] target/arm: Remove duplicate 'host' entry in '-cpu ?' output
@ 2018-07-27 13:23 Philippe Mathieu-Daudé
  2018-07-30 14:07 ` Peter Maydell
  0 siblings, 1 reply; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2018-07-27 13:23 UTC (permalink / raw)
  To: Peter Maydell; +Cc: Philippe Mathieu-Daudé, qemu-devel, qemu-arm

Since 86f0a186d6f the TYPE_ARM_HOST_CPU is only compiled when CONFIG_KVM
is enabled.

Remove the now redundant special-case introduced in a96c0514ab7, to avoid:

  $ qemu-system-aarch64 -machine virt -cpu \? | fgrep host
  host
  host (only available in KVM mode)

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 target/arm/helper.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/target/arm/helper.c b/target/arm/helper.c
index 22d812240a..66afb08ee0 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -5591,12 +5591,6 @@ void arm_cpu_list(FILE *f, fprintf_function cpu_fprintf)
     (*cpu_fprintf)(f, "Available CPUs:\n");
     g_slist_foreach(list, arm_cpu_list_entry, &s);
     g_slist_free(list);
-#ifdef CONFIG_KVM
-    /* The 'host' CPU type is dynamically registered only if KVM is
-     * enabled, so we have to special-case it here:
-     */
-    (*cpu_fprintf)(f, "  host (only available in KVM mode)\n");
-#endif
 }
 
 static void arm_cpu_add_definition(gpointer data, gpointer user_data)
-- 
2.18.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Qemu-devel] [PATCH] target/arm: Remove duplicate 'host' entry in '-cpu ?' output
  2018-07-27 13:23 [Qemu-devel] [PATCH] target/arm: Remove duplicate 'host' entry in '-cpu ?' output Philippe Mathieu-Daudé
@ 2018-07-30 14:07 ` Peter Maydell
  0 siblings, 0 replies; 2+ messages in thread
From: Peter Maydell @ 2018-07-30 14:07 UTC (permalink / raw)
  To: Philippe Mathieu-Daudé; +Cc: QEMU Developers, qemu-arm

On 27 July 2018 at 14:23, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> Since 86f0a186d6f the TYPE_ARM_HOST_CPU is only compiled when CONFIG_KVM
> is enabled.
>
> Remove the now redundant special-case introduced in a96c0514ab7, to avoid:
>
>   $ qemu-system-aarch64 -machine virt -cpu \? | fgrep host
>   host
>   host (only available in KVM mode)
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  target/arm/helper.c | 6 ------
>  1 file changed, 6 deletions(-)
>
> diff --git a/target/arm/helper.c b/target/arm/helper.c
> index 22d812240a..66afb08ee0 100644
> --- a/target/arm/helper.c
> +++ b/target/arm/helper.c
> @@ -5591,12 +5591,6 @@ void arm_cpu_list(FILE *f, fprintf_function cpu_fprintf)
>      (*cpu_fprintf)(f, "Available CPUs:\n");
>      g_slist_foreach(list, arm_cpu_list_entry, &s);
>      g_slist_free(list);
> -#ifdef CONFIG_KVM
> -    /* The 'host' CPU type is dynamically registered only if KVM is
> -     * enabled, so we have to special-case it here:
> -     */
> -    (*cpu_fprintf)(f, "  host (only available in KVM mode)\n");
> -#endif
>  }

Applied to target-arm.next for 3.0, thanks.

-- PMM

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-07-30 14:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-27 13:23 [Qemu-devel] [PATCH] target/arm: Remove duplicate 'host' entry in '-cpu ?' output Philippe Mathieu-Daudé
2018-07-30 14:07 ` Peter Maydell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).