pool/libvirt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 405936 from home:jfehlig:branches:Virtualization

Browse Source 
- Update to libvirt 2.0.0
  - Change version scheme to match libvirt's time-driven release
    schedule. <major> will be incremented on first release of
    new calendar year, <minor> on each monthly release, and
    <micro> on stable branch maintenance release
  - Include libvirt-admin utility and API
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - Dropped patches:
    apparmor-dont-scrub-environment-of-virtlogd-process.patch,
    e33cd67a-xenconfig-backendtype-fix.patch

OBS-URL: https://build.opensuse.org/request/show/405936
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=548
This commit is contained in:
James Fehlig 2016-07-01 16:39:05 +00:00 committed by Git OBS Bridge
parent 7dc8dc52fc
commit ff134ddc0f
31 changed files with 220 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apparmor-dont-scrub-environment-of-virtlogd-process.patch
View File

@ -1,23 +0,0 @@
From c5963fcd85e4bf1e7325b9a4c33ba34369e98231 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Sun, 5 Jun 2016 13:06:35 +0200
Subject: [PATCH] apparmor: Don't scrub environment of virtlogd process
otherwise we drop variables like XDG_RUNTIME_DIR with qemu:///session
and libvirtd faild to find virtlogd's socket.
---
examples/apparmor/usr.sbin.libvirtd | 1 +
1 file changed, 1 insertion(+)
Index: libvirt-1.3.5/examples/apparmor/usr.sbin.libvirtd
===================================================================
--- libvirt-1.3.5.orig/examples/apparmor/usr.sbin.libvirtd
+++ libvirt-1.3.5/examples/apparmor/usr.sbin.libvirtd
@@ -45,6 +45,7 @@
/bin/* PUx,
/sbin/* PUx,
/usr/bin/* PUx,
+ /usr/sbin/virtlogd pix,
/usr/sbin/* PUx,
/lib/udev/scsi_id PUx,
/usr/{lib,lib64}/xen-common/bin/xen-toolstack PUx,

6
apparmor-fixes.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.3.5/examples/apparmor/libvirt-qemu
Index: libvirt-2.0.0/examples/apparmor/libvirt-qemu
===================================================================
--- libvirt-1.3.5.orig/examples/apparmor/libvirt-qemu
+++ libvirt-1.3.5/examples/apparmor/libvirt-qemu
--- libvirt-2.0.0.orig/examples/apparmor/libvirt-qemu
+++ libvirt-2.0.0/examples/apparmor/libvirt-qemu
@@ -143,6 +143,9 @@
# for restore
/bin/bash rmix,

6
apparmor-no-mount.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.3.5/examples/apparmor/libvirt-lxc
Index: libvirt-2.0.0/examples/apparmor/libvirt-lxc
===================================================================
--- libvirt-1.3.5.orig/examples/apparmor/libvirt-lxc
+++ libvirt-1.3.5/examples/apparmor/libvirt-lxc
--- libvirt-2.0.0.orig/examples/apparmor/libvirt-lxc
+++ libvirt-2.0.0/examples/apparmor/libvirt-lxc
@@ -2,39 +2,15 @@
#include <abstractions/base>

8
blockcopy-check-dst-identical-device.patch
View File

@ -11,11 +11,11 @@ Signed-off-by: Chunyan Liu <cyliu@suse.com>
src/qemu/qemu_driver.c | 7 +++++++
1 file changed, 7 insertions(+)
Index: libvirt-1.3.5/src/qemu/qemu_driver.c
Index: libvirt-2.0.0/src/qemu/qemu_driver.c
===================================================================
--- libvirt-1.3.5.orig/src/qemu/qemu_driver.c
+++ libvirt-1.3.5/src/qemu/qemu_driver.c
@@ -16432,6 +16432,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
--- libvirt-2.0.0.orig/src/qemu/qemu_driver.c
+++ libvirt-2.0.0/src/qemu/qemu_driver.c
@@ -16292,6 +16292,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
_("non-file destination not supported yet"));
goto endjob;
}

60
e33cd67a-xenconfig-backendtype-fix.patch
View File

@ -1,60 +0,0 @@
commit e33cd67a9b51e8fcb4e084f40f500057b30b2786
Author: Jim Fehlig <jfehlig@suse.com>
Date: Wed Jun 15 23:09:36 2016 -0600
xenconfig: fix conversion of <driver> to backendtype
When converting domXML to xen xl.cfg, backendtype should
not be emitted if <driver> is not specified. Moreover,
<driver name='file'/> should be converted to backendtype
qdisk, similar to handling of <driver> in libxlMakeDisk()
in libxl_conf.c.
Prior to this change, connectDomainXMLToNative would
produce incorrect xl.cfg when the input domXML contained
<driver name='file'/>
domXML:
<disk type="file" device="disk">
<driver name="file"/>
<source file="/image/file/path"/>
<target dev="xvda" bus="xen"/>
</disk>
virsh domxml-to-native xen-xl domXML
disk = [ "format=raw,vdev=xvda,access=rw,backendtype=target=/image/file/path" ]
xl create xl.cfg
config parsing error in disk specification: unknown value
for backendtype: near `target=/image/file/path' in
`format=raw,vdev=xvda,access=rw,backendtype=target=/image/file/path'
Index: libvirt-1.3.5/src/xenconfig/xen_xl.c
===================================================================
--- libvirt-1.3.5.orig/src/xenconfig/xen_xl.c
+++ libvirt-1.3.5/src/xenconfig/xen_xl.c
@@ -752,13 +752,15 @@ xenFormatXLDisk(virConfValuePtr list, vi
}
/* backendtype */
- virBufferAddLit(&buf, "backendtype=");
- if (STREQ_NULLABLE(driver, "qemu"))
- virBufferAddLit(&buf, "qdisk,");
- else if (STREQ_NULLABLE(driver, "tap"))
- virBufferAddLit(&buf, "tap,");
- else if (STREQ_NULLABLE(driver, "phy"))
- virBufferAddLit(&buf, "phy,");
+ if (driver) {
+ virBufferAddLit(&buf, "backendtype=");
+ if (STREQ(driver, "qemu") || STREQ(driver, "file"))
+ virBufferAddLit(&buf, "qdisk,");
+ else if (STREQ(driver, "tap"))
+ virBufferAddLit(&buf, "tap,");
+ else if (STREQ(driver, "phy"))
+ virBufferAddLit(&buf, "phy,");
+ }
/* devtype */
if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM)

3
libvirt-1.3.5.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:93a23c44eb431da46c9458f95a66e29c9b98e37515d44b6be09e75b35ec94ac8
size 35109092

