[Qemu-devel] [PATCH 2/2] vmw_pvscsi: x-disable-pcie, x-old-pci-configuration back-compat props are 2.5 specific

[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 <address@hidden>
---
 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