diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2023-10-04 11:06:21 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-10-07 19:02:57 +0200 |
| commit | 0017c64e1ce298796caee2d38bde9d7fc59a1510 (patch) | |
| tree | 14f40a56844adb136f2b44320b65e2f7b5af35c8 | |
| parent | 7893e42d5d9cafeeab30a114e8ec86517f8a1b36 (diff) | |
| download | qemu-0017c64e1ce298796caee2d38bde9d7fc59a1510.zip qemu-0017c64e1ce298796caee2d38bde9d7fc59a1510.tar.gz qemu-0017c64e1ce298796caee2d38bde9d7fc59a1510.tar.bz2 | |
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é <philmd@linaro.org>
Message-ID: <20231004090629.37473-7-philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | accel/accel-system.c (renamed from accel/accel-softmmu.c) | 6 | ||||
| -rw-r--r-- | accel/accel-system.h (renamed from accel/accel-softmmu.h) | 6 | ||||
| -rw-r--r-- | accel/accel-target.c | 2 | ||||
| -rw-r--r-- | accel/meson.build | 2 | ||||
| -rw-r--r-- | accel/stubs/meson.build | 10 |
5 files changed, 13 insertions, 13 deletions
diff --git a/accel/accel-softmmu.c b/accel/accel-system.c index 9c804ba..fa8f437 100644 --- a/accel/accel-softmmu.c +++ b/accel/accel-system.c @@ -28,7 +28,7 @@ #include "hw/boards.h" #include "sysemu/cpus.h" #include "qemu/error-report.h" -#include "accel-softmmu.h" +#include "accel-system.h" int accel_init_machine(AccelState *accel, MachineState *ms) { @@ -99,8 +99,8 @@ static const TypeInfo accel_ops_type_info = { .class_size = sizeof(AccelOpsClass), }; -static void accel_softmmu_register_types(void) +static void accel_system_register_types(void) { type_register_static(&accel_ops_type_info); } -type_init(accel_softmmu_register_types); +type_init(accel_system_register_types); diff --git a/accel/accel-softmmu.h b/accel/accel-system.h index 5e192f1..d41c62f 100644 --- a/accel/accel-softmmu.h +++ b/accel/accel-system.h @@ -7,9 +7,9 @@ * See the COPYING file in the top-level directory. */ -#ifndef ACCEL_SOFTMMU_H -#define ACCEL_SOFTMMU_H +#ifndef ACCEL_SYSTEM_H +#define ACCEL_SYSTEM_H void accel_init_ops_interfaces(AccelClass *ac); -#endif /* ACCEL_SOFTMMU_H */ +#endif /* ACCEL_SYSTEM_H */ diff --git a/accel/accel-target.c b/accel/accel-target.c index 11d74b4..7e3cbde 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 fda3157..5eaeb68 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 6b0f200..91a2d21 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) |