aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhao Liu <zhao1.liu@intel.com>2024-10-29 16:59:28 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2024-12-10 18:49:25 +0100
commit81b69b502e3f67d357766ad42ae9a3f8bd675ad2 (patch)
tree86f2f969be6a00395ad3d6cde1f4dedc613b47dd
parent3b5f3070386e5b2a48e0e96ff96ef2251131eeb8 (diff)
downloadqemu-81b69b502e3f67d357766ad42ae9a3f8bd675ad2.zip
qemu-81b69b502e3f67d357766ad42ae9a3f8bd675ad2.tar.gz
qemu-81b69b502e3f67d357766ad42ae9a3f8bd675ad2.tar.bz2
i386: Replace type_register() with type_register_static()
Replace type_register() with type_register_static() because type_register() will be deprecated. Signed-off-by: Zhao Liu <zhao1.liu@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Link: https://lore.kernel.org/r/20241029085934.2799066-11-zhao1.liu@intel.com
-rw-r--r--include/hw/i386/pc.h4
-rw-r--r--target/i386/cpu.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 14ee062..b3477ad 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -316,7 +316,7 @@ extern const size_t pc_compat_2_3_len;
}; \
static void pc_machine_init_##suffix(void) \
{ \
- type_register(&pc_machine_type_##suffix); \
+ type_register_static(&pc_machine_type_##suffix); \
} \
type_init(pc_machine_init_##suffix)
@@ -344,7 +344,7 @@ extern const size_t pc_compat_2_3_len;
static void MACHINE_VER_SYM(register, namesym, __VA_ARGS__)(void) \
{ \
MACHINE_VER_DELETION(__VA_ARGS__); \
- type_register(&MACHINE_VER_SYM(info, namesym, __VA_ARGS__)); \
+ type_register_static(&MACHINE_VER_SYM(info, namesym, __VA_ARGS__)); \
} \
type_init(MACHINE_VER_SYM(register, namesym, __VA_ARGS__));
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 3725dbb..305f2a4 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -6429,7 +6429,7 @@ static void x86_register_cpu_model_type(const char *name, X86CPUModel *model)
.class_data = model,
};
- type_register(&ti);
+ type_register_static(&ti);
}