From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36854) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzV3B-0000tV-Ts for qemu-devel@nongnu.org; Tue, 24 Jun 2014 14:02:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WzV2z-00031j-R4 for qemu-devel@nongnu.org; Tue, 24 Jun 2014 14:02:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49372) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzV2z-00031d-JW for qemu-devel@nongnu.org; Tue, 24 Jun 2014 14:02:21 -0400 From: Eduardo Habkost Date: Tue, 24 Jun 2014 15:02:01 -0300 Message-Id: <1403632924-16603-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1403632924-16603-1-git-send-email-ehabkost@redhat.com> References: <1403632924-16603-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] q35: Move q35-specific compat macros to pc_q35.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, "Michael S. Tsirkin" Cc: Peter Maydell , Marcel Apfelbaum , Alexey Kardashevskiy , Markus Armbruster , Paul Mackerras , Anthony Liguori , Igor Mammedov , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf They are not used anywhere else, to it is simpler to just keep them closer to the places where they are used. Signed-off-by: Eduardo Habkost --- 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",\ -- 1.9.3