From: Philippe Mathieu-Daudé Date: Wed, 4 Oct 2023 09:06:21 +0000 (+0200) Subject: accel: Rename accel_softmmu* -> accel_system* X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0017c64e1ce298796caee2d38bde9d7fc59a1510;p=qemu.git accel: Rename accel_softmmu* -> accel_system* Rename accel.softmmu -> accel.system in file paths and the register_types() method. Rename sysemu_stubs_ss -> system_stubs_ss in meson following the pattern used on other source set names. Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20231004090629.37473-7-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- diff --git a/accel/accel-softmmu.c b/accel/accel-softmmu.c deleted file mode 100644 index 9c804ba9e3..0000000000 --- a/accel/accel-softmmu.c +++ /dev/null @@ -1,106 +0,0 @@ -/* - * QEMU accel class, system emulation components - * - * 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" -#include "hw/boards.h" -#include "sysemu/cpus.h" -#include "qemu/error-report.h" -#include "accel-softmmu.h" - -int accel_init_machine(AccelState *accel, MachineState *ms) -{ - AccelClass *acc = ACCEL_GET_CLASS(accel); - int ret; - ms->accelerator = accel; - *(acc->allowed) = true; - ret = acc->init_machine(ms); - if (ret < 0) { - ms->accelerator = NULL; - *(acc->allowed) = false; - object_unref(OBJECT(accel)); - } else { - object_set_accelerator_compat_props(acc->compat_props); - } - return ret; -} - -AccelState *current_accel(void) -{ - return current_machine->accelerator; -} - -void accel_setup_post(MachineState *ms) -{ - AccelState *accel = ms->accelerator; - AccelClass *acc = ACCEL_GET_CLASS(accel); - if (acc->setup_post) { - acc->setup_post(ms, accel); - } -} - -/* initialize the arch-independent accel operation interfaces */ -void accel_init_ops_interfaces(AccelClass *ac) -{ - const char *ac_name; - char *ops_name; - ObjectClass *oc; - AccelOpsClass *ops; - - ac_name = object_class_get_name(OBJECT_CLASS(ac)); - g_assert(ac_name != NULL); - - ops_name = g_strdup_printf("%s" ACCEL_OPS_SUFFIX, ac_name); - ops = ACCEL_OPS_CLASS(module_object_class_by_name(ops_name)); - oc = module_object_class_by_name(ops_name); - if (!oc) { - error_report("fatal: could not load module for type '%s'", ops_name); - exit(1); - } - g_free(ops_name); - ops = ACCEL_OPS_CLASS(oc); - /* - * all accelerators need to define ops, providing at least a mandatory - * non-NULL create_vcpu_thread operation. - */ - g_assert(ops != NULL); - if (ops->ops_init) { - ops->ops_init(ops); - } - cpus_register_accel(ops); -} - -static const TypeInfo accel_ops_type_info = { - .name = TYPE_ACCEL_OPS, - .parent = TYPE_OBJECT, - .abstract = true, - .class_size = sizeof(AccelOpsClass), -}; - -static void accel_softmmu_register_types(void) -{ - type_register_static(&accel_ops_type_info); -} -type_init(accel_softmmu_register_types); diff --git a/accel/accel-softmmu.h b/accel/accel-softmmu.h deleted file mode 100644 index 5e192f1882..0000000000 --- a/accel/accel-softmmu.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * QEMU System Emulation accel internal functions - * - * Copyright 2021 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. - */ - -#ifndef ACCEL_SOFTMMU_H -#define ACCEL_SOFTMMU_H - -void accel_init_ops_interfaces(AccelClass *ac); - -#endif /* ACCEL_SOFTMMU_H */ diff --git a/accel/accel-system.c b/accel/accel-system.c new file mode 100644 index 0000000000..fa8f43757c --- /dev/null +++ b/accel/accel-system.c @@ -0,0 +1,106 @@ +/* + * QEMU accel class, system emulation components + * + * 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" +#include "hw/boards.h" +#include "sysemu/cpus.h" +#include "qemu/error-report.h" +#include "accel-system.h" + +int accel_init_machine(AccelState *accel, MachineState *ms) +{ + AccelClass *acc = ACCEL_GET_CLASS(accel); + int ret; + ms->accelerator = accel; + *(acc->allowed) = true; + ret = acc->init_machine(ms); + if (ret < 0) { + ms->accelerator = NULL; + *(acc->allowed) = false; + object_unref(OBJECT(accel)); + } else { + object_set_accelerator_compat_props(acc->compat_props); + } + return ret; +} + +AccelState *current_accel(void) +{ + return current_machine->accelerator; +} + +void accel_setup_post(MachineState *ms) +{ + AccelState *accel = ms->accelerator; + AccelClass *acc = ACCEL_GET_CLASS(accel); + if (acc->setup_post) { + acc->setup_post(ms, accel); + } +} + +/* initialize the arch-independent accel operation interfaces */ +void accel_init_ops_interfaces(AccelClass *ac) +{ + const char *ac_name; + char *ops_name; + ObjectClass *oc; + AccelOpsClass *ops; + + ac_name = object_class_get_name(OBJECT_CLASS(ac)); + g_assert(ac_name != NULL); + + ops_name = g_strdup_printf("%s" ACCEL_OPS_SUFFIX, ac_name); + ops = ACCEL_OPS_CLASS(module_object_class_by_name(ops_name)); + oc = module_object_class_by_name(ops_name); + if (!oc) { + error_report("fatal: could not load module for type '%s'", ops_name); + exit(1); + } + g_free(ops_name); + ops = ACCEL_OPS_CLASS(oc); + /* + * all accelerators need to define ops, providing at least a mandatory + * non-NULL create_vcpu_thread operation. + */ + g_assert(ops != NULL); + if (ops->ops_init) { + ops->ops_init(ops); + } + cpus_register_accel(ops); +} + +static const TypeInfo accel_ops_type_info = { + .name = TYPE_ACCEL_OPS, + .parent = TYPE_OBJECT, + .abstract = true, + .class_size = sizeof(AccelOpsClass), +}; + +static void accel_system_register_types(void) +{ + type_register_static(&accel_ops_type_info); +} +type_init(accel_system_register_types); diff --git a/accel/accel-system.h b/accel/accel-system.h new file mode 100644 index 0000000000..d41c62f21b --- /dev/null +++ b/accel/accel-system.h @@ -0,0 +1,15 @@ +/* + * QEMU System Emulation accel internal functions + * + * Copyright 2021 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. + */ + +#ifndef ACCEL_SYSTEM_H +#define ACCEL_SYSTEM_H + +void accel_init_ops_interfaces(AccelClass *ac); + +#endif /* ACCEL_SYSTEM_H */ diff --git a/accel/accel-target.c b/accel/accel-target.c index 11d74b4ad7..7e3cbde5df 100644 --- a/accel/accel-target.c +++ b/accel/accel-target.c @@ -30,7 +30,7 @@ #include "hw/core/accel-cpu.h" #ifndef CONFIG_USER_ONLY -#include "accel-softmmu.h" +#include "accel-system.h" #endif /* !CONFIG_USER_ONLY */ static const TypeInfo accel_type = { diff --git a/accel/meson.build b/accel/meson.build index fda3157a6e..5eaeb68338 100644 --- a/accel/meson.build +++ b/accel/meson.build @@ -1,5 +1,5 @@ specific_ss.add(files('accel-target.c')) -system_ss.add(files('accel-softmmu.c', 'accel-blocker.c')) +system_ss.add(files('accel-system.c', 'accel-blocker.c')) user_ss.add(files('accel-user.c')) subdir('tcg') diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build index 6b0f200efe..91a2d21925 100644 --- a/accel/stubs/meson.build +++ b/accel/stubs/meson.build @@ -1,6 +1,6 @@ -sysemu_stubs_ss = ss.source_set() -sysemu_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) -sysemu_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) -sysemu_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) +system_stubs_ss = ss.source_set() +system_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) +system_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) +system_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) -specific_ss.add_all(when: ['CONFIG_SYSTEM_ONLY'], if_true: sysemu_stubs_ss) +specific_ss.add_all(when: ['CONFIG_SYSTEM_ONLY'], if_true: system_stubs_ss)