From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzOkL-0006La-1o for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:23:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzOkJ-0007U6-Rf for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:23:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58849) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzOkJ-0007Tz-Mn for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:23:11 -0400 Date: Mon, 1 Jun 2015 14:23:07 +0200 From: "Michael S. Tsirkin" Message-ID: <1433161230-29421-15-git-send-email-mst@redhat.com> References: <1433161230-29421-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1433161230-29421-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v2 14/60] piix: Move pc-0.13 virtio-9p-pci compat to PC_COMPAT_0_13 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Gerd Hoffmann , Eduardo Habkost , "Aneesh Kumar K.V" , Paolo Bonzini , Richard Henderson From: Eduardo Habkost The compat property was added by commit 9dbcca5aa13cb9ab40788ac4c56bc227d94ca920, and the pc-0.12 and older machine-types were not changed because virtio-9p-pci was introduced on QEMU 0.13 (commit 9f10751365b26b13b8a9b67e0e90536ae3d282df). The only problem is that this breaks the PC_COMPAT_* nesting pattern we currently use. So, move the property to PC_COMPAT_0_13. This make pc-0.12 and older inherit it, but that shouldn't be an issue as QEMU 0.12 didn't have virtio-9p-pci. Cc: Gerd Hoffmann Cc: Aneesh Kumar K.V Signed-off-by: Eduardo Habkost Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/pc_piix.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index eb0c11f..9d12c93 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -838,6 +838,10 @@ static QEMUMachine pc_machine_v0_14 = { .driver = "AC97",\ .property = "use_broken_id",\ .value = stringify(1),\ + },{\ + .driver = "virtio-9p-pci",\ + .property = "vectors",\ + .value = stringify(0),\ }, #define PC_I440FX_0_13_MACHINE_OPTIONS \ @@ -850,10 +854,6 @@ static QEMUMachine pc_machine_v0_13 = { .compat_props = (GlobalProperty[]) { PC_COMPAT_0_13 { - .driver = "virtio-9p-pci", - .property = "vectors", - .value = stringify(0), - },{ .driver = "VGA", .property = "rombar", .value = stringify(0), -- MST