All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>,
	idan.brown@ravellosystems.com, qemu-devel@nongnu.org,
	Dmitry Fleytman <dmitry@daynix.com>,
	Cornelia Huck <cornelia.huck@de.ibm.com>,
	Shmulik Ladkani <shmulik.ladkani@ravellosystems.com>,
	David Gibson <david@gibson.dropbear.id.au>
Subject: [Qemu-devel]  [PATCH 2/2] vmw_pvscsi: x-disable-pcie, x-old-pci-configuration back-compat props are 2.5 specific
Date: Fri, 18 Dec 2015 09:30:03 +0200	[thread overview]
Message-ID: <1450423803-12839-3-git-send-email-shmulik.ladkani@ravellosystems.com> (raw)
In-Reply-To: <1450423803-12839-1-git-send-email-shmulik.ladkani@ravellosystems.com>

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 <shmulik.ladkani@ravellosystems.com>
---
 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

      parent reply	other threads:[~2015-12-18  7:30 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-18  7:30 [Qemu-devel] [PATCH 0/2] compat: recent vmw_pvscsi back-compat props are 2.5 specific Shmulik Ladkani
2015-12-18  7:30 ` [Qemu-devel] [PATCH 1/2] compat: Introduce HW_COMPAT_2_5 Shmulik Ladkani
2015-12-18  9:37   ` Cornelia Huck
2015-12-18 13:00     ` Paolo Bonzini
2015-12-21  0:21   ` David Gibson
2015-12-23 19:21   ` Shmulik Ladkani
2016-01-07 16:30     ` Paolo Bonzini
2016-01-07 16:33       ` Cornelia Huck
2016-01-07 16:46         ` Paolo Bonzini
2016-01-07 19:10           ` Shmulik Ladkani
2015-12-18  7:30 ` Shmulik Ladkani [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1450423803-12839-3-git-send-email-shmulik.ladkani@ravellosystems.com \
    --to=shmulik.ladkani@ravellosystems.com \
    --cc=cornelia.huck@de.ibm.com \
    --cc=david@gibson.dropbear.id.au \
    --cc=dmitry@daynix.com \
    --cc=idan.brown@ravellosystems.com \
    --cc=jasowang@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.