diff mbox

[PULL,08/45] vmw_pvscsi: Introduce 'x-old-pci-configuration' backword compatability property

Message ID 1450374401-31352-9-git-send-email-pbonzini@redhat.com
State New
Headers show

Commit Message

Paolo Bonzini Dec. 17, 2015, 5:46 p.m. UTC 
From: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com>

Following the previous patches, which introduced various changes in
pvscsi's pci configuration space (device subsystem id and revision, msi
offset), this patch introduces a boolean property
'x-old-pci-configuration' to pvscsi.

Its default value is false, exposing the above changes in the pci config
space.

Setting 'x-old-pci-configuration' to 'on' preserves the old behavior,
which allows migration to older versions.

Signed-off-by: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com>
Message-Id: <1449994112-7054-4-git-send-email-shmulik.ladkani@ravellosystems.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/scsi/vmw_pvscsi.c | 2 ++
 include/hw/compat.h  | 4 ++++
 2 files changed, 6 insertions(+)

Comments

Eric Blake Dec. 17, 2015, 6:08 p.m. UTC | #1 
On 12/17/2015 10:46 AM, Paolo Bonzini wrote:
> From: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com>

If there's a reason to respin:

long subject line, and contains a typo (should be backward, not
backword). Could shorten by saying 'back-compat' instead of spelling it out.

But since this is already in a PULL request, I'm also fine if it lands
as-is.
Shmulik Ladkani Dec. 18, 2015, 6:21 a.m. UTC | #2 
Hi Eric,

On Thu, 17 Dec 2015 11:08:35 -0700 Eric Blake <eblake@redhat.com> wrote:
> On 12/17/2015 10:46 AM, Paolo Bonzini wrote:
> > From: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com>
> 
> If there's a reason to respin:
> 
> long subject line, and contains a typo (should be backward, not
> backword). Could shorten by saying 'back-compat' instead of spelling it out.
> 
> But since this is already in a PULL request, I'm also fine if it lands
> as-is.

Thanks for your suggestion. Was about to fix; just noticed it was
already pulled.

There's one fix I need to submit however:

Since this is pulled post 2.5, we need to introduce HW_COMPAT_2_5 and
place the compat props there (instead of within HW_COMPAT_2_4).

Will submit.

Regards,
Shmulik
diff mbox

Patch

diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c
index be95cff..e785b8b 100644
--- a/hw/scsi/vmw_pvscsi.c
+++ b/hw/scsi/vmw_pvscsi.c
@@ -1194,6 +1194,8 @@  static const VMStateDescription vmstate_pvscsi = {
 
 static Property pvscsi_properties[] = {
     DEFINE_PROP_UINT8("use_msg", PVSCSIState, use_msg, 1),
+    DEFINE_PROP_BIT("x-old-pci-configuration", PVSCSIState, compat_flags,
+                    PVSCSI_COMPAT_OLD_PCI_CONFIGURATION_BIT, false),
     DEFINE_PROP_END_OF_LIST(),
 };
 
diff --git a/include/hw/compat.h b/include/hw/compat.h
index d0b1c4f..66e4aff 100644
--- a/include/hw/compat.h
+++ b/include/hw/compat.h
@@ -7,6 +7,10 @@ 
             .property = "scsi",\
             .value    = "true",\
         },{\
+            .driver   = "pvscsi",\
+            .property = "x-old-pci-configuration",\
+            .value    = "on",\
+        },{\
             .driver   = "e1000",\
             .property = "extra_mac_registers",\
             .value    = "off",\