SHA256
1
0
forked from pool/libvirt

Fix connection ref counting in xen drivers

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=11
This commit is contained in:
James Fehlig 2009-09-29 14:37:33 +00:00 committed by Git OBS Bridge
parent 1b707d6cc6
commit 21e21463c5
5 changed files with 1897 additions and 14 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Sep 29 08:34:28 MDT 2009 - jfehlig@novell.com
- Fix connection ref counting in xen drivers
xen-refcnt.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 25 11:41:23 MDT 2009 - jfehlig@novell.com Fri Sep 25 11:41:23 MDT 2009 - jfehlig@novell.com

View File

@ -84,14 +84,14 @@ Source0: %{name}-%{version}.tar.bz2
Source1: libvirtd.init Source1: libvirtd.init
# Upstream patches # Upstream patches
Patch0: devmap-no-pkgconfig.patch Patch0: devmap-no-pkgconfig.patch
Patch1: xen-refcnt.patch
Patch2: vshdeinit-recurse.patch
# Need to go upstream # Need to go upstream
Patch100: socat.patch Patch100: socat.patch
Patch101: clone.patch Patch101: clone.patch
Patch102: migrate-params.patch Patch102: migrate-params.patch
Patch103: xen-pv-cdrom.patch Patch103: xen-pv-cdrom.patch
Patch104: detach-disk.patch Patch104: detach-disk.patch
Patch105: vshdeinit-recurse.patch
Patch106: xen-refcnt.patch
# Our patches # Our patches
Patch200: libvirtd-defaults.patch Patch200: libvirtd-defaults.patch
Patch201: suse-network.patch Patch201: suse-network.patch
@ -188,13 +188,13 @@ Authors:
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
%patch2 -p1
%patch100 -p1 %patch100 -p1
%patch101 %patch101
%patch102 -p1 %patch102 -p1
%patch103 -p1 %patch103 -p1
%patch104 -p1 %patch104 -p1
%patch105 -p1
%patch106 -p1
%patch200 -p1 %patch200 -p1
%patch201 -p1 %patch201 -p1
%patch202 -p1 %patch202 -p1

View File

@ -534,7 +534,7 @@ Index: libvirt-0.7.1/src/virsh.c
=================================================================== ===================================================================
--- libvirt-0.7.1.orig/src/virsh.c --- libvirt-0.7.1.orig/src/virsh.c
+++ libvirt-0.7.1/src/virsh.c +++ libvirt-0.7.1/src/virsh.c
@@ -1171,6 +1171,189 @@ cmdSave(vshControl *ctl, const vshCmd *c @@ -1167,6 +1167,189 @@ cmdSave(vshControl *ctl, const vshCmd *c
return ret; return ret;
} }
@ -724,7 +724,7 @@ Index: libvirt-0.7.1/src/virsh.c
/* /*
* "schedinfo" command * "schedinfo" command
*/ */
@@ -7265,6 +7448,12 @@ static const vshCmdDef commands[] = { @@ -7252,6 +7435,12 @@ static const vshCmdDef commands[] = {
{"undefine", cmdUndefine, opts_undefine, info_undefine}, {"undefine", cmdUndefine, opts_undefine, info_undefine},
{"uri", cmdURI, NULL, info_uri}, {"uri", cmdURI, NULL, info_uri},

File diff suppressed because it is too large Load Diff

View File

@ -22,7 +22,7 @@ Index: libvirt-0.7.1/src/xs_internal.c
=================================================================== ===================================================================
--- libvirt-0.7.1.orig/src/xs_internal.c --- libvirt-0.7.1.orig/src/xs_internal.c
+++ libvirt-0.7.1/src/xs_internal.c +++ libvirt-0.7.1/src/xs_internal.c
@@ -1140,8 +1140,6 @@ int xenStoreAddWatch(virConnectPtr conn, @@ -1139,8 +1139,6 @@ int xenStoreAddWatch(virConnectPtr conn,
list->watches[n] = watch; list->watches[n] = watch;
list->count++; list->count++;
@ -31,3 +31,11 @@ Index: libvirt-0.7.1/src/xs_internal.c
return xs_watch(priv->xshandle, watch->path, watch->token); return xs_watch(priv->xshandle, watch->path, watch->token);
} }
@@ -1190,7 +1188,6 @@ int xenStoreRemoveWatch(virConnectPtr co
; /* Failure to reduce memory allocation isn't fatal */
}
list->count--;
- virUnrefConnect(conn);
return 0;
}
}