7
libvirt-1.3.5.tar.gz.asc
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAldS8J8ACgkQRga4pd6VvB+VvwCcDfgIkCFsfgj5XmnLdb4oQjc0
RXoAnirOBaSfylYPmgQJDnXHkFCh89LD
=PDgX
-----END PGP SIGNATURE-----

3
libvirt-2.0.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:10e90af55e613953c0ddc60b4ac3a10c73c0f3493d7014259e3f012b2ffc9acb
size 13161096

7
libvirt-2.0.0.tar.xz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAld2MUcACgkQRga4pd6VvB8KZwCgmfElUahCJKGN6KEKIdDmjNWT
snoAnAn/J4imekmwJeGGJTBY4S8Izdv4
=UgFQ
-----END PGP SIGNATURE-----

18
libvirt-guests-init-script.patch
View File

@ -1,9 +1,9 @@
Adjust libvirt-guests init files to conform to SUSE standards
Index: libvirt-1.3.5/tools/libvirt-guests.init.in
Index: libvirt-2.0.0/tools/libvirt-guests.init.in
===================================================================
--- libvirt-1.3.5.orig/tools/libvirt-guests.init.in
+++ libvirt-1.3.5/tools/libvirt-guests.init.in
--- libvirt-2.0.0.orig/tools/libvirt-guests.init.in
+++ libvirt-2.0.0/tools/libvirt-guests.init.in
@@ -4,27 +4,27 @@
# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html
#
@ -45,10 +45,10 @@ Index: libvirt-1.3.5/tools/libvirt-guests.init.in
#
exec @libexecdir@/libvirt-guests.sh "$@"
Index: libvirt-1.3.5/tools/libvirt-guests.sh.in
Index: libvirt-2.0.0/tools/libvirt-guests.sh.in
===================================================================
--- libvirt-1.3.5.orig/tools/libvirt-guests.sh.in
+++ libvirt-1.3.5/tools/libvirt-guests.sh.in
--- libvirt-2.0.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-2.0.0/tools/libvirt-guests.sh.in
@@ -16,14 +16,13 @@
# License along with this library. If not, see
# <http://www.gnu.org/licenses/>.
@ -208,10 +208,10 @@ Index: libvirt-1.3.5/tools/libvirt-guests.sh.in
esac
-exit $RETVAL
+rc_exit
Index: libvirt-1.3.5/tools/libvirt-guests.sysconf
Index: libvirt-2.0.0/tools/libvirt-guests.sysconf
===================================================================
--- libvirt-1.3.5.orig/tools/libvirt-guests.sysconf
+++ libvirt-1.3.5/tools/libvirt-guests.sysconf
--- libvirt-2.0.0.orig/tools/libvirt-guests.sysconf
+++ libvirt-2.0.0/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests
+

8
libvirt-power8-models.patch
View File

@ -1,8 +1,8 @@
Index: libvirt-1.3.5/src/cpu/cpu_map.xml
Index: libvirt-2.0.0/src/cpu/cpu_map.xml
===================================================================
--- libvirt-1.3.5.orig/src/cpu/cpu_map.xml
+++ libvirt-1.3.5/src/cpu/cpu_map.xml
@@ -1430,6 +1430,16 @@
--- libvirt-2.0.0.orig/src/cpu/cpu_map.xml
+++ libvirt-2.0.0/src/cpu/cpu_map.xml
@@ -1542,6 +1542,16 @@
<pvr value='0x004d0000' mask='0xffff0000'/>
</model>

