From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59963) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9pUL-000723-Km for qemu-devel@nongnu.org; Fri, 18 Dec 2015 02:30:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9pUK-0003V9-PV for qemu-devel@nongnu.org; Fri, 18 Dec 2015 02:30:05 -0500 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:33345) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9pUK-0003U6-Kl for qemu-devel@nongnu.org; Fri, 18 Dec 2015 02:30:04 -0500 Received: by mail-wm0-x229.google.com with SMTP id p187so53154386wmp.0 for ; Thu, 17 Dec 2015 23:30:04 -0800 (PST) From: Shmulik Ladkani Date: Fri, 18 Dec 2015 09:30:03 +0200 Message-Id: <1450423803-12839-3-git-send-email-shmulik.ladkani@ravellosystems.com> In-Reply-To: <1450423803-12839-1-git-send-email-shmulik.ladkani@ravellosystems.com> References: <1450423803-12839-1-git-send-email-shmulik.ladkani@ravellosystems.com> Subject: [Qemu-devel] [PATCH 2/2] vmw_pvscsi: x-disable-pcie, x-old-pci-configuration back-compat props are 2.5 specific List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: Jason Wang , idan.brown@ravellosystems.com, qemu-devel@nongnu.org, Dmitry Fleytman , Cornelia Huck , Shmulik Ladkani , David Gibson pvscsi's x-disable-pcie and x-old-pci-configuration backward compat properties were introduced in 952970b and d5da3ef: vmw_pvscsi: Introduce 'x-old-pci-configuration' backword compatability property vmw_pvscsi: Introduce 'x-disable-pcie' backword compatability property and were placed into HW_COMPAT_2_4. However since these commits were pulled post v2.5, move them to HW_COMPAT_2_5. Signed-off-by: Shmulik Ladkani --- include/hw/compat.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/hw/compat.h b/include/hw/compat.h index 3aa35c9..a1bc65d 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -2,14 +2,7 @@ #define HW_COMPAT_H #define HW_COMPAT_2_5 \ - /* empty */ - -#define HW_COMPAT_2_4 \ {\ - .driver = "virtio-blk-device",\ - .property = "scsi",\ - .value = "true",\ - },{\ .driver = "pvscsi",\ .property = "x-old-pci-configuration",\ .value = "on",\ @@ -17,6 +10,13 @@ .driver = "pvscsi",\ .property = "x-disable-pcie",\ .value = "on",\ + }, + +#define HW_COMPAT_2_4 \ + {\ + .driver = "virtio-blk-device",\ + .property = "scsi",\ + .value = "true",\ },{\ .driver = "e1000",\ .property = "extra_mac_registers",\ -- 1.9.1