motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 15:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/i386: define _AS_LATEST() macros for machine types

Browse source 
Follow the other architecture targets by adding extra macros for
defining a versioned machine type as the latest. This reduces the
size of the changes when introducing new machine types at the start
of each release cycle.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20240910163041.3764176-1-berrange@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Message-ID: <20241126103005.3794748-2-cohuck@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2024-11-26 11:30:04 +01:00 • committed by Thomas Huth
parent ae35f033b8
commit 7956b06068
3 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hw/i386/pc_piix.c
View file

@ -446,7 +446,10 @@ static void pc_i440fx_init(MachineState *machine)
} }
#define DEFINE_I440FX_MACHINE(major, minor) \ #define DEFINE_I440FX_MACHINE(major, minor) \
DEFINE_PC_VER_MACHINE(pc_i440fx, "pc-i440fx", pc_i440fx_init, major, minor); DEFINE_PC_VER_MACHINE(pc_i440fx, "pc-i440fx", pc_i440fx_init, false, NULL, major, minor);
#define DEFINE_I440FX_MACHINE_AS_LATEST(major, minor) \
DEFINE_PC_VER_MACHINE(pc_i440fx, "pc-i440fx", pc_i440fx_init, true, "pc", major, minor);
static void pc_i440fx_machine_options(MachineClass *m) static void pc_i440fx_machine_options(MachineClass *m)
{ {
@ -477,17 +480,13 @@ static void pc_i440fx_machine_options(MachineClass *m)
static void pc_i440fx_machine_9_2_options(MachineClass *m) static void pc_i440fx_machine_9_2_options(MachineClass *m)
{ {
pc_i440fx_machine_options(m); pc_i440fx_machine_options(m);
m->alias = "pc";
m->is_default = true;
} }
DEFINE_I440FX_MACHINE(9, 2); DEFINE_I440FX_MACHINE_AS_LATEST(9, 2);
static void pc_i440fx_machine_9_1_options(MachineClass *m) static void pc_i440fx_machine_9_1_options(MachineClass *m)
{ {
pc_i440fx_machine_9_2_options(m); pc_i440fx_machine_9_2_options(m);
m->alias = NULL;
m->is_default = false;
compat_props_add(m->compat_props, hw_compat_9_1, hw_compat_9_1_len); compat_props_add(m->compat_props, hw_compat_9_1, hw_compat_9_1_len);
compat_props_add(m->compat_props, pc_compat_9_1, pc_compat_9_1_len); compat_props_add(m->compat_props, pc_compat_9_1, pc_compat_9_1_len);
} }

11
hw/i386/pc_q35.c
View file

@ -327,10 +327,13 @@ static void pc_q35_init(MachineState *machine)
} }
#define DEFINE_Q35_MACHINE(major, minor) \ #define DEFINE_Q35_MACHINE(major, minor) \
DEFINE_PC_VER_MACHINE(pc_q35, "pc-q35", pc_q35_init, major, minor); DEFINE_PC_VER_MACHINE(pc_q35, "pc-q35", pc_q35_init, false, NULL, major, minor);
#define DEFINE_Q35_MACHINE_AS_LATEST(major, minor) \
DEFINE_PC_VER_MACHINE(pc_q35, "pc-q35", pc_q35_init, false, "q35", major, minor);
#define DEFINE_Q35_MACHINE_BUGFIX(major, minor, micro) \ #define DEFINE_Q35_MACHINE_BUGFIX(major, minor, micro) \
DEFINE_PC_VER_MACHINE(pc_q35, "pc-q35", pc_q35_init, major, minor, micro); DEFINE_PC_VER_MACHINE(pc_q35, "pc-q35", pc_q35_init, false, NULL, major, minor, micro);
static void pc_q35_machine_options(MachineClass *m) static void pc_q35_machine_options(MachineClass *m)
{ {
@ -359,15 +362,13 @@ static void pc_q35_machine_options(MachineClass *m)
static void pc_q35_machine_9_2_options(MachineClass *m) static void pc_q35_machine_9_2_options(MachineClass *m)
{ {
pc_q35_machine_options(m); pc_q35_machine_options(m);
m->alias = "q35";
} }
DEFINE_Q35_MACHINE(9, 2); DEFINE_Q35_MACHINE_AS_LATEST(9, 2);
static void pc_q35_machine_9_1_options(MachineClass *m) static void pc_q35_machine_9_1_options(MachineClass *m)
{ {
pc_q35_machine_9_2_options(m); pc_q35_machine_9_2_options(m);
m->alias = NULL;
compat_props_add(m->compat_props, hw_compat_9_1, hw_compat_9_1_len); compat_props_add(m->compat_props, hw_compat_9_1, hw_compat_9_1_len);
compat_props_add(m->compat_props, pc_compat_9_1, pc_compat_9_1_len); compat_props_add(m->compat_props, pc_compat_9_1, pc_compat_9_1_len);
} }

4
include/hw/i386/pc.h
View file

@ -320,7 +320,7 @@ extern const size_t pc_compat_2_3_len;
} \ } \
type_init(pc_machine_init_##suffix) type_init(pc_machine_init_##suffix)
#define DEFINE_PC_VER_MACHINE(namesym, namestr, initfn, ...) \ #define DEFINE_PC_VER_MACHINE(namesym, namestr, initfn, isdefault, malias, ...) \
static void MACHINE_VER_SYM(init, namesym, __VA_ARGS__)( \ static void MACHINE_VER_SYM(init, namesym, __VA_ARGS__)( \
MachineState *machine) \ MachineState *machine) \
{ \ { \
@ -334,6 +334,8 @@ extern const size_t pc_compat_2_3_len;
MACHINE_VER_SYM(options, namesym, __VA_ARGS__)(mc); \ MACHINE_VER_SYM(options, namesym, __VA_ARGS__)(mc); \
mc->init = MACHINE_VER_SYM(init, namesym, __VA_ARGS__); \ mc->init = MACHINE_VER_SYM(init, namesym, __VA_ARGS__); \
MACHINE_VER_DEPRECATION(__VA_ARGS__); \ MACHINE_VER_DEPRECATION(__VA_ARGS__); \
mc->is_default = isdefault; \
mc->alias = malias; \
} \ } \
static const TypeInfo MACHINE_VER_SYM(info, namesym, __VA_ARGS__) = \ static const TypeInfo MACHINE_VER_SYM(info, namesym, __VA_ARGS__) = \
{ \ { \