On Tue, 2014-06-24 at 15:02 -0300, Eduardo Habkost wrote: > They are not used anywhere else, to it is simpler to just keep them > closer to the places where they are used.
Isolation is always welcomed. Reviewed-by: Marcel Apfelbaum <marce...@redhat.com> > > Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> > --- > hw/i386/pc_q35.c | 37 +++++++++++++++++++++++++++++++++++++ > include/hw/i386/pc.h | 37 ------------------------------------- > 2 files changed, 37 insertions(+), 37 deletions(-) > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 155db99..c640e7b 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -354,6 +354,22 @@ static QEMUMachine pc_q35_machine_v2_1 = { > .init = pc_q35_init, > }; > > +#define PC_Q35_COMPAT_2_0 \ > + PC_COMPAT_2_0, \ > + {\ > + .driver = "ICH9-LPC",\ > + .property = "memory-hotplug-support",\ > + .value = "off",\ > + },{\ > + .driver = "xio3130-downstream",\ > + .property = COMPAT_PROP_PCP,\ > + .value = "off",\ > + },{\ > + .driver = "ioh3420",\ > + .property = COMPAT_PROP_PCP,\ > + .value = "off",\ > + } > + > #define PC_Q35_2_0_MACHINE_OPTIONS PC_Q35_2_1_MACHINE_OPTIONS > > static QEMUMachine pc_q35_machine_v2_0 = { > @@ -366,6 +382,15 @@ static QEMUMachine pc_q35_machine_v2_0 = { > }, > }; > > +#define PC_Q35_COMPAT_1_7 \ > + PC_COMPAT_1_7, \ > + PC_Q35_COMPAT_2_0, \ > + {\ > + .driver = "hpet",\ > + .property = HPET_INTCAP,\ > + .value = stringify(4),\ > + } > + > #define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS > > static QEMUMachine pc_q35_machine_v1_7 = { > @@ -378,6 +403,10 @@ static QEMUMachine pc_q35_machine_v1_7 = { > }, > }; > > +#define PC_Q35_COMPAT_1_6 \ > + PC_COMPAT_1_6, \ > + PC_Q35_COMPAT_1_7 > + > #define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS > > static QEMUMachine pc_q35_machine_v1_6 = { > @@ -390,6 +419,10 @@ static QEMUMachine pc_q35_machine_v1_6 = { > }, > }; > > +#define PC_Q35_COMPAT_1_5 \ > + PC_COMPAT_1_5, \ > + PC_Q35_COMPAT_1_6 > + > static QEMUMachine pc_q35_machine_v1_5 = { > PC_Q35_1_6_MACHINE_OPTIONS, > .name = "pc-q35-1.5", > @@ -400,6 +433,10 @@ static QEMUMachine pc_q35_machine_v1_5 = { > }, > }; > > +#define PC_Q35_COMPAT_1_4 \ > + PC_COMPAT_1_4, \ > + PC_Q35_COMPAT_1_5 > + > #define PC_Q35_1_4_MACHINE_OPTIONS \ > PC_Q35_1_6_MACHINE_OPTIONS, \ > .hot_add_cpu = NULL > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 486e98f..fb7d68d 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -294,43 +294,6 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); > int e820_get_num_entries(void); > bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); > > -#define PC_Q35_COMPAT_2_0 \ > - PC_COMPAT_2_0, \ > - {\ > - .driver = "ICH9-LPC",\ > - .property = "memory-hotplug-support",\ > - .value = "off",\ > - },{\ > - .driver = "xio3130-downstream",\ > - .property = COMPAT_PROP_PCP,\ > - .value = "off",\ > - },{\ > - .driver = "ioh3420",\ > - .property = COMPAT_PROP_PCP,\ > - .value = "off",\ > - } > - > -#define PC_Q35_COMPAT_1_7 \ > - PC_COMPAT_1_7, \ > - PC_Q35_COMPAT_2_0, \ > - {\ > - .driver = "hpet",\ > - .property = HPET_INTCAP,\ > - .value = stringify(4),\ > - } > - > -#define PC_Q35_COMPAT_1_6 \ > - PC_COMPAT_1_6, \ > - PC_Q35_COMPAT_1_7 > - > -#define PC_Q35_COMPAT_1_5 \ > - PC_COMPAT_1_5, \ > - PC_Q35_COMPAT_1_6 > - > -#define PC_Q35_COMPAT_1_4 \ > - PC_COMPAT_1_4, \ > - PC_Q35_COMPAT_1_5 > - > #define PC_COMPAT_2_0 \ > {\ > .driver = "virtio-scsi-pci",\