Skip to content

Commit 0017c64

Browse files
philmdbonzini
authored andcommitted
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é <[email protected]> Message-ID: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 7893e42 commit 0017c64

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

accel/accel-softmmu.c accel/accel-system.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "hw/boards.h"
2929
#include "sysemu/cpus.h"
3030
#include "qemu/error-report.h"
31-
#include "accel-softmmu.h"
31+
#include "accel-system.h"
3232

3333
int accel_init_machine(AccelState *accel, MachineState *ms)
3434
{
@@ -99,8 +99,8 @@ static const TypeInfo accel_ops_type_info = {
9999
.class_size = sizeof(AccelOpsClass),
100100
};
101101

102-
static void accel_softmmu_register_types(void)
102+
static void accel_system_register_types(void)
103103
{
104104
type_register_static(&accel_ops_type_info);
105105
}
106-
type_init(accel_softmmu_register_types);
106+
type_init(accel_system_register_types);

accel/accel-softmmu.h accel/accel-system.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* See the COPYING file in the top-level directory.
88
*/
99

10-
#ifndef ACCEL_SOFTMMU_H
11-
#define ACCEL_SOFTMMU_H
10+
#ifndef ACCEL_SYSTEM_H
11+
#define ACCEL_SYSTEM_H
1212

1313
void accel_init_ops_interfaces(AccelClass *ac);
1414

15-
#endif /* ACCEL_SOFTMMU_H */
15+
#endif /* ACCEL_SYSTEM_H */

accel/accel-target.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "hw/core/accel-cpu.h"
3131

3232
#ifndef CONFIG_USER_ONLY
33-
#include "accel-softmmu.h"
33+
#include "accel-system.h"
3434
#endif /* !CONFIG_USER_ONLY */
3535

3636
static const TypeInfo accel_type = {

accel/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
specific_ss.add(files('accel-target.c'))
2-
system_ss.add(files('accel-softmmu.c', 'accel-blocker.c'))
2+
system_ss.add(files('accel-system.c', 'accel-blocker.c'))
33
user_ss.add(files('accel-user.c'))
44

55
subdir('tcg')

accel/stubs/meson.build

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
sysemu_stubs_ss = ss.source_set()
2-
sysemu_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c'))
3-
sysemu_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c'))
4-
sysemu_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c'))
1+
system_stubs_ss = ss.source_set()
2+
system_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c'))
3+
system_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c'))
4+
system_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c'))
55

6-
specific_ss.add_all(when: ['CONFIG_SYSTEM_ONLY'], if_true: sysemu_stubs_ss)
6+
specific_ss.add_all(when: ['CONFIG_SYSTEM_ONLY'], if_true: system_stubs_ss)

0 commit comments

Comments
 (0)