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

Accepting request 508398 from Virtualization

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/508398
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=231
This commit is contained in:
Dominique Leuenberger 2017-07-11 06:34:55 +00:00 committed by Git OBS Bridge
commit 214ac6de16
33 changed files with 178 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
1a4b21f1-set-EOF-on-end-of-stream.patch
View File

@ -1,39 +0,0 @@
commit 1a4b21f1c67a3ddf39d11bba39c1dee869131636
Author: Michal Privoznik <mprivozn@redhat.com>
Date: Tue Jun 6 14:45:55 2017 +0200
virNetClientStreamQueuePacket: Set st->incomingEOF on the end of stream
While reworking client side of streams, I had to postpone payload
decoding so that stream holes and stream data can be
distinguished in virNetClientStreamRecvPacket. That's merely what
18944b7aea46d does. However, I accidentally removed one important
bit: when server sends us an empty STREAM packet (with no
payload) - meaning end of stream - st->incomingEOF flag needs to
be set. It used to be before I touched the code. After I removed
it, virNetClientStreamRecvPacket will try to fetch more data from
the stream, but it will never come.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
Index: libvirt-3.4.0/src/rpc/virnetclientstream.c
===================================================================
--- libvirt-3.4.0.orig/src/rpc/virnetclientstream.c
+++ libvirt-3.4.0/src/rpc/virnetclientstream.c
@@ -278,6 +278,15 @@ int virNetClientStreamQueuePacket(virNet
VIR_DEBUG("Incoming stream message: stream=%p message=%p", st, msg);
+ if (msg->bufferLength == msg->bufferOffset) {
+ /* No payload means end of the stream. */
+ virObjectLock(st);
+ st->incomingEOF = true;
+ virNetClientStreamEventTimerUpdate(st);
+ virObjectUnlock(st);
+ return 0;
+ }
+
/* Unfortunately, we must allocate new message as the one we
* get in @msg is going to be cleared later in the process. */

85
5004f121-virFdStreamThread-dont-exceed-length.patch
View File

@ -1,85 +0,0 @@
commit 5004f121bc572c58d9721bf7bf3c3a1988720ba8
Author: Michal Privoznik <mprivozn@redhat.com>
Date: Mon Jun 5 13:22:23 2017 +0200
virFDStreamThread: Make sure we won't exceed @length
There's a problem with current streams after I switched them from
iohelper to thread implementation. Previously, iohelper made sure
not to exceed specified @length resulting in the pipe EOF
appearing at the exact right moment (the pipe was used to tunnel
the data from the iohelper to the daemon). Anyway, when switching
to thread I had to write the I/O code from scratch. Whilst doing
that I took an inspiration from the iohelper code, but since the
usage of pipe switched to slightly different meaning, there was
no 1:1 relationship between the codes.
Moreover, after introducing VIR_FDSTREAM_MSG_TYPE_HOLE, the
condition that should made sure we won't exceed @length was
completely wrong.
The fix is to:
a) account for holes for @length
b) cap not just data sections but holes too (if @length would be
exceeded)
For this purpose, the condition needs to be brought closer to the
code that handles holes and data sections.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Index: libvirt-3.4.0/src/util/virfdstream.c
===================================================================
--- libvirt-3.4.0.orig/src/util/virfdstream.c
+++ libvirt-3.4.0/src/util/virfdstream.c
@@ -420,6 +420,8 @@ virFDStreamThreadDoRead(virFDStreamDataP
const int fdout,
const char *fdinname,
const char *fdoutname,
+ size_t length,
+ size_t total,
size_t *dataLen,
size_t buflen)
{
@@ -433,10 +435,18 @@ virFDStreamThreadDoRead(virFDStreamDataP
if (virFileInData(fdin, &inData, &sectionLen) < 0)
goto error;
+ if (length &&
+ sectionLen > length - total)
+ sectionLen = length - total;
+
if (inData)
*dataLen = sectionLen;
}
+ if (length &&
+ buflen > length - total)
+ buflen = length - total;
+
if (VIR_ALLOC(msg) < 0)
goto error;
@@ -578,13 +588,6 @@ virFDStreamThread(void *opaque)
while (1) {
ssize_t got;
- if (length &&
- (length - total) < buflen)
- buflen = length - total;
-
- if (buflen == 0)
- break; /* End of requested data from client */
-
while (doRead == (fdst->msg != NULL) &&
!fdst->threadQuit) {
if (virCondWait(&fdst->threadCond, &fdst->parent.lock)) {
@@ -608,6 +611,7 @@ virFDStreamThread(void *opaque)
got = virFDStreamThreadDoRead(fdst, sparse,
fdin, fdout,
fdinname, fdoutname,
+ length, total,
&dataLen, buflen);
else
got = virFDStreamThreadDoWrite(fdst, sparse,

8
apparmor-fixes.patch
View File

@ -1,8 +1,8 @@
Index: libvirt-3.4.0/examples/apparmor/libvirt-qemu
Index: libvirt-3.5.0/examples/apparmor/libvirt-qemu
===================================================================
--- libvirt-3.4.0.orig/examples/apparmor/libvirt-qemu
+++ libvirt-3.4.0/examples/apparmor/libvirt-qemu
@@ -146,6 +146,9 @@
--- libvirt-3.5.0.orig/examples/apparmor/libvirt-qemu
+++ libvirt-3.5.0/examples/apparmor/libvirt-qemu
@@ -156,6 +156,9 @@
# for restore
/{usr/,}bin/bash rmix,

6
apparmor-no-mount.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-3.4.0/examples/apparmor/libvirt-lxc
Index: libvirt-3.5.0/examples/apparmor/libvirt-lxc
===================================================================
--- libvirt-3.4.0.orig/examples/apparmor/libvirt-lxc
+++ libvirt-3.4.0/examples/apparmor/libvirt-lxc
--- libvirt-3.5.0.orig/examples/apparmor/libvirt-lxc
+++ libvirt-3.5.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-3.4.0/src/qemu/qemu_driver.c
Index: libvirt-3.5.0/src/qemu/qemu_driver.c
===================================================================
--- libvirt-3.4.0.orig/src/qemu/qemu_driver.c
+++ libvirt-3.4.0/src/qemu/qemu_driver.c
@@ -16586,6 +16586,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
--- libvirt-3.5.0.orig/src/qemu/qemu_driver.c
+++ libvirt-3.5.0/src/qemu/qemu_driver.c
@@ -16789,6 +16789,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
_("non-file destination not supported yet"));
goto endjob;
}

3
libvirt-3.4.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:42186af6225904d2ada0b494fda4fa777fe5e662a9134686816e7919332c248d
size 14630904

10
libvirt-3.4.0.tar.xz.asc
View File

@ -1,10 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJZMQ/gAAoJEBVYiyZZa+pdv+sH/0K892tvUFgjvCwv1nsZih6c
u9h/4VRdCXYBD/ND3rhTitW5hWnNITxrf/Cqz5I4H5vinn9i04AqDC6Nj2WA3g3z
uRXD+X4sd4Uv5A7MI6ySVW5B7KKyWXoRq+NjRd1XPdflnqpznlDI+n32TgkFf+OG
S8vZyPv9IKUa4NW2tkr7rYNhPS8KIck4IJj0cU502yCygWDwJN1yOTHsVFZdTpEV
mx4HbQozPg/4isOqcicfdGJEy+5D4kGxzjxoiw13vMC02mjLxQqWcui1kJW3uuv1
AF4M4VERMcPDQWGN6oCw4aahg8YvLcEOSonoYSpoxdqBmhkPHQ0dZcdG9zY4zMU=
=X6h6
-----END PGP SIGNATURE-----

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2963bae30d41411a2a8184de6a69cc3bd4dba14d2824b67906263dc35b27b516
size 14695760

10
libvirt-3.5.0.tar.xz.asc Normal file
View File

@ -0,0 +1,10 @@
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJZXACWAAoJEBVYiyZZa+pdgRgIAKCnd5WOpD+lOXAUDhXnBpUp
aWUOnqEAK6CqcnbtjqKzc22a6tBurP5+0HzuHquyrJKHO9VEUCu6a/a+26OHgrhH
UFYJTxVj7EAMdR6moY9J92RXQShus7Kav49j8QtUpuZh1LjEaFkHQqKHlntqE1YT
MBPfpj/zEL4QU4aki9e03TYDP/etwADSNbFxlMUbbP6Ugt3h2KHRQZ0y12EXzD3c
ZqNx7X+YV5zhY9+f1rKU0KHEkIzdkfM94aBeV0ZmzL3wnSla/a8zfP5vTbK76Gxu
bYtt0qp5Q2hbf96DVQJOPvohjRoP2k+sZXEaNMtVK+hczhmK7+jtU6hIiSNa4Vw=
=eRgg
-----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-3.4.0/tools/libvirt-guests.init.in
Index: libvirt-3.5.0/tools/libvirt-guests.init.in
===================================================================
--- libvirt-3.4.0.orig/tools/libvirt-guests.init.in
+++ libvirt-3.4.0/tools/libvirt-guests.init.in
--- libvirt-3.5.0.orig/tools/libvirt-guests.init.in
+++ libvirt-3.5.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-3.4.0/tools/libvirt-guests.init.in
#
exec @libexecdir@/libvirt-guests.sh "$@"
Index: libvirt-3.4.0/tools/libvirt-guests.sh.in
Index: libvirt-3.5.0/tools/libvirt-guests.sh.in
===================================================================
--- libvirt-3.4.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-3.4.0/tools/libvirt-guests.sh.in
--- libvirt-3.5.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-3.5.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-3.4.0/tools/libvirt-guests.sh.in
esac
-exit $RETVAL
+rc_exit
Index: libvirt-3.4.0/tools/libvirt-guests.sysconf
Index: libvirt-3.5.0/tools/libvirt-guests.sysconf
===================================================================
--- libvirt-3.4.0.orig/tools/libvirt-guests.sysconf
+++ libvirt-3.4.0/tools/libvirt-guests.sysconf
--- libvirt-3.5.0.orig/tools/libvirt-guests.sysconf
+++ libvirt-3.5.0/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests
+

6
libvirt-power8-models.patch
View File

@ -2,10 +2,10 @@ Add POWER8 v2.0 and v2.1 to cpu map XML
From: <ro@suse.de>
Index: libvirt-3.4.0/src/cpu/cpu_map.xml
Index: libvirt-3.5.0/src/cpu/cpu_map.xml
===================================================================
--- libvirt-3.4.0.orig/src/cpu/cpu_map.xml
+++ libvirt-3.4.0/src/cpu/cpu_map.xml
--- libvirt-3.5.0.orig/src/cpu/cpu_map.xml
+++ libvirt-3.5.0/src/cpu/cpu_map.xml
@@ -1569,6 +1569,8 @@
<pvr value='0x004b0000' mask='0xffff0000'/>
<pvr value='0x004c0000' mask='0xffff0000'/>

38
libvirt-suse-netcontrol.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-3.4.0/configure.ac
Index: libvirt-3.5.0/configure.ac
===================================================================
--- libvirt-3.4.0.orig/configure.ac
+++ libvirt-3.4.0/configure.ac
--- libvirt-3.5.0.orig/configure.ac
+++ libvirt-3.5.0/configure.ac
@@ -256,6 +256,7 @@ LIBVIRT_ARG_LIBSSH
LIBVIRT_ARG_LIBXML
LIBVIRT_ARG_MACVTAP
@ -26,11 +26,11 @@ Index: libvirt-3.4.0/configure.ac
LIBVIRT_RESULT_NSS
LIBVIRT_RESULT_NUMACTL
LIBVIRT_RESULT_OPENWSMAN
Index: libvirt-3.4.0/src/Makefile.am
Index: libvirt-3.5.0/src/Makefile.am
===================================================================
--- libvirt-3.4.0.orig/src/Makefile.am
+++ libvirt-3.4.0/src/Makefile.am
@@ -1034,6 +1034,10 @@ if WITH_NETCF
--- libvirt-3.5.0.orig/src/Makefile.am
+++ libvirt-3.5.0/src/Makefile.am
@@ -1035,6 +1035,10 @@ if WITH_NETCF
INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_netcf.c
endif WITH_NETCF
@ -41,7 +41,7 @@ Index: libvirt-3.4.0/src/Makefile.am
if WITH_UDEV
INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_udev.c
@@ -1702,6 +1706,10 @@ if WITH_NETCF
@@ -1703,6 +1707,10 @@ if WITH_NETCF
libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
endif WITH_NETCF
@ -52,10 +52,10 @@ Index: libvirt-3.4.0/src/Makefile.am
if WITH_UDEV
libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS)
libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS)
Index: libvirt-3.4.0/tools/virsh.c
Index: libvirt-3.5.0/tools/virsh.c
===================================================================
--- libvirt-3.4.0.orig/tools/virsh.c
+++ libvirt-3.4.0/tools/virsh.c
--- libvirt-3.5.0.orig/tools/virsh.c
+++ libvirt-3.5.0/tools/virsh.c
@@ -570,6 +570,8 @@ virshShowVersion(vshControl *ctl ATTRIBU
vshPrint(ctl, " Interface");
# if defined(WITH_NETCF)
@ -65,10 +65,10 @@ Index: libvirt-3.4.0/tools/virsh.c
# elif defined(WITH_UDEV)
vshPrint(ctl, " udev");
# endif
Index: libvirt-3.4.0/src/interface/interface_backend_netcf.c
Index: libvirt-3.5.0/src/interface/interface_backend_netcf.c
===================================================================
--- libvirt-3.4.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-3.4.0/src/interface/interface_backend_netcf.c
--- libvirt-3.5.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-3.5.0/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@
#include <config.h>
@ -152,10 +152,10 @@ Index: libvirt-3.4.0/src/interface/interface_backend_netcf.c
if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
return -1;
if (virRegisterStateDriver(&interfaceStateDriver) < 0)
Index: libvirt-3.4.0/src/interface/interface_driver.c
Index: libvirt-3.5.0/src/interface/interface_driver.c
===================================================================
--- libvirt-3.4.0.orig/src/interface/interface_driver.c
+++ libvirt-3.4.0/src/interface/interface_driver.c
--- libvirt-3.5.0.orig/src/interface/interface_driver.c
+++ libvirt-3.5.0/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void)
if (netcfIfaceRegister() == 0)
return 0;
@ -173,10 +173,10 @@ Index: libvirt-3.4.0/src/interface/interface_driver.c
if (udevIfaceRegister() == 0)
return 0;
#endif /* WITH_UDEV */
Index: libvirt-3.4.0/m4/virt-netcontrol.m4
Index: libvirt-3.5.0/m4/virt-netcontrol.m4
===================================================================
--- /dev/null
+++ libvirt-3.4.0/m4/virt-netcontrol.m4
+++ libvirt-3.5.0/m4/virt-netcontrol.m4
@@ -0,0 +1,39 @@
+dnl The libnetcontrol library
+dnl

16
libvirt.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Wed Jul 5 18:00:31 UTC 2017 - jfehlig@suse.com
- Update to libvirt 3.5.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
5004f121-virFdStreamThread-dont-exceed-length.patch,
1a4b21f1-set-EOF-on-end-of-stream.patch
-------------------------------------------------------------------
Thu Jun 29 19:05:17 UTC 2017 - jengelh@inai.de
- Remove --with-pic which is only for static libs
- Use %_smp_mflags instead of just %jobs
-------------------------------------------------------------------
Wed Jun 7 22:07:38 UTC 2017 - jfehlig@suse.com

10
libvirt.spec
View File

@ -165,7 +165,7 @@
Name: libvirt
Url: http://libvirt.org/
Version: 3.4.0
Version: 3.5.0
Release: 0
Summary: Library providing a simple virtualization API
License: LGPL-2.1+
@ -304,8 +304,6 @@ Source3: libvirtd-relocation-server.fw
Source99: baselibs.conf
Source100: %{name}-rpmlintrc
# Upstream patches
Patch0: 5004f121-virFdStreamThread-dont-exceed-length.patch
Patch1: 1a4b21f1-set-EOF-on-end-of-stream.patch
# Patches pending upstream review
Patch100: libxl-dom-reset.patch
Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@ -872,8 +870,6 @@ libvirt plugin for NSS for translating domain names into IP addresses.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch100 -p1
%patch101 -p1
%patch150 -p1
@ -1018,7 +1014,7 @@ LOADERS="$LOADERS:/usr/share/qemu/aavmf-aarch64-code.bin:/usr/share/qemu/aavmf-a
autoreconf -f -i
export CFLAGS="%{optflags}"
%configure --disable-static --with-pic \
%configure --disable-static \
%{?arg_xen} \
%{?arg_qemu} \
%{?arg_openvz} \
@ -1082,7 +1078,7 @@ export CFLAGS="%{optflags}"
ac_cv_path_SHOWMOUNT=/usr/sbin/showmount \
ac_cv_path_PARTED=/usr/sbin/parted \
ac_cv_path_QEMU_BRIDGE_HELPER=/usr/lib/qemu-bridge-helper
make V=1 %{?jobs:-j%jobs} HTML_DIR=%{_docdir}/%{name}
make V=1 %{?_smp_mflags} HTML_DIR=%{_docdir}/%{name}
gzip -9 ChangeLog
%install

18
libvirtd-defaults.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-3.4.0/daemon/libvirtd.conf
Index: libvirt-3.5.0/daemon/libvirtd.conf
===================================================================
--- libvirt-3.4.0.orig/daemon/libvirtd.conf
+++ libvirt-3.4.0/daemon/libvirtd.conf
--- libvirt-3.5.0.orig/daemon/libvirtd.conf
+++ libvirt-3.5.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-3.4.0/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-3.4.0/daemon/libvirtd-config.c
Index: libvirt-3.5.0/daemon/libvirtd-config.c
===================================================================
--- libvirt-3.4.0.orig/daemon/libvirtd-config.c
+++ libvirt-3.4.0/daemon/libvirtd-config.c
--- libvirt-3.5.0.orig/daemon/libvirtd-config.c
+++ libvirt-3.5.0/daemon/libvirtd-config.c
@@ -110,7 +110,7 @@ daemonConfigNew(bool privileged ATTRIBUT
if (VIR_ALLOC(data) < 0)
return NULL;
@ -26,10 +26,10 @@ Index: libvirt-3.4.0/daemon/libvirtd-config.c
data->listen_tcp = 0;
if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
Index: libvirt-3.4.0/daemon/test_libvirtd.aug.in
Index: libvirt-3.5.0/daemon/test_libvirtd.aug.in
===================================================================
--- libvirt-3.4.0.orig/daemon/test_libvirtd.aug.in
+++ libvirt-3.4.0/daemon/test_libvirtd.aug.in
--- libvirt-3.5.0.orig/daemon/test_libvirtd.aug.in
+++ libvirt-3.5.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-3.4.0/daemon/libvirtd.sysconf
Index: libvirt-3.5.0/daemon/libvirtd.sysconf
===================================================================
--- libvirt-3.4.0.orig/daemon/libvirtd.sysconf
+++ libvirt-3.4.0/daemon/libvirtd.sysconf
--- libvirt-3.5.0.orig/daemon/libvirtd.sysconf
+++ libvirt-3.5.0/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt
+

6
libxl-dom-reset.patch
View File

@ -8,10 +8,10 @@ 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-3.4.0/src/libxl/libxl_driver.c
Index: libvirt-3.5.0/src/libxl/libxl_driver.c
===================================================================
--- libvirt-3.4.0.orig/src/libxl/libxl_driver.c
+++ libvirt-3.4.0/src/libxl/libxl_driver.c
--- libvirt-3.5.0.orig/src/libxl/libxl_driver.c
+++ libvirt-3.5.0/src/libxl/libxl_driver.c
@@ -1381,6 +1381,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
}

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

@ -8,10 +8,10 @@ as the default <emulator>, instead of the qemu-xen one.
See FATE#320638 for details.
Index: libvirt-3.4.0/src/libxl/libxl_capabilities.c
Index: libvirt-3.5.0/src/libxl/libxl_capabilities.c
===================================================================
--- libvirt-3.4.0.orig/src/libxl/libxl_capabilities.c
+++ libvirt-3.4.0/src/libxl/libxl_capabilities.c
--- libvirt-3.5.0.orig/src/libxl/libxl_capabilities.c
+++ libvirt-3.5.0/src/libxl/libxl_capabilities.c
@@ -38,6 +38,7 @@
#include "libxl_capabilities.h"
#include "cpu/cpu_x86.h"

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

@ -3,10 +3,10 @@ https://bugzilla.novell.com/show_bug.cgi?id=879425
src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
Index: libvirt-3.4.0/src/libxl/libxl_conf.c
Index: libvirt-3.5.0/src/libxl/libxl_conf.c
===================================================================
--- libvirt-3.4.0.orig/src/libxl/libxl_conf.c
+++ libvirt-3.4.0/src/libxl/libxl_conf.c
--- libvirt-3.5.0.orig/src/libxl/libxl_conf.c
+++ libvirt-3.5.0/src/libxl/libxl_conf.c
@@ -645,6 +645,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
#endif
}

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

