[PATCH v2] Register PV driver product numbers 4 and 5.

[PATCH v2] Register PV driver product numbers 4 and 5.

[Paul Durrant]

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
---
v2:
 - Added some words to hvm-emulated-unplug to note that the platform PCI
   device owns the IO ports

 docs/misc/hvm-emulated-unplug.markdown |    6 +++++-
 xen/include/public/hvm/pvdrivers.h     |   12 +++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/docs/misc/hvm-emulated-unplug.markdown b/docs/misc/hvm-emulated-unplug.markdown
index ec9ce83..c6d1f9b 100644
--- a/docs/misc/hvm-emulated-unplug.markdown
+++ b/docs/misc/hvm-emulated-unplug.markdown
@@ -65,4 +65,8 @@ decimal number.  `{product_name}` is a string corresponding to the
 product number in step 3.
 
 The master registry of product names and numbers is in
-xen/include/public/hvm/pvdrivers.h
+xen/include/public/hvm/pvdrivers.h.
+
+NOTE: The IO ports implementing the unplug protocol are implemented
+as part of the Xen Platform PCI Device, so if that device is not
+present in the system then this protocol will not work.
diff --git a/xen/include/public/hvm/pvdrivers.h b/xen/include/public/hvm/pvdrivers.h
index 4c6b705..77994d2 100644
--- a/xen/include/public/hvm/pvdrivers.h
+++ b/xen/include/public/hvm/pvdrivers.h
@@ -38,10 +38,12 @@
  * indicate a driver which is yet to be released.
  */
 
-#define PVDRIVERS_PRODUCT_LIST(EACH)                         \
-        EACH("xensource-windows", 0x0001) /* Citrix */       \
-        EACH("gplpv-windows",     0x0002) /* James Harper */ \
-        EACH("linux",             0x0003)                    \
-        EACH("experimental",      0xffff)
+#define PVDRIVERS_PRODUCT_LIST(EACH)                               \
+        EACH("xensource-windows",       0x0001) /* Citrix */       \
+        EACH("gplpv-windows",           0x0002) /* James Harper */ \
+        EACH("linux",                   0x0003)                    \
+        EACH("xenserver-windows-v7.0+", 0x0004) /* Citrix */       \
+        EACH("xenserver-windows-v7.2+", 0x0005) /* Citrix */       \
+        EACH("experimental",            0xffff)
 
 #endif /* _XEN_PUBLIC_PVDRIVERS_H_ */
-- 
1.7.10.4

Re: [PATCH v2] Register PV driver product numbers 4 and 5.

[Ian Campbell]

On Wed, 2013-10-16 at 17:15 +0100, Paul Durrant wrote:
> Signed-off-by: Paul Durrant <paul.durrant@citrix.com>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

This is probably strictly a tools change despite the paths touched.
Unless someone objects (or beats me to it) I will apply.

> ---
> v2:
>  - Added some words to hvm-emulated-unplug to note that the platform PCI
>    device owns the IO ports
> 
>  docs/misc/hvm-emulated-unplug.markdown |    6 +++++-
>  xen/include/public/hvm/pvdrivers.h     |   12 +++++++-----
>  2 files changed, 12 insertions(+), 6 deletions(-)
> 
> diff --git a/docs/misc/hvm-emulated-unplug.markdown b/docs/misc/hvm-emulated-unplug.markdown
> index ec9ce83..c6d1f9b 100644
> --- a/docs/misc/hvm-emulated-unplug.markdown
> +++ b/docs/misc/hvm-emulated-unplug.markdown
> @@ -65,4 +65,8 @@ decimal number.  `{product_name}` is a string corresponding to the
>  product number in step 3.
>  
>  The master registry of product names and numbers is in
> -xen/include/public/hvm/pvdrivers.h
> +xen/include/public/hvm/pvdrivers.h.
> +
> +NOTE: The IO ports implementing the unplug protocol are implemented
> +as part of the Xen Platform PCI Device, so if that device is not
> +present in the system then this protocol will not work.
> diff --git a/xen/include/public/hvm/pvdrivers.h b/xen/include/public/hvm/pvdrivers.h
> index 4c6b705..77994d2 100644
> --- a/xen/include/public/hvm/pvdrivers.h
> +++ b/xen/include/public/hvm/pvdrivers.h
> @@ -38,10 +38,12 @@
>   * indicate a driver which is yet to be released.
>   */
>  
> -#define PVDRIVERS_PRODUCT_LIST(EACH)                         \
> -        EACH("xensource-windows", 0x0001) /* Citrix */       \
> -        EACH("gplpv-windows",     0x0002) /* James Harper */ \
> -        EACH("linux",             0x0003)                    \
> -        EACH("experimental",      0xffff)
> +#define PVDRIVERS_PRODUCT_LIST(EACH)                               \
> +        EACH("xensource-windows",       0x0001) /* Citrix */       \
> +        EACH("gplpv-windows",           0x0002) /* James Harper */ \
> +        EACH("linux",                   0x0003)                    \
> +        EACH("xenserver-windows-v7.0+", 0x0004) /* Citrix */       \
> +        EACH("xenserver-windows-v7.2+", 0x0005) /* Citrix */       \
> +        EACH("experimental",            0xffff)
>  
>  #endif /* _XEN_PUBLIC_PVDRIVERS_H_ */

Re: [PATCH v2] Register PV driver product numbers 4 and 5.

[Ian Campbell]

On Thu, 2013-10-31 at 19:01 +0000, Ian Campbell wrote:
> On Wed, 2013-10-16 at 17:15 +0100, Paul Durrant wrote:
> > Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> 
> Acked-by: Ian Campbell <ian.campbell@citrix.com>
> 
> This is probably strictly a tools change despite the paths touched.
> Unless someone objects (or beats me to it) I will apply.

Which I've just done...