| Message ID | 20180727132311.2777-1-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | target/arm: Remove duplicate 'host' entry in '-cpu ?' output | expand |
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
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)
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(-)