From 4378c255d8f10b16aa9170c5998c8c1701800026276fae4b95428cf2af7ba419 Mon Sep 17 00:00:00 2001
From: James Fehlig <jfehlig@suse.com>
Date: Wed, 26 Sep 2012 20:34:15 +0000
Subject: [PATCH] - Support Xen sysctl version 9   371ddc98-xen-sysctl-9.patch 
  bnc#781425

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=230
---
 371ddc98-xen-sysctl-9.patch | 32 ++++++++++++++++++++++++++++++++
 libvirt.changes             |  7 +++++++
 libvirt.spec                |  2 ++
 3 files changed, 41 insertions(+)
 create mode 100644 371ddc98-xen-sysctl-9.patch

diff --git a/371ddc98-xen-sysctl-9.patch b/371ddc98-xen-sysctl-9.patch
new file mode 100644
index 0000000..19126ed
--- /dev/null
+++ b/371ddc98-xen-sysctl-9.patch
@@ -0,0 +1,32 @@
+commit 371ddc98664cbbd8542593e5452115ea7918dae2
+Author: Jim Fehlig <jfehlig@suse.com>
+Date:   Wed Sep 26 10:34:17 2012 -0600
+
+    Support Xen sysctl version 9 in Xen 4.2
+    
+    Xen upstream c/s 24102:dc8e55c9 bumped the sysctl version to 9.
+    Support this sysctl version in the xen_hypervisor sub-driver.
+
+Index: libvirt-0.10.2/src/xen/xen_hypervisor.c
+===================================================================
+--- libvirt-0.10.2.orig/src/xen/xen_hypervisor.c
++++ libvirt-0.10.2/src/xen/xen_hypervisor.c
+@@ -2164,6 +2164,18 @@ xenHypervisorInit(struct xenHypervisorVe
+         goto done;
+     }
+ 
++    /* Xen 4.2
++     * sysctl version 9 -> xen-unstable c/s 24102:dc8e55c90604
++     * domctl version 8 -> unchanged from Xen 4.1
++     */
++    hv_versions.sys_interface = 9; /* XEN_SYSCTL_INTERFACE_VERSION */
++    if (virXen_getdomaininfo(fd, 0, &info) == 1) {
++        hv_versions.dom_interface = 8; /* XEN_DOMCTL_INTERFACE_VERSION */
++        if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){
++            VIR_DEBUG("Using hypervisor call v2, sys ver9 dom ver8");
++            goto done;
++        }
++    }
+ 
+     /*
+      * we failed to make the getdomaininfolist hypercall
diff --git a/libvirt.changes b/libvirt.changes
index 9ecbc6f..98f3856 100644
--- a/libvirt.changes
+++ b/libvirt.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Sep 26 14:24:42 MDT 2012 - jfehlig@suse.com
+
+- Support Xen sysctl version 9
+  371ddc98-xen-sysctl-9.patch
+  bnc#781425
+
 -------------------------------------------------------------------
 Tue Sep 25 16:20:43 MDT 2012 - jfehlig@suse.com
 
diff --git a/libvirt.spec b/libvirt.spec
index 0cdf053..7b69373 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -411,6 +411,7 @@ Source1:        libvirtd.init
 Source2:        libvirtd-relocation-server.fw
 Source99:       baselibs.conf
 # Upstream patches
+Patch0:         371ddc98-xen-sysctl-9.patch
 # Need to go upstream
 Patch100:       xen-name-for-devid.patch
 Patch101:       clone.patch
@@ -546,6 +547,7 @@ Authors:
 
 %prep
 %setup -q
+%patch0 -p1
 %patch100 -p1
 %patch101
 %patch102 -p1