diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-05-14 15:53:03 -0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-05-31 16:26:41 +0200 |
| commit | 42134ac9d74799cf2f70257798b72a2988b75d31 (patch) | |
| tree | 8e376fac52d12124945c378dabc5532c24b40300 /hw | |
| parent | 1edbde82b809f80b973978886d8232fbf280cb03 (diff) | |
pc: Define PC_COMPAT_2_[123] macros
Once we start adding compat code for pc-2.3, the usage of HW_COMPAT_2_1
in pc-*-2.2 won't be enough, as it also has to include PC_COMPAT_2_3
inside it. To ensure that, define PC_COMPAT_2_3, PC_COMPAT_2_2, and
PC_COMPAT_2_1 macros.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/pc_piix.c | 10 | ||||
| -rw-r--r-- | hw/i386/pc_q35.c | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 25da8a5025..8796e60b8e 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -543,6 +543,10 @@ static QEMUMachine pc_i440fx_machine_v2_3 = { PC_I440FX_2_3_MACHINE_OPTIONS, .name = "pc-i440fx-2.3", .init = pc_init_pci_2_3, + .compat_props = (GlobalProperty[]) { + PC_COMPAT_2_3 + { /* end of list */ } + }, }; #define PC_I440FX_2_2_MACHINE_OPTIONS PC_I440FX_2_3_MACHINE_OPTIONS @@ -551,6 +555,10 @@ static QEMUMachine pc_i440fx_machine_v2_2 = { PC_I440FX_2_2_MACHINE_OPTIONS, .name = "pc-i440fx-2.2", .init = pc_init_pci_2_2, + .compat_props = (GlobalProperty[]) { + PC_COMPAT_2_2 + { /* end of list */ } + }, }; #define PC_I440FX_2_1_MACHINE_OPTIONS \ @@ -562,7 +570,7 @@ static QEMUMachine pc_i440fx_machine_v2_1 = { .name = "pc-i440fx-2.1", .init = pc_init_pci_2_1, .compat_props = (GlobalProperty[]) { - HW_COMPAT_2_1 + PC_COMPAT_2_1 { /* end of list */ } }, }; diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index d0d70e8b90..0051666ce2 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -439,6 +439,10 @@ static QEMUMachine pc_q35_machine_v2_3 = { PC_Q35_2_3_MACHINE_OPTIONS, .name = "pc-q35-2.3", .init = pc_q35_init_2_3, + .compat_props = (GlobalProperty[]) { + PC_COMPAT_2_3 + { /* end of list */ } + }, }; #define PC_Q35_2_2_MACHINE_OPTIONS PC_Q35_2_3_MACHINE_OPTIONS @@ -447,6 +451,10 @@ static QEMUMachine pc_q35_machine_v2_2 = { PC_Q35_2_2_MACHINE_OPTIONS, .name = "pc-q35-2.2", .init = pc_q35_init_2_2, + .compat_props = (GlobalProperty[]) { + PC_COMPAT_2_2 + { /* end of list */ } + }, }; #define PC_Q35_2_1_MACHINE_OPTIONS \ @@ -458,7 +466,7 @@ static QEMUMachine pc_q35_machine_v2_1 = { .name = "pc-q35-2.1", .init = pc_q35_init_2_1, .compat_props = (GlobalProperty[]) { - HW_COMPAT_2_1 + PC_COMPAT_2_1 { /* end of list */ } }, }; |