From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Harsh Prateek Bora" <harshpb@linux.ibm.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Yanan Wang" <wangyanan55@huawei.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Cédric Le Goater" <clegoate@redhat.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Laurent Vivier" <laurent@vivier.eu>,
qemu-arm@nongnu.org,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
qemu-ppc@nongnu.org, "David Gibson" <david@gibson.dropbear.id.au>,
"Ilya Leoshkevich" <iii@linux.ibm.com>,
"Eric Farman" <farman@linux.ibm.com>,
"Christian Borntraeger" <borntraeger@linux.ibm.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"David Hildenbrand" <david@redhat.com>,
qemu-s390x@nongnu.org, "Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PATCH 11/14] hw: skip registration of outdated versioned machine types
Date: Wed, 1 May 2024 19:27:56 +0100 [thread overview]
Message-ID: <20240501182759.2934195-12-berrange@redhat.com> (raw)
In-Reply-To: <20240501182759.2934195-1-berrange@redhat.com>
This calls the MACHINE_VER_DELETION() macro in the machine type
registration method, so that when a versioned machine type reaches
the end of its life, it is no longer registered with QOM and thus
cannot be used.
The actual definition of the machine type should be deleted at
this point, but experience shows that can easily be forgotten.
By skipping registration the manual code deletion task can be
done at any later date.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
hw/arm/virt.c | 1 +
hw/m68k/virt.c | 1 +
hw/ppc/spapr.c | 1 +
hw/s390x/s390-virtio-ccw.c | 1 +
include/hw/i386/pc.h | 1 +
5 files changed, 5 insertions(+)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index e2e10523a3..0786f82da6 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -123,6 +123,7 @@ static void arm_virt_compat_set(MachineClass *mc)
}; \
static void MACHINE_VER_SYM(register, virt, __VA_ARGS__)(void) \
{ \
+ MACHINE_VER_DELETION(__VA_ARGS__); \
type_register_static(&MACHINE_VER_SYM(info, virt, __VA_ARGS__)); \
} \
type_init(MACHINE_VER_SYM(register, virt, __VA_ARGS__));
diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index 37bb36b385..cda199af8f 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -356,6 +356,7 @@ type_init(virt_machine_register_types)
}; \
static void MACHINE_VER_SYM(register, virt, __VA_ARGS__)(void) \
{ \
+ MACHINE_VER_DELETION(__VA_ARGS__); \
type_register_static(&MACHINE_VER_SYM(info, virt, __VA_ARGS__)); \
} \
type_init(MACHINE_VER_SYM(register, virt, __VA_ARGS__));
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 7f5412f2ed..2aad99a2f2 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -4808,6 +4808,7 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
}; \
static void MACHINE_VER_SYM(register, spapr, __VA_ARGS__)(void) \
{ \
+ MACHINE_VER_DELETION(__VA_ARGS__); \
type_register(&MACHINE_VER_SYM(info, spapr, __VA_ARGS__)); \
} \
type_init(MACHINE_VER_SYM(register, spapr, __VA_ARGS__))
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 289a687434..723021f644 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -862,6 +862,7 @@ bool css_migration_enabled(void)
}; \
static void MACHINE_VER_SYM(register, ccw, __VA_ARGS__)(void) \
{ \
+ MACHINE_VER_DELETION(__VA_ARGS__); \
type_register_static(&MACHINE_VER_SYM(info, ccw, __VA_ARGS__)); \
} \
type_init(MACHINE_VER_SYM(register, ccw, __VA_ARGS__))
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index acc17c7dac..a605f223d5 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -337,6 +337,7 @@ extern const size_t pc_compat_2_0_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_init(MACHINE_VER_SYM(register, namesym, __VA_ARGS__));
--
2.43.0
next prev parent reply other threads:[~2024-05-01 18:33 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-01 18:27 [PATCH 00/14] hw: define and enforce a standard lifecycle for versioned machines Daniel P. Berrangé
2024-05-01 18:27 ` [PATCH 01/14] include/hw: add helpers for defining versioned machine types Daniel P. Berrangé
2024-05-02 10:34 ` Thomas Huth
2024-05-09 14:39 ` Daniel P. Berrangé
2024-05-02 14:57 ` Eric Blake
2024-05-02 16:54 ` Thomas Huth
2024-05-09 14:39 ` Daniel P. Berrangé
2024-05-01 18:27 ` [PATCH 02/14] hw/arm: convert 'virt' machine definitions to use new macros Daniel P. Berrangé
2024-05-02 12:11 ` Thomas Huth
2024-05-01 18:27 ` [PATCH 03/14] hw/s390x: convert 'ccw' " Daniel P. Berrangé
2024-05-02 11:12 ` Thomas Huth
2024-05-01 18:27 ` [PATCH 04/14] hw/ppc: convert 'spapr' " Daniel P. Berrangé
2024-05-02 11:57 ` Thomas Huth
2024-05-01 18:27 ` [PATCH 05/14] hw/m68k: convert 'virt' " Daniel P. Berrangé
2024-05-02 12:00 ` Thomas Huth
2024-05-01 18:27 ` [PATCH 06/14] hw/i386: convert 'i440fx' " Daniel P. Berrangé
2024-05-01 18:27 ` [PATCH 07/14] hw/i386: convert 'q35' " Daniel P. Berrangé
2024-05-01 18:27 ` [PATCH 08/14] include/hw: add macros for deprecation & removal of versioned machines Daniel P. Berrangé
2024-05-02 10:59 ` Thomas Huth
2024-05-09 14:42 ` Daniel P. Berrangé
2024-05-01 18:27 ` [PATCH 09/14] hw: temporarily disable deletion of versioned machine types Daniel P. Berrangé
2024-05-02 11:05 ` Thomas Huth
2024-05-02 11:13 ` Daniel P. Berrangé
2024-05-01 18:27 ` [PATCH 10/14] hw: set deprecation info for all " Daniel P. Berrangé
2024-05-02 11:06 ` Thomas Huth
2024-05-01 18:27 ` Daniel P. Berrangé [this message]
2024-05-02 12:02 ` [PATCH 11/14] hw: skip registration of outdated " Thomas Huth
2024-05-01 18:27 ` [PATCH 12/14] hw/ppc: remove obsolete manual deprecation reason string of spapr machines Daniel P. Berrangé
2024-05-02 12:04 ` Thomas Huth
2024-05-01 18:27 ` [PATCH 13/14] hw/i386: remove obsolete manual deprecation reason string of i440fx machines Daniel P. Berrangé
2024-05-02 12:08 ` Thomas Huth
2024-05-02 12:15 ` Daniel P. Berrangé
2024-05-01 18:27 ` [PATCH 14/14] docs: document special exception for machine type deprecation & removal Daniel P. Berrangé
2024-05-02 9:47 ` Thomas Huth
2024-05-02 9:53 ` Daniel P. Berrangé
2024-05-03 11:46 ` [PATCH 00/14] hw: define and enforce a standard lifecycle for versioned machines Cédric Le Goater
2024-05-03 12:14 ` Peter Maydell
2024-05-03 12:34 ` Daniel P. Berrangé
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=20240501182759.2934195-12-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=borntraeger@linux.ibm.com \
--cc=clegoate@redhat.com \
--cc=danielhb413@gmail.com \
--cc=david@gibson.dropbear.id.au \
--cc=david@redhat.com \
--cc=eduardo@habkost.net \
--cc=farman@linux.ibm.com \
--cc=harshpb@linux.ibm.com \
--cc=iii@linux.ibm.com \
--cc=laurent@vivier.eu \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=npiggin@gmail.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
--cc=wangyanan55@huawei.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).