From b33f740e1fc4700c0dd97972aba6a0aa76ce4265 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Thu, 7 Feb 2008 09:37:10 +0000 Subject: [PATCH] * src/libvirt.c: fix bug in xenUnifiedDomainSuspend() patch provided by Marcus Meissner Daniel --- ChangeLog | 6 ++++++ src/xen_unified.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b761bf0172..92c1bd9f43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 7 10:29:57 CET 2008 Daniel Veillard + + * src/libvirt.c: fix bug in xenUnifiedDomainSuspend() patch provided + by Marcus Meissner + Wed Feb 6 18:55:37 CET 2008 Daniel Veillard * src/xm_internal.[ch]: applied patch from Shigeki Sakamoto to @@ -216,6 +221,7 @@ Tue Jan 29 18:39:25 CET 2008 Jim Meyering * tests/xencapstest.c: Likewise. * tests/xmconfigtest.c: Likewise. +>>>>>>> 1.995 Fri Jan 25 12:00:00 BST 2008 Richard W.M. Jones Clarify virsh documentation. diff --git a/src/xen_unified.c b/src/xen_unified.c index e6e0102179..8dd82c45ca 100644 --- 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;