From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aK6rl-0007XW-11 for qemu-devel@nongnu.org; Fri, 15 Jan 2016 11:04:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aK6rk-0003I8-0m for qemu-devel@nongnu.org; Fri, 15 Jan 2016 11:04:44 -0500 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:34155) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aK6rj-0003I3-PY for qemu-devel@nongnu.org; Fri, 15 Jan 2016 11:04:43 -0500 Received: by mail-wm0-x231.google.com with SMTP id u188so28953239wmu.1 for ; Fri, 15 Jan 2016 08:04:43 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 15 Jan 2016 17:04:21 +0100 Message-Id: <1452873871-138914-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1452873871-138914-1-git-send-email-pbonzini@redhat.com> References: <1452873871-138914-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 05/15] 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: qemu-devel@nongnu.org Cc: Shmulik Ladkani From: Shmulik Ladkani 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 Message-Id: <1450900558-20113-1-git-send-email-shmulik.ladkani@ravellosystems.com> Signed-off-by: Paolo Bonzini --- include/hw/compat.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/include/hw/compat.h b/include/hw/compat.h index 98df0dd..491884b 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -3,6 +3,15 @@ #define HW_COMPAT_2_5 \ {\ + .driver = "pvscsi",\ + .property = "x-old-pci-configuration",\ + .value = "on",\ + },{\ + .driver = "pvscsi",\ + .property = "x-disable-pcie",\ + .value = "on",\ + },\ + {\ .driver = "vmxnet3",\ .property = "x-old-msi-offsets",\ .value = "on",\ @@ -18,14 +27,6 @@ .property = "scsi",\ .value = "true",\ },{\ - .driver = "pvscsi",\ - .property = "x-old-pci-configuration",\ - .value = "on",\ - },{\ - .driver = "pvscsi",\ - .property = "x-disable-pcie",\ - .value = "on",\ - },{\ .driver = "e1000",\ .property = "extra_mac_registers",\ .value = "off",\ -- 1.8.3.1