* src/libvirt.c: fix bug in xenUnifiedDomainSuspend() patch provided

  by Marcus Meissner
Daniel

diff --git a/ChangeLog b/ChangeLog
index b761bf0172d0a08e6196b23a1d94bfc78f4b1a9f..92c1bd9f43f102ad8c5b7aee21f7a86c4c1fcc3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb  7 10:29:57 CET 2008 Daniel Veillard <veillard@redhat.com>
+
+       * src/libvirt.c: fix bug in xenUnifiedDomainSuspend() patch provided
+         by Marcus Meissner
+         
 Wed Feb  6 18:55:37 CET 2008 Daniel Veillard <veillard@redhat.com>
 
        * src/xm_internal.[ch]: applied patch from Shigeki Sakamoto to 
@@ -216,6 +221,7 @@ Tue Jan 29 18:39:25 CET 2008  Jim Meyering  <meyering@redhat.com>
        * tests/xencapstest.c: Likewise.
        * tests/xmconfigtest.c: Likewise.
 
+>>>>>>> 1.995
 Fri Jan 25 12:00:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
 
        Clarify virsh documentation.

diff --git a/src/xen_unified.c b/src/xen_unified.c
index e6e01021794c40c9b176204cb4d087fb09075395..8dd82c45cafccae895993099e15b0a6623768d64 100644 (file)
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -694,7 +694,7 @@ xenUnifiedDomainDestroy (virDomainPtr dom)
             drivers[i]->domainDestroy (dom) == 0)
             return 0;
 
-    if (priv->opened[i] &&
+    if (priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET] &&
         drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->domainDestroy &&
         drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->domainDestroy (dom) == 0)
         return 0;