qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Zhao Liu <zhao1.liu@intel.com>
To: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Daniel P . Berrangé" <berrange@redhat.com>,
	"Eduardo Habkost" <eduardo@habkost.net>
Cc: qemu-devel@nongnu.org, Zhao Liu <zhao1.liu@intel.com>
Subject: [PATCH 10/16] i386: Replace type_register() with type_register_static()
Date: Tue, 29 Oct 2024 16:59:28 +0800	[thread overview]
Message-ID: <20241029085934.2799066-11-zhao1.liu@intel.com> (raw)
In-Reply-To: <20241029085934.2799066-1-zhao1.liu@intel.com>

Replace type_register() with type_register_static() because
type_register() will be deprecated.

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
 include/hw/i386/pc.h | 4 ++--
 target/i386/cpu.c    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 14ee06287da3..b3477ad6a291 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 1ff1af032eaa..241bbef5d60b 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -6347,7 +6347,7 @@ static void x86_register_cpu_model_type(const char *name, X86CPUModel *model)
         .class_data = model,
     };
 
-    type_register(&ti);
+    type_register_static(&ti);
 }
 
 
-- 
2.34.1



  parent reply	other threads:[~2024-10-29  8:45 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-29  8:59 [PATCH 00/16] qom/object: Deprecate type_register() Zhao Liu
2024-10-29  8:59 ` [PATCH 01/16] arm: Replace type_register() with type_register_static() Zhao Liu
2024-10-29  8:59 ` [PATCH 02/16] hw/block: " Zhao Liu
2024-10-29  8:59 ` [PATCH 03/16] hw/net: " Zhao Liu
2024-10-29  8:59 ` [PATCH 04/16] ppc: " Zhao Liu
2024-10-29  8:59 ` [PATCH 05/16] hw/rtc: " Zhao Liu
2024-10-29  8:59 ` [PATCH 06/16] hw/scsi: " Zhao Liu
2024-10-29  8:59 ` [PATCH 07/16] hw/sensor: " Zhao Liu
2024-10-29  8:59 ` [PATCH 08/16] hw/usb: " Zhao Liu
2024-10-29  8:59 ` [PATCH 09/16] hw/virtio: " Zhao Liu
2024-10-29  8:59 ` Zhao Liu [this message]
2024-10-29  8:59 ` [PATCH 11/16] target/mips: " Zhao Liu
2024-10-29  8:59 ` [PATCH 12/16] target/sparc: " Zhao Liu
2024-10-29  8:59 ` [PATCH 13/16] target/xtensa: " Zhao Liu
2024-10-29  8:59 ` [PATCH 14/16] ui: " Zhao Liu
2024-10-29  8:59 ` [PATCH 15/16] script/codeconverter/qom_type_info: Deprecate MakeTypeRegisterStatic and MakeTypeRegisterNotStatic Zhao Liu
2024-10-29  8:59 ` [PATCH 16/16] qom/object: Deprecate type_register() Zhao Liu
2024-12-10 16:20 ` [PATCH 00/16] " Zhao Liu
2024-12-10 17:43 ` Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241029085934.2799066-11-zhao1.liu@intel.com \
    --to=zhao1.liu@intel.com \
    --cc=berrange@redhat.com \
    --cc=eduardo@habkost.net \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).