From f46075e596d6a95779cc603ca1a18cc94a81623a56929e390b5ec27a9f4def51 Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Fri, 16 Apr 2010 21:40:24 +0000
Subject: [PATCH] - bnc#569194 - Tools-side fixes for tapdisk protocol
 specification   blktap-script.patch   ioemu-subtype.patch   Modified
 xen-domUloader.diff

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=40
---
 blktap-script.patch | 16 ++++++++++++++++
 ioemu-subtype.patch | 12 ++++++++++++
 xen-domUloader.diff |  4 +++-
 xen.changes         |  8 ++++++++
 xen.spec            |  4 ++++
 5 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 blktap-script.patch
 create mode 100644 ioemu-subtype.patch

diff --git a/blktap-script.patch b/blktap-script.patch
new file mode 100644
index 0000000..c7368cc
--- /dev/null
+++ b/blktap-script.patch
@@ -0,0 +1,16 @@
+diff -r c02cc832cb2d tools/hotplug/Linux/blktap
+--- a/tools/hotplug/Linux/blktap	Tue Apr 13 18:19:33 2010 +0100
++++ b/tools/hotplug/Linux/blktap	Fri Apr 16 14:48:00 2010 -0600
+@@ -59,10 +59,10 @@
+ if [ -n "$t" ]
+ then
+     p=$(xenstore_read "$XENBUS_PATH/params")
+-    # if we have a ':', chew from head including :
++    # if we have a ':', remove everything up to leading '/'
+     if echo $p | grep -q \:
+     then
+-        p=${p#*:}
++        p="/${p#*/}"
+     fi
+ fi
+ # some versions of readlink cannot be passed a regular file
diff --git a/ioemu-subtype.patch b/ioemu-subtype.patch
new file mode 100644
index 0000000..71f2b30
--- /dev/null
+++ b/ioemu-subtype.patch
@@ -0,0 +1,12 @@
+diff -r c02cc832cb2d tools/python/xen/xend/server/BlktapController.py
+--- a/tools/python/xen/xend/server/BlktapController.py	Tue Apr 13 18:19:33 2010 +0100
++++ b/tools/python/xen/xend/server/BlktapController.py	Fri Apr 16 12:05:39 2010 -0600
+@@ -189,7 +189,7 @@
+             blktap2_installed=1;
+ 
+         if typ in ('tap'):
+-            if subtyp in ('tapdisk'):
++            if subtyp in ('tapdisk', 'ioemu'):
+                 if params not in blktap2_disk_types or not blktap2_installed:
+                     # pass this device off to BlktapController
+                     log.warn('WARNING: using deprecated blktap module')
diff --git a/xen-domUloader.diff b/xen-domUloader.diff
index e7922d4..b72419c 100644
--- a/xen-domUloader.diff
+++ b/xen-domUloader.diff
@@ -13,11 +13,13 @@ Index: xen-4.0.0-testing/tools/python/xen/util/blkif.py
      if uname.find(":") != -1:
          (typ, fn) = uname.split(":", 1)
  
-@@ -88,15 +88,16 @@ def _parse_uname(uname):
+@@ -88,15 +88,18 @@ def _parse_uname(uname):
                 
          if typ == "tap":
              (taptype, fn) = fn.split(":", 1)
 -    return (fn, taptype)
++            if taptype in ("tapdisk", "ioemu"):
++                (taptype, fn) = fn.split(":", 1)
 +            return (fn, (typ, taptype))
 +    return (fn, (typ,taptype))
  
diff --git a/xen.changes b/xen.changes
index 8f292f0..4f94c79 100644
--- a/xen.changes
+++ b/xen.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Apr 16 15:00:52 MDT 2010 - jfehlig@novell.com
+
+- bnc#569194 - Tools-side fixes for tapdisk protocol specification
+  blktap-script.patch
+  ioemu-subtype.patch
+  Modified xen-domUloader.diff
+
 -------------------------------------------------------------------
 Wed Apr 14 08:14:31 MDT 2010 - carnold@novell.com
 
diff --git a/xen.spec b/xen.spec
index 29e1ef7..581397a 100644
--- a/xen.spec
+++ b/xen.spec
@@ -83,6 +83,8 @@ Patch1:         21109-x86-cpu-hotplug.patch
 Patch2:         21128-domain-save-flush.patch
 Patch3:         21150-shadow-race.patch
 Patch4:         21160-sysctl-debug-keys.patch
+Patch5:         blktap-script.patch
+Patch6:         ioemu-subtype.patch
 # Our patches
 Patch300:       xen-config.diff
 Patch301:       xend-config.diff
@@ -530,6 +532,8 @@ Authors:
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 %patch300 -p1
 %patch301 -p1
 %patch302 -p1