Claudio Fontana <cfont...@suse.de> writes:
> Signed-off-by: Claudio Fontana <cfont...@suse.de>
> ---
> MAINTAINERS | 2 +-
> accel/accel-common.c | 50 ++++++++++++++++++++++++++++++
> accel/{accel.c => accel-softmmu.c} | 27 ++--------------
> accel/accel-user.c | 24 ++++++++++++++
> accel/meson.build | 4 ++-
> accel/qtest/qtest.c | 2 +-
> accel/tcg/meson.build | 2 +-
> accel/tcg/tcg-all.c | 13 ++++++--
> accel/xen/xen-all.c | 2 +-
> bsd-user/main.c | 6 +++-
> include/hw/boards.h | 2 +-
> include/{sysemu => qemu}/accel.h | 14 +++++----
> include/sysemu/hvf.h | 2 +-
> include/sysemu/kvm.h | 2 +-
> include/sysemu/kvm_int.h | 2 +-
> linux-user/main.c | 6 +++-
> softmmu/memory.c | 2 +-
> softmmu/qtest.c | 2 +-
> softmmu/vl.c | 2 +-
> target/i386/hax/hax-all.c | 2 +-
> target/i386/hvf/hvf-i386.h | 2 +-
> target/i386/hvf/hvf.c | 2 +-
> target/i386/hvf/x86_task.c | 2 +-
> target/i386/whpx/whpx-all.c | 2 +-
> 24 files changed, 124 insertions(+), 52 deletions(-)
> create mode 100644 accel/accel-common.c
> rename accel/{accel.c => accel-softmmu.c} (75%)
> create mode 100644 accel/accel-user.c
> rename include/{sysemu => qemu}/accel.h (95%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index d876f504a6..6235dd3a9f 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -434,7 +434,7 @@ Overall
> M: Richard Henderson <richard.hender...@linaro.org>
> R: Paolo Bonzini <pbonz...@redhat.com>
> S: Maintained
> -F: include/sysemu/accel.h
> +F: include/qemu/accel.h
> F: accel/accel.c
> F: accel/Makefile.objs
> F: accel/stubs/Makefile.objs
> diff --git a/accel/accel-common.c b/accel/accel-common.c
> new file mode 100644
> index 0000000000..ddec8cb5ae
> --- /dev/null
> +++ b/accel/accel-common.c
> @@ -0,0 +1,50 @@
> +/*
> + * QEMU accel class, components common to system emulation and user mode
> + *
> + * Copyright (c) 2003-2008 Fabrice Bellard
> + * Copyright (c) 2014 Red Hat Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> copy
> + * of this software and associated documentation files (the "Software"), to
> deal
> + * in the Software without restriction, including without limitation the
> rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> + * THE SOFTWARE.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qemu/accel.h"
> +
> +static const TypeInfo accel_type = {
> + .name = TYPE_ACCEL,
> + .parent = TYPE_OBJECT,
> + .class_size = sizeof(AccelClass),
> + .instance_size = sizeof(AccelState),
> +};
> +
> +/* Lookup AccelClass from opt_name. Returns NULL if not found */
> +AccelClass *accel_find(const char *opt_name)
> +{
> + char *class_name = g_strdup_printf(ACCEL_CLASS_NAME("%s"), opt_name);
> + AccelClass *ac = ACCEL_CLASS(object_class_by_name(class_name));
> + g_free(class_name);
> + return ac;
> +}
> +
> +static void register_accel_types(void)
> +{
> + type_register_static(&accel_type);
> +}
> +
> +type_init(register_accel_types);
> diff --git a/accel/accel.c b/accel/accel-softmmu.c
> similarity index 75%
> rename from accel/accel.c
> rename to accel/accel-softmmu.c
> index cb555e3b06..f89da8f9d1 100644
> --- a/accel/accel.c
> +++ b/accel/accel-softmmu.c
> @@ -1,5 +1,5 @@
> /*
> - * QEMU System Emulator, accelerator interfaces
> + * QEMU accel class, system emulation components
> *
> * Copyright (c) 2003-2008 Fabrice Bellard
> * Copyright (c) 2014 Red Hat Inc.
> @@ -24,28 +24,12 @@
> */
>
> #include "qemu/osdep.h"
> -#include "sysemu/accel.h"
> +#include "qemu/accel.h"
> #include "hw/boards.h"
> #include "sysemu/arch_init.h"
> #include "sysemu/sysemu.h"
> #include "qom/object.h"
>
> -static const TypeInfo accel_type = {
> - .name = TYPE_ACCEL,
> - .parent = TYPE_OBJECT,
> - .class_size = sizeof(AccelClass),
> - .instance_size = sizeof(AccelState),
> -};
> -
> -/* Lookup AccelClass from opt_name. Returns NULL if not found */
> -AccelClass *accel_find(const char *opt_name)
> -{
> - char *class_name = g_strdup_printf(ACCEL_CLASS_NAME("%s"), opt_name);
> - AccelClass *ac = ACCEL_CLASS(object_class_by_name(class_name));
> - g_free(class_name);
> - return ac;
> -}
> -
> int accel_init_machine(AccelState *accel, MachineState *ms)
> {
> AccelClass *acc = ACCEL_GET_CLASS(accel);
> @@ -76,10 +60,3 @@ void accel_setup_post(MachineState *ms)
> acc->setup_post(ms, accel);
> }
> }
> -
> -static void register_accel_types(void)
> -{
> - type_register_static(&accel_type);
> -}
> -
> -type_init(register_accel_types);
> diff --git a/accel/accel-user.c b/accel/accel-user.c
> new file mode 100644
> index 0000000000..26bdda6236
> --- /dev/null
> +++ b/accel/accel-user.c
> @@ -0,0 +1,24 @@
> +/*
> + * QEMU accel class, user-mode components
> + *
> + * Copyright 2020 SUSE LLC
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> + * See the COPYING file in the top-level directory.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qemu/accel.h"
> +
> +AccelState *current_accel(void)
> +{
> + static AccelState *accel;
> +
> + if (!accel) {
> + AccelClass *ac = accel_find("tcg");
> +
> + g_assert(ac != NULL);
> + accel = ACCEL(object_new_with_class(OBJECT_CLASS(ac)));
> + }
> + return accel;
> +}
> diff --git a/accel/meson.build b/accel/meson.build
> index b26cca227a..b44ba30c86 100644
> --- a/accel/meson.build
> +++ b/accel/meson.build
> @@ -1,4 +1,6 @@
> -softmmu_ss.add(files('accel.c'))
> +specific_ss.add(files('accel-common.c'))
> +softmmu_ss.add(files('accel-softmmu.c'))
> +user_ss.add(files('accel-user.c'))
>
> subdir('qtest')
> subdir('kvm')
> diff --git a/accel/qtest/qtest.c b/accel/qtest/qtest.c
> index b282cea5cf..b4e731cb2b 100644
> --- a/accel/qtest/qtest.c
> +++ b/accel/qtest/qtest.c
> @@ -17,7 +17,7 @@
> #include "qemu/module.h"
> #include "qemu/option.h"
> #include "qemu/config-file.h"
> -#include "sysemu/accel.h"
> +#include "qemu/accel.h"
> #include "sysemu/qtest.h"
> #include "sysemu/cpus.h"
> #include "sysemu/cpu-timers.h"
> diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build
> index f39aab0a0c..424d9bb1fc 100644
> --- a/accel/tcg/meson.build
> +++ b/accel/tcg/meson.build
> @@ -1,5 +1,6 @@
> tcg_ss = ss.source_set()
> tcg_ss.add(files(
> + 'tcg-all.c',
> 'cpu-exec-common.c',
> 'cpu-exec.c',
> 'tcg-runtime-gvec.c',
> @@ -13,7 +14,6 @@ tcg_ss.add(when: 'CONFIG_PLUGIN', if_true:
> [files('plugin-gen.c'), libdl])
> specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss)
>
> specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files(
> - 'tcg-all.c',
> 'cputlb.c',
> 'tcg-cpus.c',
> 'tcg-cpus-mttcg.c',
> diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
> index 1ac0b76515..7125d0cc29 100644
> --- a/accel/tcg/tcg-all.c
> +++ b/accel/tcg/tcg-all.c
> @@ -30,9 +30,12 @@
> #include "tcg/tcg.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> -#include "hw/boards.h"
> +#include "qemu/accel.h"
> #include "qapi/qapi-builtin-visit.h"
> +
> +#ifndef CONFIG_USER_ONLY
> #include "tcg-cpus.h"
> +#endif /* CONFIG_USER_ONLY */
>
> struct TCGState {
> AccelState parent_obj;
> @@ -106,8 +109,12 @@ static int tcg_init(MachineState *ms)
> mttcg_enabled = s->mttcg_enabled;
>
> /*
> - * Initialize TCG regions
> + * Initialize TCG regions only for softmmu.
> + *
> + * This needs to be done later for user mode, because the prologue
> + * generation needs to be delayed so that GUEST_BASE is already set.
> */
> +#ifndef CONFIG_USER_ONLY
> tcg_region_init();
This implies we broke bisectability with:
accel/tcg: split tcg_start_vcpu_thread
<snip>
Otherwise with that fixed:
Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
--
Alex Bennée
