From 8ae8ea2a749ab735bc15667697c9a0384115fe178ef7a9d665084eb59d4de27b Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 6 Jun 2008 15:48:40 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=47

---
 xen-qcow-aio_init.patch | 22 ++++++++++++++++++++++
 xen.changes             | 10 ++++++++++
 xen.spec                | 10 +++++++++-
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 xen-qcow-aio_init.patch

diff --git a/xen-qcow-aio_init.patch b/xen-qcow-aio_init.patch
new file mode 100644
index 0000000..cce84c3
--- /dev/null
+++ b/xen-qcow-aio_init.patch
@@ -0,0 +1,22 @@
+Index: xen-3.2.1-testing/tools/ioemu/vl.c
+===================================================================
+--- xen-3.2.1-testing.orig/tools/ioemu/vl.c	2008-05-27 13:21:02.000000000 -0600
++++ xen-3.2.1-testing/tools/ioemu/vl.c	2008-05-27 13:26:47.000000000 -0600
+@@ -7682,7 +7682,6 @@
+     
+     init_timers();
+     init_timer_alarm();
+-    qemu_aio_init();
+ 
+ #ifdef _WIN32
+     socket_init();
+@@ -7887,6 +7886,9 @@
+                   direct_pci);
+     free(boot_device);
+ 
++    /* Must be after the machine init, otherwise signal can go to wrong thread*/
++    qemu_aio_init();
++
+     /* init USB devices */
+     if (usb_enabled) {
+         for(i = 0; i < usb_devices_index; i++) {
diff --git a/xen.changes b/xen.changes
index f491209..049e28d 100644
--- a/xen.changes
+++ b/xen.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Jun  6 08:56:56 MDT 2008 - jfehlig@novell.com
+
+- bnc#397890 - Create and own /var/lib/xen/dump
+
+-------------------------------------------------------------------
+Tue May 27 13:29:22 MDT 2008 - plc@novell.com
+
+- bnc#381368 - boot qcow image fix. 
+
 -------------------------------------------------------------------
 Fri May 23 09:13:59 MDT 2008 - jfehlig@novell.com
 
diff --git a/xen.spec b/xen.spec
index 44442d2..f13ff77 100644
--- a/xen.spec
+++ b/xen.spec
@@ -34,7 +34,7 @@ BuildRequires:  glibc-32bit glibc-devel-32bit
 BuildRequires:  kernel-source kernel-syms module-init-tools xorg-x11
 %endif
 Version:        3.2.1_16881_04
-Release:        1
+Release:        5
 License:        GPL v2 only
 Group:          System/Kernel
 AutoReqProv:    on
@@ -149,6 +149,7 @@ Patch164:       key-altgr.patch
 Patch165:       xen-shift-key.patch
 Patch166:       xen-pvfb-security.patch
 Patch167:       xen-vnc-resize.patch
+Patch168:       xen-qcow-aio_init.patch
 # Maybe later
 Patch200:       hvm-ide-flush-o_direct.patch
 # Patches from Jan
@@ -601,6 +602,7 @@ Authors:
 %patch165 -p1 
 %patch166 -p1 
 %patch167 -p1 
+%patch168 -p1 
 #%patch200 -p1 
 %patch240 -p1
 %patch241 -p1
@@ -754,6 +756,7 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/xenstored
 mkdir -p $RPM_BUILD_ROOT/var/lib/xen/images
 mkdir -p $RPM_BUILD_ROOT/var/lib/xen/jobs
 mkdir -p $RPM_BUILD_ROOT/var/lib/xen/save
+mkdir -p $RPM_BUILD_ROOT/var/lib/xen/dump
 mkdir -p $RPM_BUILD_ROOT/var/lib/xen/xend-db/domain
 mkdir -p $RPM_BUILD_ROOT/var/lib/xen/xend-db/migrate
 mkdir -p $RPM_BUILD_ROOT/var/lib/xen/xend-db/vnet
@@ -834,6 +837,7 @@ rm -f  $RPM_BUILD_ROOT/%pysite/*.egg-info
 %dir /var/lib/xen
 %dir %attr(700,root,root) /var/lib/xen/images
 %dir %attr(700,root,root) /var/lib/xen/save
+%dir %attr(700,root,root) /var/lib/xen/dump
 %dir /var/lib/xen/xend-db
 %dir /var/lib/xen/xend-db/domain
 %dir /var/lib/xen/xend-db/migrate
@@ -936,6 +940,10 @@ rm -f  $RPM_BUILD_ROOT/%pysite/*.egg-info
 /sbin/ldconfig
 
 %changelog
+* Fri Jun 06 2008 jfehlig@novell.com
+- bnc#397890 - Create and own /var/lib/xen/dump
+* Tue May 27 2008 plc@novell.com
+- bnc#381368 - boot qcow image fix.
 * Fri May 23 2008 jfehlig@novell.com
 - bnc#378595 - Revert patch that disables use of ifup/ifdown.
   ifup-bridge in sysconfig has been fixed so patch is no longer