[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/26] accel: Rename accel_softmmu* -> accel_system*
From: |
Paolo Bonzini |
Subject: |
[PULL 10/26] accel: Rename accel_softmmu* -> accel_system* |
Date: |
Fri, 6 Oct 2023 13:13:56 +0200 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
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>
---
accel/accel-common.c | 2 +-
accel/{accel-softmmu.c => accel-system.c} | 6 +++---
accel/{accel-softmmu.h => accel-system.h} | 6 +++---
accel/meson.build | 2 +-
accel/stubs/meson.build | 10 +++++-----
5 files changed, 13 insertions(+), 13 deletions(-)
rename accel/{accel-softmmu.c => accel-system.c} (96%)
rename accel/{accel-softmmu.h => accel-system.h} (77%)
diff --git a/accel/accel-common.c b/accel/accel-common.c
index df72cc989a9..965318daa36 100644
--- a/accel/accel-common.c
+++ b/accel/accel-common.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/accel-softmmu.c b/accel/accel-system.c
similarity index 96%
rename from accel/accel-softmmu.c
rename to accel/accel-system.c
index 9c804ba9e3b..fa8f43757ce 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
similarity index 77%
rename from accel/accel-softmmu.h
rename to accel/accel-system.h
index 5e192f1882e..d41c62f21b1 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/meson.build b/accel/meson.build
index 638a9a03ba9..3376810921d 100644
--- a/accel/meson.build
+++ b/accel/meson.build
@@ -1,5 +1,5 @@
specific_ss.add(files('accel-common.c', 'accel-blocker.c'))
-system_ss.add(files('accel-softmmu.c'))
+system_ss.add(files('accel-system.c'))
user_ss.add(files('accel-user.c'))
subdir('tcg')
diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build
index 6b0f200efe9..91a2d219258 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)
--
2.41.0
- [PULL 00/26] Audio, source reorg, HVF changes for 2023-10-06, Paolo Bonzini, 2023/10/06
- [PULL 01/26] target/i386/hvf: Remove unused includes in 'hvf-i386.h', Paolo Bonzini, 2023/10/06
- [PULL 04/26] target/i386: Check for USER_ONLY definition instead of SOFTMMU one, Paolo Bonzini, 2023/10/06
- [PULL 05/26] softmmu/trace-events: Fix a typo, Paolo Bonzini, 2023/10/06
- [PULL 08/26] fuzz: Correct invalid mentions of 'softmmu' by 'system', Paolo Bonzini, 2023/10/06
- [PULL 03/26] util/log: re-allow switching away from stderr log file, Paolo Bonzini, 2023/10/06
- [PULL 02/26] sysemu/kvm: Restrict hvf_get_supported_cpuid() to x86 targets, Paolo Bonzini, 2023/10/06
- [PULL 09/26] tcg: Correct invalid mentions of 'softmmu' by 'system-mode', Paolo Bonzini, 2023/10/06
- [PULL 10/26] accel: Rename accel_softmmu* -> accel_system*,
Paolo Bonzini <=
- [PULL 12/26] semihosting: Rename softmmu_FOO_user() -> uaccess_FOO_user(), Paolo Bonzini, 2023/10/06
- [PULL 07/26] cpu: Correct invalid mentions of 'softmmu' by 'system-mode', Paolo Bonzini, 2023/10/06
- [PULL 16/26] meson: Rename target_softmmu_arch -> target_system_arch, Paolo Bonzini, 2023/10/06
- [PULL 11/26] gdbstub: Rename 'softmmu' -> 'system', Paolo Bonzini, 2023/10/06
- [PULL 06/26] travis-ci: Correct invalid mentions of 'softmmu' by 'system', Paolo Bonzini, 2023/10/06
- [PULL 17/26] system: Rename softmmu/ directory as system/, Paolo Bonzini, 2023/10/06
- [PULL 19/26] cutils: squelch compiler warnings with custom paths, Paolo Bonzini, 2023/10/06
- [PULL 20/26] audio: error hints need a trailing \n, Paolo Bonzini, 2023/10/06
- [PULL 18/26] configure: change $softmmu to $system, Paolo Bonzini, 2023/10/06
- [PULL 13/26] target/i386: Rename i386_softmmu_kvm_ss -> i386_kvm_ss, Paolo Bonzini, 2023/10/06