From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wi3zo-0003m9-6G for qemu-devel@nongnu.org; Wed, 07 May 2014 11:43:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wi3zj-00055q-Gb for qemu-devel@nongnu.org; Wed, 07 May 2014 11:43:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54950) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wi3zj-000556-86 for qemu-devel@nongnu.org; Wed, 07 May 2014 11:42:55 -0400 Date: Wed, 7 May 2014 18:41:36 +0300 From: "Michael S. Tsirkin" Message-ID: <1399477052-18612-6-git-send-email-mst@redhat.com> References: <1399477052-18612-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1399477052-18612-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 05/10] pc: add compat_props placeholder for 2.0 machine type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Gabriel Somlo , Alexander Graf , "Gabriel L. Somlo" , Anthony Liguori , =?us-ascii?B?PT9VVEYtOD9xP0FuZHJlYXM9MjBGPUMzPUE0cmJlcj89?= From: "Gabriel L. Somlo" Add the "boilerplate" necessary for subsequent patches to simply drop in compat_props for pc machines 2.0 and older. This patch contains no functional changes. Signed-off-by: Gabriel Somlo Acked-by: Alexander Graf Reviewed-by: Andreas F=E4rber Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/i386/pc.h | 9 +++++++++ hw/i386/pc_piix.c | 4 ++++ hw/i386/pc_q35.c | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 9f26e14..0ade0f1 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -242,8 +242,12 @@ 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 *); =20 +#define PC_Q35_COMPAT_2_0 \ + PC_COMPAT_2_0 + #define PC_Q35_COMPAT_1_7 \ PC_COMPAT_1_7, \ + PC_Q35_COMPAT_2_0, \ {\ .driver =3D "hpet",\ .property =3D HPET_INTCAP,\ @@ -262,7 +266,12 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint6= 4_t *); PC_COMPAT_1_4, \ PC_Q35_COMPAT_1_5 =20 +#define PC_COMPAT_2_0 \ + {\ + } + #define PC_COMPAT_1_7 \ + PC_COMPAT_2_0, \ {\ .driver =3D TYPE_USB_DEVICE,\ .property =3D "msos-desc",\ diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ea72502..eaf3e61 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -414,6 +414,10 @@ static QEMUMachine pc_i440fx_machine_v2_0 =3D { PC_I440FX_2_0_MACHINE_OPTIONS, .name =3D "pc-i440fx-2.0", .init =3D pc_init_pci_2_0, + .compat_props =3D (GlobalProperty[]) { + PC_COMPAT_2_0, + { /* end of list */ } + }, }; =20 #define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 3306f89..9517ec6 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -327,6 +327,10 @@ static QEMUMachine pc_q35_machine_v2_0 =3D { PC_Q35_2_0_MACHINE_OPTIONS, .name =3D "pc-q35-2.0", .init =3D pc_q35_init_2_0, + .compat_props =3D (GlobalProperty[]) { + PC_Q35_COMPAT_2_0, + { /* end of list */ } + }, }; =20 #define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS --=20 MST