OBS User unknown 2008-10-08 16:23:52 +00:00 committed by Git OBS Bridge
parent 6be8feb47a
commit d045108cb4
12 changed files with 1367 additions and 63 deletions

View File

@ -1,8 +1,8 @@
Index: libvirt-0.4.4/src/storage_backend_fs.c
Index: libvirt-0.4.5/src/storage_backend_fs.c
===================================================================
--- libvirt-0.4.4.orig/src/storage_backend_fs.c
+++ libvirt-0.4.4/src/storage_backend_fs.c
@@ -455,7 +455,9 @@ virStorageBackendFileSystemIsMounted(vir
--- libvirt-0.4.5.orig/src/storage_backend_fs.c
+++ libvirt-0.4.5/src/storage_backend_fs.c
@@ -583,7 +583,9 @@ virStorageBackendFileSystemIsMounted(vir
virStoragePoolObjPtr pool) {
FILE *mtab;
struct mntent *ent;
@ -13,7 +13,7 @@ Index: libvirt-0.4.4/src/storage_backend_fs.c
if ((mtab = fopen(_PATH_MOUNTED, "r")) == NULL) {
virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("cannot read %s: %s"),
@@ -463,14 +465,27 @@ virStorageBackendFileSystemIsMounted(vir
@@ -591,14 +593,27 @@ virStorageBackendFileSystemIsMounted(vir
return -1;
}
@ -42,7 +42,7 @@ Index: libvirt-0.4.4/src/storage_backend_fs.c
return 0;
}
@@ -797,12 +812,16 @@ virStorageBackendFileSystemDelete(virCon
@@ -951,12 +966,16 @@ virStorageBackendFileSystemDelete(virCon
{
/* XXX delete all vols first ? */

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2f04d72f036b077c29f8af811e0e3ede9d44fe61a7e7ac4bdc35f14d297d6941
size 2944387

3
libvirt-0.4.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:135ab72ebfba0359972e0fa0b4e643c4b744a0ebc9d60b3fb5e5518b5e575355
size 3136828

View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
Mon Oct 6 15:36:17 MDT 2008 - jfehlig@novell.com
- Use xend vs hypercall interface to change max mem setting
bnc#431766
-------------------------------------------------------------------
Wed Oct 1 16:04:21 MDT 2008 - jfehlig@novell.com
- Enabled libvirtd listen mode in libvirtd init script.
-------------------------------------------------------------------
Tue Sep 30 19:07:45 MDT 2008 - jfehlig@novell.com
- Updated to version 0.4.6
- avoid a segfault if missing qemu emulator
- reading vncdisplay from xend domain
- segfault in OpenVZ
- fix parsing of pool without a source
- Fixed bug in network interface parsing
- vif-parsing.patch submitted upstream
-------------------------------------------------------------------
Tue Sep 16 13:02:40 MDT 2008 - jfehlig@novell.com
- open-iscsi package required for iscsi storage backend
-------------------------------------------------------------------
Mon Sep 15 15:59:28 MDT 2008 - jfehlig@novell.com
- Updated to version 0.4.5
- NETNS support for Linux containers
- unified XML domain and network parsing for all drivers
- OpenVZ features improvements
- OpenVZ and Linux containers support now default
- USB device passthrough for QEmu/KVM
- storage pool source discovery
- other bug fixes and improvements
-------------------------------------------------------------------
Thu Sep 4 15:49:55 CEST 2008 - kwolf@suse.de
- Added Python bindings for the snapshot functions
-------------------------------------------------------------------
Wed Sep 3 21:09:27 CEST 2008 - kwolf@suse.de
- Implemented listing of snapshots for Xen and in virsh
-------------------------------------------------------------------
Tue Sep 2 13:23:22 CEST 2008 - kwolf@suse.de
- Added snapshot support. Implemented snapshot_create/apply/delete
for Xen.
-------------------------------------------------------------------
Fri Aug 29 17:37:53 MDT 2008 - jfehlig@novell.com

View File

@ -1,5 +1,5 @@
#
# spec file for package libvirt (Version 0.4.4)
# spec file for package libvirt (Version 0.4.6)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -48,8 +48,8 @@ Url: http://libvirt.org/
License: LGPL v2.1 or later
Group: Development/Libraries/C and C++
AutoReqProv: yes
Version: 0.4.4
Release: 28
Version: 0.4.6
Release: 1
Summary: A C toolkit to interract with the virtualization capabilities of Linux
Requires: readline
Requires: ncurses
@ -58,17 +58,20 @@ Requires: iptables
Requires: cyrus-sasl
Requires: lvm2
Requires: parted
#Requires: /usr/bin/qemu-img
Recommends: cyrus-sasl-digestmd5
Requires: dnsmasq
Requires: PolicyKit >= 0.6
Requires: socat
Requires: open-iscsi
Source0: %{name}-%{version}.tar.bz2
Source1: libvirtd.init
Patch0: libvirtd-polkit.patch
Patch1: socat.patch
Patch2: libvirtd-defaults.patch
Patch3: logical-storage-driver.patch
Patch4: fs-storage-driver.patch
Patch0: socat.patch
Patch1: libvirtd-defaults.patch
Patch2: fs-storage-driver.patch
Patch3: snapshots.patch
Patch4: vif-parsing.patch
Patch5: xen-maxmem.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -164,14 +167,15 @@ Authors:
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
rm po/no.*
%build
%if ! %{with_xen}
%define _without_xen --without-xen
%endif
%if %{with_lxc}
%define _with_lxc --with-lxc
%if ! %{with_lxc}
%define _without_lxc --without-lxc
%endif
%if %{with_selinux}
%define _with_selinux --with-selinux
@ -179,14 +183,14 @@ rm po/no.*
autoreconf -f -i
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure %{?_without_xen} \
%{?_with_lxc} \
%{?_without_lxc} \
%{?_with_selinux} \
--libexecdir=%{_libdir}/%{name} \
--with-init-script=none \
--with-remote-pid-file=%{_localstatedir}/run/libvirtd.pid \
--with-xen-proxy=no \
ac_cv_path_DNSMASQ=/usr/sbin/dnsmasq \
ac_cv_path_QEMU_IMG=/usr/bin/qemu-img \
ac_cv_path_QEMU_IMG=/usr/bin/qemu-img-xen \
ac_cv_path_ISCSIADM=/sbin/iscsiadm
make DOCS_DIR=%{_docdir}/%{name}-python EXAMPLE_DIR=%{_docdir}/%{name}-python/examples HTML_DIR=%{_docdir}/%{name}
cd docs/examples ; make index.html ; cd ../..
@ -199,6 +203,11 @@ rm -rf $RPM_BUILD_ROOT/usr/share/locale/sr@latin
# for now, do not install the default network definition
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
# do not package augeas config files for now
rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd.aug
rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_qemu.aug
rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/libvirt
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/libvirt
rm $RPM_BUILD_ROOT%{_docdir}/%{name}/{*.c,examples.x*}
@ -253,6 +262,9 @@ rm -rf $RPM_BUILD_ROOT
%if 0%{?suse_version} > 1030
%{_libdir}/%{name}/libvirt_parthelper
%endif
%if %{with_lxc}
%attr(0755, root, root) %{_libdir}/%{name}/libvirt_lxc
%endif
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/
@ -265,7 +277,7 @@ rm -rf $RPM_BUILD_ROOT
%config %{_sysconfdir}/libvirt/qemu.conf
%config %{_sysconfdir}/sasl2/libvirt.conf
%if 0%{?suse_version} > 1030
%{_datadir}/PolicyKit/policy/libvirtd.policy
%{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
%endif
%files devel
@ -288,6 +300,37 @@ rm -rf $RPM_BUILD_ROOT
%{py_sitedir}/libvirtmod*
%changelog
* Mon Oct 06 2008 jfehlig@novell.com
- Use xend vs hypercall interface to change max mem setting
bnc#431766
* Wed Oct 01 2008 jfehlig@novell.com
- Enabled libvirtd listen mode in libvirtd init script.
* Tue Sep 30 2008 jfehlig@novell.com
- Updated to version 0.4.6
- avoid a segfault if missing qemu emulator
- reading vncdisplay from xend domain
- segfault in OpenVZ
- fix parsing of pool without a source
- Fixed bug in network interface parsing
- vif-parsing.patch submitted upstream
* Tue Sep 16 2008 jfehlig@novell.com
- open-iscsi package required for iscsi storage backend
* Mon Sep 15 2008 jfehlig@novell.com
- Updated to version 0.4.5
- NETNS support for Linux containers
- unified XML domain and network parsing for all drivers
- OpenVZ features improvements
- OpenVZ and Linux containers support now default
- USB device passthrough for QEmu/KVM
- storage pool source discovery
- other bug fixes and improvements
* Thu Sep 04 2008 kwolf@suse.de
- Added Python bindings for the snapshot functions
* Wed Sep 03 2008 kwolf@suse.de
- Implemented listing of snapshots for Xen and in virsh
* Tue Sep 02 2008 kwolf@suse.de
- Added snapshot support. Implemented snapshot_create/apply/delete
for Xen.
* Fri Aug 29 2008 jfehlig@novell.com
- Fixed bugs in nfs storage pool creation/deletion
* Thu Aug 28 2008 jfehlig@novell.com

View File

@ -1,14 +0,0 @@
diff -ru a/qemud/libvirtd.policy b/qemud/libvirtd.policy
--- a/qemud/libvirtd.policy 2007-12-05 11:21:27.000000000 -0700
+++ b/qemud/libvirtd.policy 2008-05-09 09:28:26.000000000 -0600
@@ -36,7 +36,7 @@
read-write mode for management, and we require user password -->
<allow_any>no</allow_any>
<allow_inactive>no</allow_inactive>
- <allow_active>auth_self_keep_session</allow_active>
+ <allow_active>auth_admin_keep_session</allow_active>
</defaults>
</action>
</policyconfig>
\ No newline at end of file
Only in b/qemud: libvirtd.policy~

View File

@ -31,7 +31,7 @@ rc_reset
case "$1" in
start)
echo -n "Starting libvirtd "
startproc $LIBVIRTD_BIN -d
startproc $LIBVIRTD_BIN -d -l
rc_status -v
;;
stop)

View File

@ -1,21 +0,0 @@
Index: libvirt-0.4.4/src/storage_backend_logical.c
===================================================================
--- libvirt-0.4.4.orig/src/storage_backend_logical.c
+++ libvirt-0.4.4/src/storage_backend_logical.c
@@ -280,7 +280,7 @@ virStorageBackendLogicalBuildPool(virCon
memset(zeros, 0, sizeof(zeros));
/* XXX multiple pvs */
- if (VIR_ALLOC_N(vgargv, 1) < 0) {
+ if (VIR_ALLOC_N(vgargv, 3 + pool->def->source.ndevice) < 0) {
virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("command line"));
return -1;
}
@@ -531,6 +531,7 @@ virStorageBackend virStorageBackendLogic
.deleteVol = virStorageBackendLogicalDeleteVol,
.poolOptions = {
+ .flags = (VIR_STORAGE_BACKEND_POOL_SOURCE_DEVICE),
.formatFromString = virStorageBackendLogicalPoolFormatFromString,
.formatToString = virStorageBackendLogicalPoolFormatToString,
},

1215
snapshots.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,8 @@
Index: libvirt-0.4.4/src/remote_internal.c
Index: libvirt-0.4.5/src/remote_internal.c
===================================================================
--- libvirt-0.4.4.orig/src/remote_internal.c
+++ libvirt-0.4.4/src/remote_internal.c
@@ -660,9 +660,22 @@ doRemoteOpen (virConnectPtr conn,
--- libvirt-0.4.5.orig/src/remote_internal.c
+++ libvirt-0.4.5/src/remote_internal.c
@@ -623,9 +623,22 @@ doRemoteOpen (virConnectPtr conn,
cmd_argv[j++] = strdup ("none");
}
cmd_argv[j++] = strdup (priv->hostname);
@ -27,4 +27,4 @@ Index: libvirt-0.4.4/src/remote_internal.c
+ }
cmd_argv[j++] = 0;
assert (j == nr_args);
for (j = 0; j < (nr_args-1); j++) {
for (j = 0; j < (nr_args-1); j++)

13
vif-parsing.patch Normal file
View File

@ -0,0 +1,13 @@
Index: libvirt-0.4.6/src/xend_internal.c
===================================================================
--- libvirt-0.4.6.orig/src/xend_internal.c
+++ libvirt-0.4.6/src/xend_internal.c
@@ -1890,6 +1890,8 @@ xenDaemonParseSxprNets(virConnectPtr con
prev->next = net;
else
def->nets = net;
+
+ prev = net;
vif_index++;
}
}

13
xen-maxmem.patch Normal file
View File

@ -0,0 +1,13 @@
Index: libvirt-0.4.6/src/xen_internal.c
===================================================================
--- libvirt-0.4.6.orig/src/xen_internal.c
+++ libvirt-0.4.6/src/xen_internal.c
@@ -695,7 +695,7 @@ struct xenUnifiedDriver xenHypervisorDri
xenHypervisorDestroyDomain, /* domainDestroy */
xenHypervisorDomainGetOSType, /* domainGetOSType */
xenHypervisorGetMaxMemory, /* domainGetMaxMemory */
- xenHypervisorSetMaxMemory, /* domainSetMaxMemory */
+ NULL, /* domainSetMaxMemory */
NULL, /* domainSetMemory */
xenHypervisorGetDomainInfo, /* domainGetInfo */
NULL, /* domainSave */