tools/virsh.pod | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 remove-rhism.diff

src/Makefile.am | 3 0 + 3 - 0 !
src/Makefile.in | 3 0 + 3 - 0 !
2 files changed, 6 deletions(-)

 don't enable default network on boot

to not interfere with existing network configurations

daemon/libvirtd.conf | 8 4 + 4 - 0 !
1 file changed, 4 insertions(+), 4 deletions(-)

 allow libvirt group to access the socket

src/xen/xen_hypervisor.c | 2 1 + 1 - 0 !
tests/xencapsdata/xen-i686-pae-hvm.xml | 2 1 + 1 - 0 !
tests/xencapsdata/xen-ia64-be-hvm.xml | 2 1 + 1 - 0 !
tests/xencapsdata/xen-ia64-hvm.xml | 2 1 + 1 - 0 !
tests/xencapsdata/xen-x86_64-hvm.xml | 4 2 + 2 - 0 !
5 files changed, 6 insertions(+), 6 deletions(-)

 fix debian specific path to hvm loader

Closes: #517059

tools/libvirt-guests.init.sh | 41 13 + 28 - 0 !
tools/libvirt-guests.sysconf | 4 2 + 2 - 0 !
2 files changed, 15 insertions(+), 30 deletions(-)

 debianize libvirt-guests

src/nwfilter/nwfilter_ebiptables_driver.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 don't require gawk for a simple print expression

Closes: #636712
Thanks: Luca Capello

src/qemu/qemu_monitor_text.c | 10 9 + 1 - 0 !
1 file changed, 9 insertions(+), 1 deletion(-)

 patch qemumonitortextgetmigrationstatus to intercept unknown command
 'info migrate'

Debian package kvm up to version 72 has not implemented the command 'info migrate'.
This command interface returns help page of info commands and looks like this:

tools/virsh.c | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

 virsh: initialize library before calling virresetlasterror

so the error system gets intialized via virErrorInitialize.

Otherwise this results in crashes like:

 #0  0x40567537 in raise () from /lib/libc.so.6
 (gdb) bt
 #0  0x40567537 in raise () from /lib/libc.so.6
 #1  0x4056a922 in abort () from /lib/libc.so.6
 #2  0x4059dfbd in ?? () from /lib/libc.so.6
 #3  0x405a80ca in ?? () from /lib/libc.so.6
 #4  0x405a9918 in ?? () from /lib/libc.so.6
 #5  0x405aca5d in free () from /lib/libc.so.6
 #6  0x40057803 in virFree (ptrptr=0x892e048) at util/memory.c:310
 #7  0x400683cf in virResetError (err=0x892e028) at util/virterror.c:408
 #8  0x40068673 in virResetLastError () at util/virterror.c:439
 #9  0x4004bf53 in virEventRegisterDefaultImpl () at util/event.c:150
 #10 0x08066e78 in vshInit (argc=5, argv=0xbf9c2cd4) at virsh.c:12075
 #11 main (argc=5, argv=0xbf9c2cd4) at virsh.c:12751

gnulib/tests/test-nonblocking-pipe.sh | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

 disable gnulib's test-nonplocking-pipe.sh

since it fails on at least sparc and mips from time to time.

Issue reported upstresm.

tests/virnetsockettest.c | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 disable failing virnetsockettest

until we debugged the interaction with pbuilder

src/rpc/virnetserver.c | 5 2 + 3 - 0 !
1 file changed, 2 insertions(+), 3 deletions(-)

 don't fail if we can't setup avahi

src/qemu/qemu_migration.c | 11 7 + 4 - 0 !
1 file changed, 7 insertions(+), 4 deletions(-)

 only check for cluster fs if we're using a filesystem

otherwise migration fails for e.g. network filesystems like sheepdog
with:

   error: Invalid relative path 'virt-name': Invalid argument

while we should fail with:

    Migration may lead to data corruption if disks use cache != none

References:

    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676328
    https://www.redhat.com/archives/libvirt-users/2012-May/msg00088.html

src/util/util.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 reduce udevadm settle timeout to 10 seconds

This isn't a proper fix but it will make virt-manager at least start.

Closes: #663931

docs/schemas/capability.rng | 4 2 + 2 - 0 !
src/xen/xen_hypervisor.c | 6 3 + 3 - 0 !
tests/xencapsdata/xen-i686-pae-hvm.xml | 6 3 + 3 - 0 !
tests/xencapsdata/xen-i686-pae.xml | 2 1 + 1 - 0 !
tests/xencapsdata/xen-i686.xml | 2 1 + 1 - 0 !
tests/xencapsdata/xen-ia64-be-hvm.xml | 6 3 + 3 - 0 !
tests/xencapsdata/xen-ia64-be.xml | 2 1 + 1 - 0 !
tests/xencapsdata/xen-ia64-hvm.xml | 6 3 + 3 - 0 !
tests/xencapsdata/xen-ia64.xml | 2 1 + 1 - 0 !
tests/xencapsdata/xen-ppc64.xml | 2 1 + 1 - 0 !
tests/xencapsdata/xen-x86_64-hvm.xml | 10 5 + 5 - 0 !
tests/xencapsdata/xen-x86_64.xml | 2 1 + 1 - 0 !
12 files changed, 25 insertions(+), 25 deletions(-)

 allow xen toolstack to find it's binaries

Closes: #685749

src/qemu/qemu_driver.c | 8 6 + 2 - 0 !
1 file changed, 6 insertions(+), 2 deletions(-)

 cve-2014-3633: qemu: blkiotune: use correct definition when looking
 up disk

Live definition was used to look up the disk index while persistent one
was indexed leading to a crash in qemuDomainGetBlockIoTune. Use the
correct def and report a nice error.

Unfortunately it's accessible via read-only connection, though it can
only crash libvirtd in the cases where the guest is hot-plugging disks
without reflecting those changes to the persistent definition.  So
avoiding hotplug, or doing hotplug where persistent is always modified
alongside live definition, will avoid the out-of-bounds access.

Introduced in: eca96694a7f992be633d48d5ca03cedc9bbc3c9aa (v0.9.8)
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1140724
Reported-by: Luyao Huang <lhuang@redhat.com>
Signed-off-by: Peter Krempa <pkrempa@redhat.com>

(cherry picked from commit 3e745e8f775dfe6f64f18b5c2fe4791b35d3546b)

Conflicts:
	src/qemu/qemu_driver.c - context due to fewer functions

Closes: #762203

src/util/xml.c | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 lsn-2014-0003: don't expand entities when parsing xml

If the XML_PARSE_NOENT flag is passed to libxml2, then any
entities in the input document will be fully expanded. This
allows the user to read arbitrary files on the host machine
by creating an entity pointing to a local file. Removing
the XML_PARSE_NOENT flag means that any entities are left
unchanged by the parser, or expanded to "" by the XPath
APIs.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
(cherry picked from commit d6b27d3e4c40946efa79e91d134616b41b1666c4)