From patchwork Thu Aug 14 19:25:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 379994 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 EF3BF140080 for ; Fri, 15 Aug 2014 05:31:50 +1000 (EST) Received: from localhost ([::1]:55858 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XI0kW-0001T6-N9 for incoming@patchwork.ozlabs.org; Thu, 14 Aug 2014 15:31:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XI0fh-0000rE-Qw for qemu-devel@nongnu.org; Thu, 14 Aug 2014 15:26:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XI0fb-0006Y6-Mj for qemu-devel@nongnu.org; Thu, 14 Aug 2014 15:26:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54436) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XI0fb-0006Y0-EQ for qemu-devel@nongnu.org; Thu, 14 Aug 2014 15:26:43 -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 s7EJQgO0031438 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Aug 2014 15:26:42 -0400 Received: from localhost (ovpn-113-192.phx2.redhat.com [10.3.113.192]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s7EJQfQt000995; Thu, 14 Aug 2014 15:26:42 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Thu, 14 Aug 2014 16:25:38 -0300 Message-Id: <1408044362-11621-10-git-send-email-ehabkost@redhat.com> In-Reply-To: <1408044362-11621-1-git-send-email-ehabkost@redhat.com> References: <1408044362-11621-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: Marcel Apfelbaum , "Michael S. Tsirkin" , Alexander Graf , Don Slutz , Gerd Hoffmann , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH v4 09/33] piix: Move pc-0.11 drive version compat props to PC_COMPAT_0_11 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 The current code setting ide-drive.ver and scsi-disk.ver on pc-0.11 breaks the PC_COMPAT_* nesting pattern we currently use. As those variables are overwritten in pc-0.10 too, they can be inherited by pc-0.10 with no side-effects at all. Signed-off-by: Eduardo Habkost Cc: Gerd Hoffmann --- hw/i386/pc_piix.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index a7b0c34..1127c54 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -804,6 +804,14 @@ static QEMUMachine pc_machine_v0_12 = { .driver = TYPE_PCI_DEVICE,\ .property = "rombar",\ .value = stringify(0),\ + },{\ + .driver = "ide-drive",\ + .property = "ver",\ + .value = "0.11",\ + },{\ + .driver = "scsi-disk",\ + .property = "ver",\ + .value = "0.11",\ } static QEMUMachine pc_machine_v0_11 = { @@ -811,15 +819,6 @@ static QEMUMachine pc_machine_v0_11 = { .name = "pc-0.11", .compat_props = (GlobalProperty[]) { PC_COMPAT_0_11, - { - .driver = "ide-drive", - .property = "ver", - .value = "0.11", - },{ - .driver = "scsi-disk", - .property = "ver", - .value = "0.11", - }, { /* end of list */ } }, .hw_version = "0.11",