From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33954) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzOkH-0006Gk-Gu for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:23:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzOkG-0007TQ-B1 for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:23:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53464) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzOkG-0007TG-60 for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:23:08 -0400 Date: Mon, 1 Jun 2015 14:23:04 +0200 From: "Michael S. Tsirkin" Message-ID: <1433161230-29421-14-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 13/60] piix: Move pc-0.11 drive version compat props to PC_COMPAT_0_11 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , Paolo Bonzini , Eduardo Habkost , Gerd Hoffmann From: Eduardo Habkost 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. Cc: Gerd Hoffmann Signed-off-by: Eduardo Habkost Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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 1e12eff..eb0c11f 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -920,6 +920,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 = { @@ -927,15 +935,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", -- MST