From fca10318390dd3c2e9c9e90fbcdff0fe50188dbf Mon Sep 17 00:00:00 2001 From: Shmulik Ladkani Date: Wed, 23 Dec 2015 21:55:58 +0200 Subject: [PATCH] vmw_pvscsi: x-disable-pcie, x-old-pci-configuration back-compat props are 2.5 specific 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 98df0dd7b5..491884ba49 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -2,6 +2,15 @@ #define HW_COMPAT_H #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",\ @@ -17,14 +26,6 @@ .driver = "virtio-blk-device",\ .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",\