44
libvirt-suse-netcontrol.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.3.5/configure.ac
Index: libvirt-2.0.0/configure.ac
===================================================================
--- libvirt-1.3.5.orig/configure.ac
+++ libvirt-1.3.5/configure.ac
--- libvirt-2.0.0.orig/configure.ac
+++ libvirt-2.0.0/configure.ac
@@ -248,6 +248,7 @@ LIBVIRT_CHECK_FUSE
LIBVIRT_CHECK_GLUSTER
LIBVIRT_CHECK_HAL
@ -10,7 +10,7 @@ Index: libvirt-1.3.5/configure.ac
LIBVIRT_CHECK_NUMACTL
LIBVIRT_CHECK_OPENWSMAN
LIBVIRT_CHECK_PCIACCESS
@@ -2396,11 +2397,12 @@ if test "$with_libvirtd" = "no" ; then
@@ -2404,11 +2405,12 @@ if test "$with_libvirtd" = "no" ; then
with_interface=no
fi
@ -26,7 +26,7 @@ Index: libvirt-1.3.5/configure.ac
esac
if test "$with_interface" = "yes" ; then
@@ -2779,6 +2781,7 @@ LIBVIRT_RESULT_FUSE
@@ -2787,6 +2789,7 @@ LIBVIRT_RESULT_FUSE
LIBVIRT_RESULT_GLUSTER
LIBVIRT_RESULT_HAL
LIBVIRT_RESULT_NETCF
@ -34,11 +34,11 @@ Index: libvirt-1.3.5/configure.ac
LIBVIRT_RESULT_NUMACTL
LIBVIRT_RESULT_OPENWSMAN
LIBVIRT_RESULT_PCIACCESS
Index: libvirt-1.3.5/src/Makefile.am
Index: libvirt-2.0.0/src/Makefile.am
===================================================================
--- libvirt-1.3.5.orig/src/Makefile.am
+++ libvirt-1.3.5/src/Makefile.am
@@ -932,6 +932,10 @@ if WITH_NETCF
--- libvirt-2.0.0.orig/src/Makefile.am
+++ libvirt-2.0.0/src/Makefile.am
@@ -943,6 +943,10 @@ if WITH_NETCF
INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_netcf.c
endif WITH_NETCF
@ -49,7 +49,7 @@ Index: libvirt-1.3.5/src/Makefile.am
if WITH_UDEV
INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_udev.c
@@ -1579,6 +1583,10 @@ if WITH_NETCF
@@ -1589,6 +1593,10 @@ if WITH_NETCF
libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
endif WITH_NETCF
@ -60,11 +60,11 @@ Index: libvirt-1.3.5/src/Makefile.am
if WITH_UDEV
libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS)
libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS)
Index: libvirt-1.3.5/tools/virsh.c
Index: libvirt-2.0.0/tools/virsh.c
===================================================================
--- libvirt-1.3.5.orig/tools/virsh.c
+++ libvirt-1.3.5/tools/virsh.c
@@ -597,6 +597,8 @@ virshShowVersion(vshControl *ctl ATTRIBU
--- libvirt-2.0.0.orig/tools/virsh.c
+++ libvirt-2.0.0/tools/virsh.c
@@ -636,6 +636,8 @@ virshShowVersion(vshControl *ctl ATTRIBU
vshPrint(ctl, " Interface");
# if defined(WITH_NETCF)
vshPrint(ctl, " netcf");
@ -73,10 +73,10 @@ Index: libvirt-1.3.5/tools/virsh.c
# elif defined(WITH_UDEV)
vshPrint(ctl, " udev");
# endif
Index: libvirt-1.3.5/src/interface/interface_backend_netcf.c
Index: libvirt-2.0.0/src/interface/interface_backend_netcf.c
===================================================================
--- libvirt-1.3.5.orig/src/interface/interface_backend_netcf.c
+++ libvirt-1.3.5/src/interface/interface_backend_netcf.c
--- libvirt-2.0.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-2.0.0/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@
#include <config.h>
@ -160,10 +160,10 @@ Index: libvirt-1.3.5/src/interface/interface_backend_netcf.c
if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
return -1;
if (virRegisterStateDriver(&interfaceStateDriver) < 0)
Index: libvirt-1.3.5/src/interface/interface_driver.c
Index: libvirt-2.0.0/src/interface/interface_driver.c
===================================================================
--- libvirt-1.3.5.orig/src/interface/interface_driver.c
+++ libvirt-1.3.5/src/interface/interface_driver.c
--- libvirt-2.0.0.orig/src/interface/interface_driver.c
+++ libvirt-2.0.0/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void)
if (netcfIfaceRegister() == 0)
return 0;
@ -181,10 +181,10 @@ Index: libvirt-1.3.5/src/interface/interface_driver.c
if (udevIfaceRegister() == 0)
return 0;
#endif /* WITH_UDEV */
Index: libvirt-1.3.5/m4/virt-netcontrol.m4
Index: libvirt-2.0.0/m4/virt-netcontrol.m4
===================================================================
--- /dev/null
+++ libvirt-1.3.5/m4/virt-netcontrol.m4
+++ libvirt-2.0.0/m4/virt-netcontrol.m4
@@ -0,0 +1,35 @@
+dnl The libnetcontrol library
+dnl

15
libvirt.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Fri Jul 1 14:16:04 UTC 2016 - jfehlig@suse.com
- Update to libvirt 2.0.0
- Change version scheme to match libvirt's time-driven release
schedule. <major> will be incremented on first release of
new calendar year, <minor> on each monthly release, and
<micro> on stable branch maintenance release
- Include libvirt-admin utility and API
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
apparmor-dont-scrub-environment-of-virtlogd-process.patch,
e33cd67a-xenconfig-backendtype-fix.patch
-------------------------------------------------------------------
Mon Jun 20 21:26:41 UTC 2016 - jfehlig@suse.com

33
libvirt.spec
View File

@ -57,7 +57,6 @@
%define with_numad 0%{!?_without_numad:0}
%define with_firewalld 0%{!?_without_firewalld:0}
%define with_wireshark 0%{!?_without_wireshark:0}
%define with_systemd_daemon 0%{!?_without_systemd_daemon:0}
# Xen no longer contains xm/xend so disable building the legacy Xen driver
%define with_xen 0
@ -113,7 +112,6 @@
# Support systemd on 12.1 and later
%if 0%{?suse_version} >= 1210
%define with_systemd 0%{!?_without_systemd:1}
%define with_systemd_daemon 1
%endif
# libvirt commit 37397320 changed the configure check for wireshark to
@ -142,7 +140,7 @@
Name: libvirt
Url: http://libvirt.org/
Version: 1.3.5
Version: 2.0.0
Release: 0
Summary: Library providing a simple virtualization API
License: LGPL-2.1+
@ -189,9 +187,6 @@ BuildRequires: modutils
BuildRequires: systemd
BuildRequires: pkgconfig(systemd)
%endif
%if %{with_systemd_daemon}
BuildRequires: systemd-devel
%endif
%if %{with_xen} || %{with_libxl}
BuildRequires: xen-devel
%endif
@ -276,18 +271,16 @@ BuildRequires: wireshark-devel
BuildRequires: qemu-tools
%endif
Source0: %{name}-%{version}.tar.gz
Source1: %{name}-%{version}.tar.gz.asc
Source0: %{name}-%{version}.tar.xz
Source1: %{name}-%{version}.tar.xz.asc
Source2: %{name}.keyring
Source3: libvirtd.init
Source4: libvirtd-relocation-server.fw
Source99: baselibs.conf
Source100: %{name}-rpmlintrc
# Upstream patches
Patch0: e33cd67a-xenconfig-backendtype-fix.patch
# Patches pending upstream review
Patch100: libxl-dom-reset.patch
Patch101: apparmor-dont-scrub-environment-of-virtlogd-process.patch
# Need to go upstream
Patch150: xen-pv-cdrom.patch
Patch151: blockcopy-check-dst-identical-device.patch
@ -737,9 +730,7 @@ libvirt plugin for NSS for translating domain names into IP addresses.
%prep
%setup -q
%patch0 -p1
%patch100 -p1
%patch101 -p1
%patch150 -p1
%patch151 -p1
%patch152 -p1
@ -870,11 +861,6 @@ libvirt plugin for NSS for translating domain names into IP addresses.
%else
%define arg_wireshark --without-wireshark-dissector
%endif
%if %{with_systemd_daemon}
%define arg_systemd_daemon --with-systemd-daemon
%else
%define arg_systemd_daemon --without-systemd-daemon
%endif
%define arg_selinux_mount --with-selinux-mount="/selinux"
@ -937,7 +923,6 @@ export CFLAGS="$RPM_OPT_FLAGS"
--with-driver-modules \
%{?arg_firewalld} \
%{?arg_wireshark} \
%{?arg_systemd_daemon} \
--with-nss-plugin \
--libexecdir=%{_libdir}/%{name} \
--with-qemu-user=%{qemu_user} \
@ -976,12 +961,6 @@ done
# temporarily remove polkit ACL policiy configuration - bnc#827644
rm -f $RPM_BUILD_ROOT/%{_datadir}/polkit-1/actions/org.libvirt.api.policy
# Similar to upstream, temporarily remove admin-related files
rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-admin.so
rm -f $RPM_BUILD_ROOT%{_bindir}/virt-admin
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/virt-admin.1*
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/libvirt-admin.conf
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/libvirt
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/libvirt/hooks
%find_lang %{name}
@ -1463,11 +1442,14 @@ fi
%files client -f %{name}.lang
%doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO
%doc %{_mandir}/man1/virsh.1*
%doc %{_mandir}/man1/virt-admin.1*
%doc %{_mandir}/man1/virt-xml-validate.1*
%doc %{_mandir}/man1/virt-pki-validate.1*
%doc %{_mandir}/man1/virt-host-validate.1*
%config(noreplace) %{_sysconfdir}/%{name}/libvirt.conf
%config(noreplace) %{_sysconfdir}/%{name}/libvirt-admin.conf
%{_bindir}/virsh
%{_bindir}/virt-admin
%{_bindir}/virt-xml-validate
%{_bindir}/virt-pki-validate
%{_bindir}/virt-host-validate
@ -1510,14 +1492,17 @@ fi
%files devel
%{_libdir}/libvirt.so
%{_libdir}/libvirt-admin.so
%{_libdir}/libvirt-qemu.so
%{_libdir}/libvirt-lxc.so
%{_includedir}/libvirt
%{_libdir}/pkgconfig/libvirt.pc
%{_libdir}/pkgconfig/libvirt-admin.pc
%{_libdir}/pkgconfig/libvirt-qemu.pc
%{_libdir}/pkgconfig/libvirt-lxc.pc
%dir %{_datadir}/libvirt/api/
%{_datadir}/libvirt/api/libvirt-api.xml
%{_datadir}/libvirt/api/libvirt-admin-api.xml
%{_datadir}/libvirt/api/libvirt-qemu-api.xml
%{_datadir}/libvirt/api/libvirt-lxc-api.xml

18
libvirtd-defaults.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.3.5/daemon/libvirtd.conf
Index: libvirt-2.0.0/daemon/libvirtd.conf
===================================================================
--- libvirt-1.3.5.orig/daemon/libvirtd.conf
+++ libvirt-1.3.5/daemon/libvirtd.conf
--- libvirt-2.0.0.orig/daemon/libvirtd.conf
+++ libvirt-2.0.0/daemon/libvirtd.conf
@@ -18,8 +18,8 @@
# It is necessary to setup a CA and issue server certificates before
# using this capability.
@ -13,10 +13,10 @@ Index: libvirt-1.3.5/daemon/libvirtd.conf
# Listen for unencrypted TCP connections on the public TCP/IP port.
# NB, must pass the --listen flag to the libvirtd process for this to
Index: libvirt-1.3.5/daemon/libvirtd-config.c
Index: libvirt-2.0.0/daemon/libvirtd-config.c
===================================================================
--- libvirt-1.3.5.orig/daemon/libvirtd-config.c
+++ libvirt-1.3.5/daemon/libvirtd-config.c
--- libvirt-2.0.0.orig/daemon/libvirtd-config.c
+++ libvirt-2.0.0/daemon/libvirtd-config.c
@@ -242,7 +242,7 @@ daemonConfigNew(bool privileged ATTRIBUT
if (VIR_ALLOC(data) < 0)
return NULL;
@ -26,10 +26,10 @@ Index: libvirt-1.3.5/daemon/libvirtd-config.c
data->listen_tcp = 0;
if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
Index: libvirt-1.3.5/daemon/test_libvirtd.aug.in
Index: libvirt-2.0.0/daemon/test_libvirtd.aug.in
===================================================================
--- libvirt-1.3.5.orig/daemon/test_libvirtd.aug.in
+++ libvirt-1.3.5/daemon/test_libvirtd.aug.in
--- libvirt-2.0.0.orig/daemon/test_libvirtd.aug.in
+++ libvirt-2.0.0/daemon/test_libvirtd.aug.in
@@ -2,7 +2,7 @@ module Test_libvirtd =
::CONFIG::

6
libvirtd-init-script.patch
View File

@ -1,9 +1,9 @@
Adjust libvirtd sysconfig file to conform to SUSE standards
Index: libvirt-1.3.5/daemon/libvirtd.sysconf
Index: libvirt-2.0.0/daemon/libvirtd.sysconf
===================================================================
--- libvirt-1.3.5.orig/daemon/libvirtd.sysconf
+++ libvirt-1.3.5/daemon/libvirtd.sysconf
--- libvirt-2.0.0.orig/daemon/libvirtd.sysconf
+++ libvirt-2.0.0/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt
+

16
libxl-dom-reset.patch
View File

@ -8,11 +8,11 @@ Date: Mon Jun 23 15:51:20 2014 -0600
option, but domainReset can be implemented in the libxl driver by
forcibly destroying the domain and starting it again.
Index: libvirt-1.3.5/src/libxl/libxl_driver.c
Index: libvirt-2.0.0/src/libxl/libxl_driver.c
===================================================================
--- libvirt-1.3.5.orig/src/libxl/libxl_driver.c
+++ libvirt-1.3.5/src/libxl/libxl_driver.c
@@ -1325,6 +1325,63 @@ libxlDomainReboot(virDomainPtr dom, unsi
--- libvirt-2.0.0.orig/src/libxl/libxl_driver.c
+++ libvirt-2.0.0/src/libxl/libxl_driver.c
@@ -1327,6 +1327,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
}
static int
@ -62,12 +62,10 @@ Index: libvirt-1.3.5/src/libxl/libxl_driver.c
+ ret = 0;
+
+ endjob:
+ if (!libxlDomainObjEndJob(driver, vm))
+ vm = NULL;
+ libxlDomainObjEndJob(driver, vm);
+
+ cleanup:
+ if (vm)
+ virObjectUnlock(vm);
+ virDomainObjEndAPI(&vm);
+ virObjectUnref(cfg);
+ return ret;
+}
@ -76,7 +74,7 @@ Index: libvirt-1.3.5/src/libxl/libxl_driver.c
libxlDomainDestroyFlags(virDomainPtr dom,
unsigned int flags)
{
@@ -5581,6 +5638,7 @@ static virHypervisorDriver libxlHypervis
@@ -5763,6 +5818,7 @@ static virHypervisorDriver libxlHypervis
.domainShutdown = libxlDomainShutdown, /* 0.9.0 */
.domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */
.domainReboot = libxlDomainReboot, /* 0.9.0 */

16
libxl-qemu-emulator-caps.patch
View File

@ -8,11 +8,19 @@ as the default <emulator>, instead of the qemu-xen one.
See FATE#320638 for details.
Index: libvirt-1.3.5/src/libxl/libxl_conf.c
Index: libvirt-2.0.0/src/libxl/libxl_capabilities.c
===================================================================
--- libvirt-1.3.5.orig/src/libxl/libxl_conf.c
+++ libvirt-1.3.5/src/libxl/libxl_conf.c
@@ -439,7 +439,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virC
--- libvirt-2.0.0.orig/src/libxl/libxl_capabilities.c
+++ libvirt-2.0.0/src/libxl/libxl_capabilities.c
@@ -36,6 +36,7 @@
#include "domain_capabilities.h"
#include "vircommand.h"
#include "libxl_capabilities.h"
+#include "configmake.h"
#define VIR_FROM_THIS VIR_FROM_LIBXL
@@ -335,7 +336,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virC
if ((guest = virCapabilitiesAddGuest(caps,
guest_archs[i].hvm ? VIR_DOMAIN_OSTYPE_HVM : VIR_DOMAIN_OSTYPE_XEN,
guest_archs[i].arch,

18
libxl-set-cach-mode.patch
View File

@ -3,14 +3,14 @@ https://bugzilla.novell.com/show_bug.cgi?id=879425
src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
Index: libvirt-1.3.5/src/libxl/libxl_conf.c
Index: libvirt-2.0.0/src/libxl/libxl_conf.c
===================================================================
--- libvirt-1.3.5.orig/src/libxl/libxl_conf.c
+++ libvirt-1.3.5/src/libxl/libxl_conf.c
@@ -905,6 +905,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
--- libvirt-2.0.0.orig/src/libxl/libxl_conf.c
+++ libvirt-2.0.0/src/libxl/libxl_conf.c
@@ -562,6 +562,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
#endif
}
+static void
+libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode)
+{
@ -35,10 +35,10 @@ Index: libvirt-1.3.5/src/libxl/libxl_conf.c
+ }
+}
+
#define LIBXL_QEMU_DM_STR "Options specific to the Xen version:"
int
@@ -1180,6 +1204,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
static char *
libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src,
const char *username,
@@ -803,6 +827,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0;
if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0)
return -1;

74
libxl-set-migration-constraints.patch
View File

@ -16,13 +16,13 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
tools/virsh.pod | 8 ++++++++
6 files changed, 125 insertions(+), 6 deletions(-)
Index: libvirt-1.3.5/include/libvirt/libvirt-domain.h
Index: libvirt-2.0.0/include/libvirt/libvirt-domain.h
===================================================================
--- libvirt-1.3.5.orig/include/libvirt/libvirt-domain.h
+++ libvirt-1.3.5/include/libvirt/libvirt-domain.h
@@ -845,6 +845,31 @@ typedef enum {
--- libvirt-2.0.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-2.0.0/include/libvirt/libvirt-domain.h
@@ -864,6 +864,31 @@ typedef enum {
*/
# define VIR_MIGRATE_PARAM_COMPRESSION_XBZRLE_CACHE "compression.xbzrle.cache"
# define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT "auto_converge.increment"
+/**
+ * VIR_MIGRATE_PARAM_SUSE_MAX_ITERS:
@ -52,11 +52,11 @@ Index: libvirt-1.3.5/include/libvirt/libvirt-domain.h
/* Domain migration. */
virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
unsigned long flags, const char *dname,
Index: libvirt-1.3.5/src/libxl/libxl_driver.c
Index: libvirt-2.0.0/src/libxl/libxl_driver.c
===================================================================
--- libvirt-1.3.5.orig/src/libxl/libxl_driver.c
+++ libvirt-1.3.5/src/libxl/libxl_driver.c
@@ -5320,6 +5320,9 @@ libxlDomainMigratePerform3Params(virDoma
--- libvirt-2.0.0.orig/src/libxl/libxl_driver.c
+++ libvirt-2.0.0/src/libxl/libxl_driver.c
@@ -5428,6 +5428,9 @@ libxlDomainMigratePerform3Params(virDoma
const char *dname = NULL;
const char *uri = NULL;
int ret = -1;
@ -66,7 +66,7 @@ Index: libvirt-1.3.5/src/libxl/libxl_driver.c
#ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
virReportUnsupportedError();
@@ -5336,6 +5339,18 @@ libxlDomainMigratePerform3Params(virDoma
@@ -5444,6 +5447,18 @@ libxlDomainMigratePerform3Params(virDoma
virTypedParamsGetString(params, nparams,
VIR_MIGRATE_PARAM_DEST_NAME,
&dname) < 0 ||
@ -85,7 +85,7 @@ Index: libvirt-1.3.5/src/libxl/libxl_driver.c
virTypedParamsGetString(params, nparams,
VIR_MIGRATE_PARAM_URI,
&uri) < 0)
@@ -5350,11 +5365,11 @@ libxlDomainMigratePerform3Params(virDoma
@@ -5458,11 +5473,11 @@ libxlDomainMigratePerform3Params(virDoma
if (flags & VIR_MIGRATE_PEER2PEER) {
if (libxlDomainMigrationPerformP2P(driver, vm, dom->conn, dom_xml,
@ -99,11 +99,11 @@ Index: libvirt-1.3.5/src/libxl/libxl_driver.c
goto cleanup;
}
Index: libvirt-1.3.5/src/libxl/libxl_migration.c
Index: libvirt-2.0.0/src/libxl/libxl_migration.c
===================================================================
--- libvirt-1.3.5.orig/src/libxl/libxl_migration.c
+++ libvirt-1.3.5/src/libxl/libxl_migration.c
@@ -358,18 +358,39 @@ libxlMigrateReceive(virNetSocketPtr sock
--- libvirt-2.0.0.orig/src/libxl/libxl_migration.c
+++ libvirt-2.0.0/src/libxl/libxl_migration.c
@@ -357,18 +357,39 @@ libxlMigrateReceive(virNetSocketPtr sock
static int
libxlDoMigrateSend(libxlDriverPrivatePtr driver,
virDomainObjPtr vm,
@ -145,7 +145,7 @@ Index: libvirt-1.3.5/src/libxl/libxl_migration.c
if (ret != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Failed to send migration data to destination host"));
@@ -665,7 +686,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
@@ -663,7 +684,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
const char *dconnuri ATTRIBUTE_UNUSED,
const char *dname,
const char *uri,
@ -154,7 +154,7 @@ Index: libvirt-1.3.5/src/libxl/libxl_migration.c
{
virDomainPtr ddomain = NULL;
virTypedParameterPtr params = NULL;
@@ -702,7 +723,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
@@ -700,7 +721,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
/* We don't require the destination to have P2P support
* as it looks to be normal migration from the receiver perpective.
*/
@ -163,7 +163,7 @@ Index: libvirt-1.3.5/src/libxl/libxl_migration.c
VIR_DEBUG("Prepare3");
virObjectUnlock(vm);
@@ -727,7 +748,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
@@ -725,7 +746,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out));
ret = libxlDomainMigrationPerform(driver, vm, NULL, NULL,
@ -172,7 +172,7 @@ Index: libvirt-1.3.5/src/libxl/libxl_migration.c
if (ret < 0)
orig_err = virSaveLastError();
@@ -759,7 +780,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
@@ -757,7 +778,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
orig_err = virSaveLastError();
VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm);
@ -181,7 +181,7 @@ Index: libvirt-1.3.5/src/libxl/libxl_migration.c
if (ret < 0)
VIR_WARN("Guest %s probably left in 'paused' state on source",
@@ -808,7 +829,7 @@ libxlDomainMigrationPerformP2P(libxlDriv
@@ -806,7 +827,7 @@ libxlDomainMigrationPerformP2P(libxlDriv
const char *dconnuri,
const char *uri_str ATTRIBUTE_UNUSED,
const char *dname,
@ -190,7 +190,7 @@ Index: libvirt-1.3.5/src/libxl/libxl_migration.c
{
int ret = -1;
bool useParams;
@@ -843,7 +864,7 @@ libxlDomainMigrationPerformP2P(libxlDriv
@@ -841,7 +862,7 @@ libxlDomainMigrationPerformP2P(libxlDriv
}
ret = libxlDoMigrateP2P(driver, vm, sconn, xmlin, dconn, dconnuri,
@ -199,7 +199,7 @@ Index: libvirt-1.3.5/src/libxl/libxl_migration.c
cleanup:
orig_err = virSaveLastError();
@@ -865,7 +886,7 @@ libxlDomainMigrationPerform(libxlDriverP
@@ -863,7 +884,7 @@ libxlDomainMigrationPerform(libxlDriverP
const char *dconnuri ATTRIBUTE_UNUSED,
const char *uri_str,
const char *dname ATTRIBUTE_UNUSED,
@ -208,7 +208,7 @@ Index: libvirt-1.3.5/src/libxl/libxl_migration.c
{
libxlDomainObjPrivatePtr priv = vm->privateData;
char *hostname = NULL;
@@ -905,7 +926,7 @@ libxlDomainMigrationPerform(libxlDriverP
@@ -903,7 +924,7 @@ libxlDomainMigrationPerform(libxlDriverP
/* suspend vm and send saved data to dst through socket fd */
virObjectUnlock(vm);
@ -217,10 +217,10 @@ Index: libvirt-1.3.5/src/libxl/libxl_migration.c
virObjectLock(vm);
cleanup:
Index: libvirt-1.3.5/src/libxl/libxl_migration.h
Index: libvirt-2.0.0/src/libxl/libxl_migration.h
===================================================================
--- libvirt-1.3.5.orig/src/libxl/libxl_migration.h
+++ libvirt-1.3.5/src/libxl/libxl_migration.h
--- libvirt-2.0.0.orig/src/libxl/libxl_migration.h
+++ libvirt-2.0.0/src/libxl/libxl_migration.h
@@ -37,6 +37,10 @@
VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \
VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \
@ -265,13 +265,13 @@ Index: libvirt-1.3.5/src/libxl/libxl_migration.h
virDomainPtr
libxlDomainMigrationFinish(virConnectPtr dconn,
Index: libvirt-1.3.5/tools/virsh-domain.c
Index: libvirt-2.0.0/tools/virsh-domain.c
===================================================================
--- libvirt-1.3.5.orig/tools/virsh-domain.c
+++ libvirt-1.3.5/tools/virsh-domain.c
@@ -9869,6 +9869,22 @@ static const vshCmdOptDef opts_migrate[]
--- libvirt-2.0.0.orig/tools/virsh-domain.c
+++ libvirt-2.0.0/tools/virsh-domain.c
@@ -9977,6 +9977,22 @@ static const vshCmdOptDef opts_migrate[]
.type = VSH_OT_INT,
.help = N_("port to use by target server for incoming disks migration")
.help = N_("CPU throttling rate increment for auto-convergence")
},
+ {.name = "max_iters",
+ .type = VSH_OT_INT,
@ -292,7 +292,7 @@ Index: libvirt-1.3.5/tools/virsh-domain.c
{.name = NULL}
};
@@ -9892,6 +9908,7 @@ doMigrate(void *opaque)
@@ -10000,6 +10016,7 @@ doMigrate(void *opaque)
unsigned long long ullOpt = 0;
int rv;
virConnectPtr dconn = data->dconn;
@ -300,7 +300,7 @@ Index: libvirt-1.3.5/tools/virsh-domain.c
sigemptyset(&sigmask);
sigaddset(&sigmask, SIGINT);
@@ -10011,6 +10028,27 @@ doMigrate(void *opaque)
@@ -10119,6 +10136,27 @@ doMigrate(void *opaque)
goto save_error;
}
@ -328,11 +328,11 @@ Index: libvirt-1.3.5/tools/virsh-domain.c
if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0)
goto out;
if (opt) {
Index: libvirt-1.3.5/tools/virsh.pod
Index: libvirt-2.0.0/tools/virsh.pod
===================================================================
--- libvirt-1.3.5.orig/tools/virsh.pod
+++ libvirt-1.3.5/tools/virsh.pod
@@ -1620,6 +1620,14 @@ compression. I<--comp-mt-threads> and I<
--- libvirt-2.0.0.orig/tools/virsh.pod
+++ libvirt-2.0.0/tools/virsh.pod
@@ -1631,6 +1631,14 @@ compression. I<--comp-mt-threads> and I<
of compress threads on source and the number of decompress threads on target
respectively. I<--comp-xbzrle-cache> sets size of page cache in bytes.

22
libxl-support-block-script.patch
View File

@ -7,12 +7,12 @@ and npiv.
For more details, see bsc#954872 and FATE#319810
Index: libvirt-1.3.5/src/libxl/libxl_conf.c
Index: libvirt-2.0.0/src/libxl/libxl_conf.c
===================================================================
--- libvirt-1.3.5.orig/src/libxl/libxl_conf.c
+++ libvirt-1.3.5/src/libxl/libxl_conf.c
@@ -929,6 +929,25 @@ libxlDiskSetCacheMode(libxl_device_disk
}
--- libvirt-2.0.0.orig/src/libxl/libxl_conf.c
+++ libvirt-2.0.0/src/libxl/libxl_conf.c
@@ -562,6 +562,25 @@ libxlDiskSetDiscard(libxl_device_disk *x
#endif
}
+static int
@ -34,10 +34,10 @@ Index: libvirt-1.3.5/src/libxl/libxl_conf.c
+ return 0;
+}
+
#define LIBXL_QEMU_DM_STR "Options specific to the Xen version:"
int
@@ -1082,6 +1101,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
static void
libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode)
{
@@ -705,6 +724,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
int
libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk)
{
@ -45,7 +45,7 @@ Index: libvirt-1.3.5/src/libxl/libxl_conf.c
const char *driver = virDomainDiskGetDriver(l_disk);
int format = virDomainDiskGetFormat(l_disk);
int actual_type = virStorageSourceGetActualType(l_disk->src);
@@ -1097,7 +1117,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
@@ -720,7 +740,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0)
return -1;
} else {
@ -54,7 +54,7 @@ Index: libvirt-1.3.5/src/libxl/libxl_conf.c
return -1;
}
@@ -1205,6 +1225,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
@@ -828,6 +848,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0)
return -1;
libxlDiskSetCacheMode(x_disk, l_disk->cachemode);

22
lxc-wait-after-eth-del.patch
View File

@ -13,10 +13,10 @@ device with the same name that is being created.
src/lxc/lxc_process.c | 1 +
3 files changed, 4 insertions(+)
Index: libvirt-1.3.5/src/lxc/lxc_controller.c
Index: libvirt-2.0.0/src/lxc/lxc_controller.c
===================================================================
--- libvirt-1.3.5.orig/src/lxc/lxc_controller.c
+++ libvirt-1.3.5/src/lxc/lxc_controller.c
--- libvirt-2.0.0.orig/src/lxc/lxc_controller.c
+++ libvirt-2.0.0/src/lxc/lxc_controller.c
@@ -2009,6 +2009,7 @@ static int virLXCControllerDeleteInterfa
if (virNetDevVethDelete(ctrl->veths[i]) < 0)
ret = -1;
@ -25,11 +25,11 @@ Index: libvirt-1.3.5/src/lxc/lxc_controller.c
return ret;
}
Index: libvirt-1.3.5/src/lxc/lxc_driver.c
Index: libvirt-2.0.0/src/lxc/lxc_driver.c
===================================================================
--- libvirt-1.3.5.orig/src/lxc/lxc_driver.c
+++ libvirt-1.3.5/src/lxc/lxc_driver.c
@@ -4350,6 +4350,7 @@ lxcDomainAttachDeviceNetLive(virConnectP
--- libvirt-2.0.0.orig/src/lxc/lxc_driver.c
+++ libvirt-2.0.0/src/lxc/lxc_driver.c
@@ -4026,6 +4026,7 @@ lxcDomainAttachDeviceNetLive(virConnectP
case VIR_DOMAIN_NET_TYPE_NETWORK:
case VIR_DOMAIN_NET_TYPE_ETHERNET:
ignore_value(virNetDevVethDelete(veth));
@ -37,7 +37,7 @@ Index: libvirt-1.3.5/src/lxc/lxc_driver.c
break;
case VIR_DOMAIN_NET_TYPE_DIRECT:
@@ -4779,6 +4780,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
@@ -4455,6 +4456,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
virDomainAuditNet(vm, detach, NULL, "detach", false);
goto cleanup;
}
@ -45,10 +45,10 @@ Index: libvirt-1.3.5/src/lxc/lxc_driver.c
break;
/* It'd be nice to support this, but with macvlan
Index: libvirt-1.3.5/src/lxc/lxc_process.c
Index: libvirt-2.0.0/src/lxc/lxc_process.c
===================================================================
--- libvirt-1.3.5.orig/src/lxc/lxc_process.c
+++ libvirt-1.3.5/src/lxc/lxc_process.c
--- libvirt-2.0.0.orig/src/lxc/lxc_process.c
+++ libvirt-2.0.0/src/lxc/lxc_process.c
@@ -221,6 +221,7 @@ static void virLXCProcessCleanup(virLXCD
}
networkReleaseActualDevice(vm->def, iface);

6
ppc64le-canonical-name.patch
View File

@ -2,10 +2,10 @@ Canonicalize hostarch name ppc64le to ppc64
See bnc#894956
Index: libvirt-1.3.5/src/util/virarch.c
Index: libvirt-2.0.0/src/util/virarch.c
===================================================================
--- libvirt-1.3.5.orig/src/util/virarch.c
+++ libvirt-1.3.5/src/util/virarch.c
--- libvirt-2.0.0.orig/src/util/virarch.c
+++ libvirt-2.0.0/src/util/virarch.c
@@ -169,6 +169,8 @@ virArch virArchFromHost(void)
arch = VIR_ARCH_I686;
} else if (STREQ(ut.machine, "amd64")) {

6
qemu-apparmor-screenshot.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.3.5/examples/apparmor/libvirt-qemu
Index: libvirt-2.0.0/examples/apparmor/libvirt-qemu
===================================================================
--- libvirt-1.3.5.orig/examples/apparmor/libvirt-qemu
+++ libvirt-1.3.5/examples/apparmor/libvirt-qemu
--- libvirt-2.0.0.orig/examples/apparmor/libvirt-qemu
+++ libvirt-2.0.0/examples/apparmor/libvirt-qemu
@@ -152,6 +152,9 @@
/sys/bus/ r,
/sys/class/ r,

18
support-managed-pci-xen-driver.patch
View File

@ -8,10 +8,10 @@ Subject: [PATCH] support managed pci devices in xen driver
src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++-
2 files changed, 35 insertions(+), 15 deletions(-)
Index: libvirt-1.3.5/src/xenconfig/xen_common.c
Index: libvirt-2.0.0/src/xenconfig/xen_common.c
===================================================================
--- libvirt-1.3.5.orig/src/xenconfig/xen_common.c
+++ libvirt-1.3.5/src/xenconfig/xen_common.c
--- libvirt-2.0.0.orig/src/xenconfig/xen_common.c
+++ libvirt-2.0.0/src/xenconfig/xen_common.c
@@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe
{
virConfValuePtr list = virConfGetValue(conf, "pci");
@ -66,10 +66,10 @@ Index: libvirt-1.3.5/src/xenconfig/xen_common.c
hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
hostdev->source.subsys.u.pci.addr.domain = domainID;
hostdev->source.subsys.u.pci.addr.bus = busID;
Index: libvirt-1.3.5/src/xenconfig/xen_sxpr.c
Index: libvirt-2.0.0/src/xenconfig/xen_sxpr.c
===================================================================
--- libvirt-1.3.5.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-1.3.5/src/xenconfig/xen_sxpr.c
--- libvirt-2.0.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-2.0.0/src/xenconfig/xen_sxpr.c
@@ -1062,6 +1062,7 @@ xenParseSxprPCI(virDomainDefPtr def,
int busID;
int slotID;
@ -93,7 +93,7 @@ Index: libvirt-1.3.5/src/xenconfig/xen_sxpr.c
dev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
dev->source.subsys.u.pci.addr.domain = domainID;
dev->source.subsys.u.pci.addr.bus = busID;
@@ -1978,11 +1981,15 @@ static void
@@ -1977,11 +1980,15 @@ static void
xenFormatSxprPCI(virDomainHostdevDefPtr def,
virBufferPtr buf)
{
@ -110,7 +110,7 @@ Index: libvirt-1.3.5/src/xenconfig/xen_sxpr.c
}
@@ -2001,12 +2008,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP
@@ -2000,12 +2007,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP
virBufferPtr buf,
int detach)
{
@ -123,7 +123,7 @@ Index: libvirt-1.3.5/src/xenconfig/xen_sxpr.c
virBufferAddLit(buf, "(pci ");
xenFormatSxprPCI(def, buf);
if (detach)
@@ -2061,12 +2062,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def,
@@ -2060,12 +2061,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def,
for (i = 0; i < def->nhostdevs; i++) {
if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {

12
suse-qemu-conf.patch
View File

@ -7,11 +7,11 @@ suse-qemu-conf-secdriver.patch, suse-qemu-conf-lockmgr.patch,
etc.), but for now they are all lumped together in this
single patch.
Index: libvirt-1.3.5/src/qemu/qemu.conf
Index: libvirt-2.0.0/src/qemu/qemu.conf
===================================================================
--- libvirt-1.3.5.orig/src/qemu/qemu.conf
+++ libvirt-1.3.5/src/qemu/qemu.conf
@@ -201,11 +201,20 @@
--- libvirt-2.0.0.orig/src/qemu/qemu.conf
+++ libvirt-2.0.0/src/qemu/qemu.conf
@@ -212,11 +212,20 @@
# isolation, but it cannot appear in a list of drivers.
#
#security_driver = "selinux"
@ -34,7 +34,7 @@ Index: libvirt-1.3.5/src/qemu/qemu.conf
# If set to non-zero, then attempts to create unconfined
# guests will be blocked. Defaults to 0.
@@ -417,11 +426,22 @@
@@ -428,11 +437,22 @@
#allow_disk_format_probing = 1
@ -62,7 +62,7 @@ Index: libvirt-1.3.5/src/qemu/qemu.conf
#
#lock_manager = "lockd"
@@ -512,8 +532,8 @@
@@ -523,8 +543,8 @@
# for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
# follows this scheme.
#nvram = [

6
systemd-service-xen.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.3.5/daemon/libvirtd.service.in
Index: libvirt-2.0.0/daemon/libvirtd.service.in
===================================================================
--- libvirt-1.3.5.orig/daemon/libvirtd.service.in
+++ libvirt-1.3.5/daemon/libvirtd.service.in
--- libvirt-2.0.0.orig/daemon/libvirtd.service.in
+++ libvirt-2.0.0/daemon/libvirtd.service.in
@@ -12,6 +12,7 @@ After=iscsid.service
After=apparmor.service
After=local-fs.target

12
virtlockd-init-script.patch
View File

@ -1,9 +1,9 @@
Adjust virtlockd init files to conform to SUSE standards
Index: libvirt-1.3.5/src/locking/virtlockd.sysconf
Index: libvirt-2.0.0/src/locking/virtlockd.sysconf
===================================================================
--- libvirt-1.3.5.orig/src/locking/virtlockd.sysconf
+++ libvirt-1.3.5/src/locking/virtlockd.sysconf
--- libvirt-2.0.0.orig/src/locking/virtlockd.sysconf
+++ libvirt-2.0.0/src/locking/virtlockd.sysconf
@@ -1,3 +1,7 @@
+## Path: System/Virtualization/virtlockd
+
@ -12,10 +12,10 @@ Index: libvirt-1.3.5/src/locking/virtlockd.sysconf
#
# Pass extra arguments to virtlockd
#VIRTLOCKD_ARGS=
Index: libvirt-1.3.5/src/locking/virtlockd.init.in
Index: libvirt-2.0.0/src/locking/virtlockd.init.in
===================================================================
--- libvirt-1.3.5.orig/src/locking/virtlockd.init.in
+++ libvirt-1.3.5/src/locking/virtlockd.init.in
--- libvirt-2.0.0.orig/src/locking/virtlockd.init.in
+++ libvirt-2.0.0/src/locking/virtlockd.init.in
@@ -4,59 +4,57 @@
# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html
#

12
virtlogd-init-script.patch
View File

@ -1,9 +1,9 @@
Adjust virtlogd init files to conform to SUSE standards
Index: libvirt-1.3.5/src/logging/virtlogd.init.in
Index: libvirt-2.0.0/src/logging/virtlogd.init.in
===================================================================
--- libvirt-1.3.5.orig/src/logging/virtlogd.init.in
+++ libvirt-1.3.5/src/logging/virtlogd.init.in
--- libvirt-2.0.0.orig/src/logging/virtlogd.init.in
+++ libvirt-2.0.0/src/logging/virtlogd.init.in
@@ -4,59 +4,56 @@
# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html
#
@ -126,10 +126,10 @@ Index: libvirt-1.3.5/src/logging/virtlogd.init.in
esac
-exit $RETVAL
+rc_exit
Index: libvirt-1.3.5/src/logging/virtlogd.sysconf
Index: libvirt-2.0.0/src/logging/virtlogd.sysconf
===================================================================
--- libvirt-1.3.5.orig/src/logging/virtlogd.sysconf
+++ libvirt-1.3.5/src/logging/virtlogd.sysconf
--- libvirt-2.0.0.orig/src/logging/virtlogd.sysconf
+++ libvirt-2.0.0/src/logging/virtlogd.sysconf
@@ -1,3 +1,7 @@
+## Path: System/Virtualization/virtlogd
+

6
xen-pv-cdrom.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.3.5/src/xenconfig/xen_sxpr.c
Index: libvirt-2.0.0/src/xenconfig/xen_sxpr.c
===================================================================
--- libvirt-1.3.5.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-1.3.5/src/xenconfig/xen_sxpr.c
--- libvirt-2.0.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-2.0.0/src/xenconfig/xen_sxpr.c
@@ -392,7 +392,7 @@ xenParseSxprVifRate(const char *rate, un
static int
xenParseSxprDisks(virDomainDefPtr def,

6
xen-sxpr-disk-type.patch
View File

@ -6,10 +6,10 @@ and 'file'. This was implicitly done prior to commit 9673418c.
https://bugzilla.suse.com/show_bug.cgi?id=938228
Index: libvirt-1.3.5/src/xenconfig/xen_sxpr.c
Index: libvirt-2.0.0/src/xenconfig/xen_sxpr.c
===================================================================
--- libvirt-1.3.5.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-1.3.5/src/xenconfig/xen_sxpr.c
--- libvirt-2.0.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-2.0.0/src/xenconfig/xen_sxpr.c
@@ -506,10 +506,11 @@ xenParseSxprDisks(virDomainDefPtr def,
omnipotent, we can revisit this, perhaps stat()'ing
the src file in question */