From patchwork Mon May 11 20:55:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 471041 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D6C401400A0 for ; Tue, 12 May 2015 07:01:25 +1000 (AEST) Received: from localhost ([::1]:39676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrupI-0006JE-0z for incoming@patchwork.ozlabs.org; Mon, 11 May 2015 17:01:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yruke-0005GS-Vc for qemu-devel@nongnu.org; Mon, 11 May 2015 16:56:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yrukd-0005QW-VQ for qemu-devel@nongnu.org; Mon, 11 May 2015 16:56:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56128) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yrukd-0005QN-N2 for qemu-devel@nongnu.org; Mon, 11 May 2015 16:56:35 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4BKuZWW014129 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 11 May 2015 16:56:35 -0400 Received: from localhost (ovpn-113-174.phx2.redhat.com [10.3.113.174]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4BKuXUj012528; Mon, 11 May 2015 16:56:34 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Mon, 11 May 2015 17:55:56 -0300 Message-Id: <1431377756-19579-14-git-send-email-ehabkost@redhat.com> In-Reply-To: <1431377756-19579-1-git-send-email-ehabkost@redhat.com> References: <1431377756-19579-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Alexander Graf , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 13/13] pc_piix: Define PC_COMPAT_0_10 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Move compat_props from pc-0.10 to the macro, to make it consistent with the other machines. Signed-off-by: Eduardo Habkost --- hw/i386/pc_piix.c | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 5182a9e..6e30eee 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -910,32 +910,35 @@ static QEMUMachine pc_machine_v0_11 = { .hw_version = "0.11", }; +#define PC_COMPAT_0_10 \ + PC_COMPAT_0_11 \ + {\ + .driver = "virtio-blk-pci",\ + .property = "class",\ + .value = stringify(PCI_CLASS_STORAGE_OTHER),\ + },{\ + .driver = "virtio-serial-pci",\ + .property = "class",\ + .value = stringify(PCI_CLASS_DISPLAY_OTHER),\ + },{\ + .driver = "virtio-net-pci",\ + .property = "vectors",\ + .value = stringify(0),\ + },{\ + .driver = "ide-drive",\ + .property = "ver",\ + .value = "0.10",\ + },{\ + .driver = "scsi-disk",\ + .property = "ver",\ + .value = "0.10",\ + }, + static QEMUMachine pc_machine_v0_10 = { PC_I440FX_0_13_MACHINE_OPTIONS, .name = "pc-0.10", .compat_props = (GlobalProperty[]) { - PC_COMPAT_0_11 - { - .driver = "virtio-blk-pci", - .property = "class", - .value = stringify(PCI_CLASS_STORAGE_OTHER), - },{ - .driver = "virtio-serial-pci", - .property = "class", - .value = stringify(PCI_CLASS_DISPLAY_OTHER), - },{ - .driver = "virtio-net-pci", - .property = "vectors", - .value = stringify(0), - },{ - .driver = "ide-drive", - .property = "ver", - .value = "0.10", - },{ - .driver = "scsi-disk", - .property = "ver", - .value = "0.10", - }, + PC_COMPAT_0_10 { /* end of list */ } }, .hw_version = "0.10",