@ -16,10 +16,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
tools/virsh.pod | 8 ++++++++
6 files changed, 125 insertions(+), 6 deletions(-)
Index: libvirt-3.4.0/include/libvirt/libvirt-domain.h
Index: libvirt-3.5.0/include/libvirt/libvirt-domain.h
===================================================================
--- libvirt-3.4.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-3.4.0/include/libvirt/libvirt-domain.h
--- libvirt-3.5.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-3.5.0/include/libvirt/libvirt-domain.h
@@ -1008,6 +1008,31 @@ typedef enum {
*/
# define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT "auto_converge.increment"
@ -52,10 +52,10 @@ Index: libvirt-3.4.0/include/libvirt/libvirt-domain.h
/* Domain migration. */
virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
unsigned long flags, const char *dname,
Index: libvirt-3.4.0/src/libxl/libxl_driver.c
Index: libvirt-3.5.0/src/libxl/libxl_driver.c
===================================================================
--- libvirt-3.4.0.orig/src/libxl/libxl_driver.c
+++ libvirt-3.4.0/src/libxl/libxl_driver.c
--- libvirt-3.5.0.orig/src/libxl/libxl_driver.c
+++ libvirt-3.5.0/src/libxl/libxl_driver.c
@@ -6105,6 +6105,9 @@ libxlDomainMigratePerform3Params(virDoma
const char *dname = NULL;
const char *uri = NULL;
@ -99,10 +99,10 @@ Index: libvirt-3.4.0/src/libxl/libxl_driver.c
goto cleanup;
}
Index: libvirt-3.4.0/src/libxl/libxl_migration.c
Index: libvirt-3.5.0/src/libxl/libxl_migration.c
===================================================================
--- libvirt-3.4.0.orig/src/libxl/libxl_migration.c
+++ libvirt-3.4.0/src/libxl/libxl_migration.c
--- libvirt-3.5.0.orig/src/libxl/libxl_migration.c
+++ libvirt-3.5.0/src/libxl/libxl_migration.c
@@ -359,18 +359,39 @@ libxlMigrateReceive(virNetSocketPtr sock
static int
libxlDoMigrateSend(libxlDriverPrivatePtr driver,
@ -263,10 +263,10 @@ Index: libvirt-3.4.0/src/libxl/libxl_migration.c
virObjectLock(vm);
cleanup:
Index: libvirt-3.4.0/src/libxl/libxl_migration.h
Index: libvirt-3.5.0/src/libxl/libxl_migration.h
===================================================================
--- libvirt-3.4.0.orig/src/libxl/libxl_migration.h
+++ libvirt-3.4.0/src/libxl/libxl_migration.h
--- libvirt-3.5.0.orig/src/libxl/libxl_migration.h
+++ libvirt-3.5.0/src/libxl/libxl_migration.h
@@ -39,6 +39,10 @@
VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \
VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \
@ -311,11 +311,11 @@ Index: libvirt-3.4.0/src/libxl/libxl_migration.h
virDomainPtr
libxlDomainMigrationFinish(virConnectPtr dconn,
Index: libvirt-3.4.0/tools/virsh-domain.c
Index: libvirt-3.5.0/tools/virsh-domain.c
===================================================================
--- libvirt-3.4.0.orig/tools/virsh-domain.c
+++ libvirt-3.4.0/tools/virsh-domain.c
@@ -10213,6 +10213,22 @@ static const vshCmdOptDef opts_migrate[]
--- libvirt-3.5.0.orig/tools/virsh-domain.c
+++ libvirt-3.5.0/tools/virsh-domain.c
@@ -10246,6 +10246,22 @@ static const vshCmdOptDef opts_migrate[]
.type = VSH_OT_BOOL,
.help = N_("use TLS for migration")
},
@ -338,7 +338,7 @@ Index: libvirt-3.4.0/tools/virsh-domain.c
{.name = NULL}
};
@@ -10236,6 +10252,7 @@ doMigrate(void *opaque)
@@ -10269,6 +10285,7 @@ doMigrate(void *opaque)
unsigned long long ullOpt = 0;
int rv;
virConnectPtr dconn = data->dconn;
@ -346,7 +346,7 @@ Index: libvirt-3.4.0/tools/virsh-domain.c
sigemptyset(&sigmask);
sigaddset(&sigmask, SIGINT);
@@ -10355,6 +10372,27 @@ doMigrate(void *opaque)
@@ -10388,6 +10405,27 @@ doMigrate(void *opaque)
goto save_error;
}
@ -374,11 +374,11 @@ Index: libvirt-3.4.0/tools/virsh-domain.c
if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0)
goto out;
if (opt) {
Index: libvirt-3.4.0/tools/virsh.pod
Index: libvirt-3.5.0/tools/virsh.pod
===================================================================
--- libvirt-3.4.0.orig/tools/virsh.pod
+++ libvirt-3.4.0/tools/virsh.pod
@@ -1758,6 +1758,14 @@ Providing I<--tls> causes the migration
--- libvirt-3.5.0.orig/tools/virsh.pod
+++ libvirt-3.5.0/tools/virsh.pod
@@ -1771,6 +1771,14 @@ Providing I<--tls> causes the migration
the migration of the domain. Usage requires proper TLS setup for both source
and target.

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

@ -7,10 +7,10 @@ and npiv.
For more details, see bsc#954872 and FATE#319810
Index: libvirt-3.4.0/src/libxl/libxl_conf.c
Index: libvirt-3.5.0/src/libxl/libxl_conf.c
===================================================================
--- libvirt-3.4.0.orig/src/libxl/libxl_conf.c
+++ libvirt-3.4.0/src/libxl/libxl_conf.c
--- libvirt-3.5.0.orig/src/libxl/libxl_conf.c
+++ libvirt-3.5.0/src/libxl/libxl_conf.c
@@ -645,6 +645,25 @@ libxlDiskSetDiscard(libxl_device_disk *x
#endif
}

18
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-3.4.0/src/lxc/lxc_controller.c
Index: libvirt-3.5.0/src/lxc/lxc_controller.c
===================================================================
--- libvirt-3.4.0.orig/src/lxc/lxc_controller.c
+++ libvirt-3.4.0/src/lxc/lxc_controller.c
--- libvirt-3.5.0.orig/src/lxc/lxc_controller.c
+++ libvirt-3.5.0/src/lxc/lxc_controller.c
@@ -73,6 +73,7 @@
#include "rpc/virnetdaemon.h"
#include "virstring.h"
@ -33,10 +33,10 @@ Index: libvirt-3.4.0/src/lxc/lxc_controller.c
return ret;
}
Index: libvirt-3.4.0/src/lxc/lxc_driver.c
Index: libvirt-3.5.0/src/lxc/lxc_driver.c
===================================================================
--- libvirt-3.4.0.orig/src/lxc/lxc_driver.c
+++ libvirt-3.4.0/src/lxc/lxc_driver.c
--- libvirt-3.5.0.orig/src/lxc/lxc_driver.c
+++ libvirt-3.5.0/src/lxc/lxc_driver.c
@@ -76,6 +76,7 @@
#include "virtime.h"
#include "virtypedparam.h"
@ -61,10 +61,10 @@ Index: libvirt-3.4.0/src/lxc/lxc_driver.c
break;
/* It'd be nice to support this, but with macvlan
Index: libvirt-3.4.0/src/lxc/lxc_process.c
Index: libvirt-3.5.0/src/lxc/lxc_process.c
===================================================================
--- libvirt-3.4.0.orig/src/lxc/lxc_process.c
+++ libvirt-3.4.0/src/lxc/lxc_process.c
--- libvirt-3.5.0.orig/src/lxc/lxc_process.c
+++ libvirt-3.5.0/src/lxc/lxc_process.c
@@ -52,6 +52,7 @@
#include "viratomic.h"
#include "virprocess.h"

12
network-don-t-use-dhcp-authoritative-on-static-netwo.patch
View File

@ -17,10 +17,10 @@ Signed-off-by: Martin Wilck <mwilck@suse.com>
tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 -
2 files changed, 8 insertions(+), 2 deletions(-)
Index: libvirt-3.4.0/src/network/bridge_driver.c
Index: libvirt-3.5.0/src/network/bridge_driver.c
===================================================================
--- libvirt-3.4.0.orig/src/network/bridge_driver.c
+++ libvirt-3.4.0/src/network/bridge_driver.c
--- libvirt-3.5.0.orig/src/network/bridge_driver.c
+++ libvirt-3.5.0/src/network/bridge_driver.c
@@ -1409,7 +1409,14 @@ networkDnsmasqConfContents(virNetworkObj
if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
if (ipdef->nranges || ipdef->nhosts) {
@ -37,10 +37,10 @@ Index: libvirt-3.4.0/src/network/bridge_driver.c
}
if (ipdef->tftproot) {
Index: libvirt-3.4.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
Index: libvirt-3.5.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
===================================================================
--- libvirt-3.4.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ libvirt-3.4.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
--- libvirt-3.5.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ libvirt-3.5.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
@@ -10,7 +10,6 @@ bind-dynamic
interface=virbr1
dhcp-range=192.168.122.1,static

6
ppc64le-canonical-name.patch
View File

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

14
qemu-apparmor-screenshot.patch
View File

@ -1,11 +1,11 @@
Index: libvirt-3.4.0/examples/apparmor/libvirt-qemu
Index: libvirt-3.5.0/examples/apparmor/libvirt-qemu
===================================================================
--- libvirt-3.4.0.orig/examples/apparmor/libvirt-qemu
+++ libvirt-3.4.0/examples/apparmor/libvirt-qemu
@@ -154,3 +154,6 @@
/etc/udev/udev.conf r,
/sys/bus/ r,
/sys/class/ r,
--- libvirt-3.5.0.orig/examples/apparmor/libvirt-qemu
+++ libvirt-3.5.0/examples/apparmor/libvirt-qemu
@@ -172,3 +172,6 @@
@{PROC}/device-tree/ r,
@{PROC}/device-tree/** r,
/sys/firmware/devicetree/** r,
+
+ # Temporary screendump rule -- See bsc#904426
+ /var/cache/libvirt/qemu/qemu.screendump.* rw,

12
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-3.4.0/src/xenconfig/xen_common.c
Index: libvirt-3.5.0/src/xenconfig/xen_common.c
===================================================================
--- libvirt-3.4.0.orig/src/xenconfig/xen_common.c
+++ libvirt-3.4.0/src/xenconfig/xen_common.c
--- libvirt-3.5.0.orig/src/xenconfig/xen_common.c
+++ libvirt-3.5.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-3.4.0/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-3.4.0/src/xenconfig/xen_sxpr.c
Index: libvirt-3.5.0/src/xenconfig/xen_sxpr.c
===================================================================
--- libvirt-3.4.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-3.4.0/src/xenconfig/xen_sxpr.c
--- libvirt-3.5.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-3.5.0/src/xenconfig/xen_sxpr.c
@@ -1062,6 +1062,7 @@ xenParseSxprPCI(virDomainDefPtr def,
int busID;
int slotID;

6
suse-libvirtd-service.patch
View File

@ -5,10 +5,10 @@ tools. If a user installs libvirt on their SUSE Xen host, then libvirt
should be king and override xendomains.
bsc#1015348
Index: libvirt-3.4.0/daemon/libvirtd.service.in
Index: libvirt-3.5.0/daemon/libvirtd.service.in
===================================================================
--- libvirt-3.4.0.orig/daemon/libvirtd.service.in
+++ libvirt-3.4.0/daemon/libvirtd.service.in
--- libvirt-3.5.0.orig/daemon/libvirtd.service.in
+++ libvirt-3.5.0/daemon/libvirtd.service.in
@@ -15,6 +15,7 @@ After=apparmor.service
After=local-fs.target
After=remote-fs.target

6
suse-qemu-conf.patch
View File

@ -7,10 +7,10 @@ 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-3.4.0/src/qemu/qemu.conf
Index: libvirt-3.5.0/src/qemu/qemu.conf
===================================================================
--- libvirt-3.4.0.orig/src/qemu/qemu.conf
+++ libvirt-3.4.0/src/qemu/qemu.conf
--- libvirt-3.5.0.orig/src/qemu/qemu.conf
+++ libvirt-3.5.0/src/qemu/qemu.conf
@@ -332,11 +332,20 @@
# isolation, but it cannot appear in a list of drivers.
#

6
systemd-service-xen.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-3.4.0/daemon/libvirtd.service.in
Index: libvirt-3.5.0/daemon/libvirtd.service.in
===================================================================
--- libvirt-3.4.0.orig/daemon/libvirtd.service.in
+++ libvirt-3.4.0/daemon/libvirtd.service.in
--- libvirt-3.5.0.orig/daemon/libvirtd.service.in
+++ libvirt-3.5.0/daemon/libvirtd.service.in
@@ -14,6 +14,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-3.4.0/src/locking/virtlockd.sysconf
Index: libvirt-3.5.0/src/locking/virtlockd.sysconf
===================================================================
--- libvirt-3.4.0.orig/src/locking/virtlockd.sysconf
+++ libvirt-3.4.0/src/locking/virtlockd.sysconf
--- libvirt-3.5.0.orig/src/locking/virtlockd.sysconf
+++ libvirt-3.5.0/src/locking/virtlockd.sysconf
@@ -1,3 +1,7 @@
+## Path: System/Virtualization/virtlockd
+
@ -12,10 +12,10 @@ Index: libvirt-3.4.0/src/locking/virtlockd.sysconf
#
# Pass extra arguments to virtlockd
#VIRTLOCKD_ARGS=
Index: libvirt-3.4.0/src/locking/virtlockd.init.in
Index: libvirt-3.5.0/src/locking/virtlockd.init.in
===================================================================
--- libvirt-3.4.0.orig/src/locking/virtlockd.init.in
+++ libvirt-3.4.0/src/locking/virtlockd.init.in
--- libvirt-3.5.0.orig/src/locking/virtlockd.init.in
+++ libvirt-3.5.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-3.4.0/src/logging/virtlogd.init.in
Index: libvirt-3.5.0/src/logging/virtlogd.init.in
===================================================================
--- libvirt-3.4.0.orig/src/logging/virtlogd.init.in
+++ libvirt-3.4.0/src/logging/virtlogd.init.in
--- libvirt-3.5.0.orig/src/logging/virtlogd.init.in
+++ libvirt-3.5.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-3.4.0/src/logging/virtlogd.init.in
esac
-exit $RETVAL
+rc_exit
Index: libvirt-3.4.0/src/logging/virtlogd.sysconf
Index: libvirt-3.5.0/src/logging/virtlogd.sysconf
===================================================================
--- libvirt-3.4.0.orig/src/logging/virtlogd.sysconf
+++ libvirt-3.4.0/src/logging/virtlogd.sysconf
--- libvirt-3.5.0.orig/src/logging/virtlogd.sysconf
+++ libvirt-3.5.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-3.4.0/src/xenconfig/xen_sxpr.c
Index: libvirt-3.5.0/src/xenconfig/xen_sxpr.c
===================================================================
--- libvirt-3.4.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-3.4.0/src/xenconfig/xen_sxpr.c
--- libvirt-3.5.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-3.5.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-3.4.0/src/xenconfig/xen_sxpr.c
Index: libvirt-3.5.0/src/xenconfig/xen_sxpr.c
===================================================================
--- libvirt-3.4.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-3.4.0/src/xenconfig/xen_sxpr.c
--- libvirt-3.5.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-3.5.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 */