diff --git a/0001-Add-functions-for-handling-exponential-backoff-loops.patch b/0001-Add-functions-for-handling-exponential-backoff-loops.patch
deleted file mode 100644
index 06c09de..0000000
--- a/0001-Add-functions-for-handling-exponential-backoff-loops.patch
+++ /dev/null
@@ -1,291 +0,0 @@
-From beaa447a2982bc78adb26c183560d0ee566c1268 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Fri, 8 Apr 2016 12:11:10 +0100
-Subject: [PATCH] Add functions for handling exponential backoff loops.
-
-In a few places in libvirt we busy-wait for events, for example qemu
-creating a monitor socket. This is problematic because:
-
- - We need to choose a sufficiently small polling period so that
- libvirt doesn't add unnecessary delays.
-
- - We need to choose a sufficiently large polling period so that
- the effect of busy-waiting doesn't affect the system.
-
-The solution to this conflict is to use an exponential backoff.
-
-This patch adds two functions to hide the details, and modifies a few
-places where we currently busy-wait.
-
-Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
----
- src/fdstream.c | 10 +++---
- src/libvirt_private.syms | 2 ++
- src/qemu/qemu_agent.c | 11 ++++---
- src/qemu/qemu_monitor.c | 12 ++++---
- src/util/virtime.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++
- src/util/virtime.h | 11 +++++++
- 6 files changed, 113 insertions(+), 14 deletions(-)
-
-diff --git a/src/fdstream.c b/src/fdstream.c
-index ef118b5..a6a0fbe 100644
---- a/src/fdstream.c
-+++ b/src/fdstream.c
-@@ -42,6 +42,7 @@
- #include "virfile.h"
- #include "configmake.h"
- #include "virstring.h"
-+#include "virtime.h"
-
- #define VIR_FROM_THIS VIR_FROM_STREAMS
-
-@@ -520,8 +521,7 @@ int virFDStreamConnectUNIX(virStreamPtr st,
- bool abstract)
- {
- struct sockaddr_un sa;
-- size_t i = 0;
-- int timeout = 3;
-+ virTimeBackOffVar timeout;
- int ret;
-
- int fd = socket(AF_UNIX, SOCK_STREAM, 0);
-@@ -541,7 +541,9 @@ int virFDStreamConnectUNIX(virStreamPtr st,
- goto error;
- }
-
-- do {
-+ if (virTimeBackOffStart(&timeout, 1, 3*1000 /* ms */) < 0)
-+ goto error;
-+ while (virTimeBackOffWait(&timeout)) {
- ret = connect(fd, (struct sockaddr *)&sa, sizeof(sa));
- if (ret == 0)
- break;
-@@ -553,7 +555,7 @@ int virFDStreamConnectUNIX(virStreamPtr st,
- }
-
- goto error;
-- } while ((++i <= timeout*5) && (usleep(.2 * 1000000) <= 0));
-+ }
-
- if (virFDStreamOpenInternal(st, fd, NULL, -1, 0) < 0)
- goto error;
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index b626fd2..61fc500 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -2373,6 +2373,8 @@ virThreadPoolSendJob;
-
-
- # util/virtime.h
-+virTimeBackOffStart;
-+virTimeBackOffWait;
- virTimeFieldsNow;
- virTimeFieldsNowRaw;
- virTimeFieldsThen;
-diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
-index 559d79f..0610f75 100644
---- a/src/qemu/qemu_agent.c
-+++ b/src/qemu/qemu_agent.c
-@@ -173,9 +173,8 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress)
- {
- struct sockaddr_un addr;
- int monfd;
-- int timeout = 3; /* In seconds */
-- int ret;
-- size_t i = 0;
-+ virTimeBackOffVar timeout;
-+ int ret = -1;
-
- *inProgress = false;
-
-@@ -207,7 +206,9 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress)
- goto error;
- }
-
-- do {
-+ if (virTimeBackOffStart(&timeout, 1, 3*1000 /* ms */) < 0)
-+ goto error;
-+ while (virTimeBackOffWait(&timeout)) {
- ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr));
-
- if (ret == 0)
-@@ -232,7 +233,7 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress)
- _("failed to connect to monitor socket"));
- goto error;
-
-- } while ((++i <= timeout*5) && (usleep(.2 * 1000000) <= 0));
-+ }
-
- if (ret != 0) {
- virReportSystemError(errno, "%s",
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index 83551a8..2847cef 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -42,6 +42,7 @@
- #include "virobject.h"
- #include "virprobe.h"
- #include "virstring.h"
-+#include "virtime.h"
-
- #ifdef WITH_DTRACE_PROBES
- # include "libvirt_qemu_probes.h"
-@@ -327,9 +328,8 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid)
- {
- struct sockaddr_un addr;
- int monfd;
-- int timeout = 30; /* In seconds */
-- int ret;
-- size_t i = 0;
-+ virTimeBackOffVar timeout;
-+ int ret = -1;
-
- if ((monfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
- virReportSystemError(errno,
-@@ -345,7 +345,9 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid)
- goto error;
- }
-
-- do {
-+ if (virTimeBackOffStart(&timeout, 1, 30*1000 /* ms */) < 0)
-+ goto error;
-+ while (virTimeBackOffWait(&timeout)) {
- ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr));
-
- if (ret == 0)
-@@ -362,7 +364,7 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid)
- _("failed to connect to monitor socket"));
- goto error;
-
-- } while ((++i <= timeout*5) && (usleep(.2 * 1000000) <= 0));
-+ }
-
- if (ret != 0) {
- virReportSystemError(errno, "%s",
-diff --git a/src/util/virtime.c b/src/util/virtime.c
-index 9d365d5..aac9691 100644
---- a/src/util/virtime.c
-+++ b/src/util/virtime.c
-@@ -34,14 +34,18 @@
- #include <config.h>
-
- #include <stdio.h>
-+#include <unistd.h>
- #include <sys/time.h>
-
- #include "virtime.h"
- #include "viralloc.h"
- #include "virerror.h"
-+#include "virlog.h"
-
- #define VIR_FROM_THIS VIR_FROM_NONE
-
-+VIR_LOG_INIT("util.time");
-+
- /* We prefer clock_gettime if available because that is officially
- * async signal safe according to POSIX. Many platforms lack it
- * though, so fallback to gettimeofday everywhere else
-@@ -363,3 +367,80 @@ virTimeLocalOffsetFromUTC(long *offset)
- *offset = current - utc;
- return 0;
- }
-+
-+/**
-+ * virTimeBackOffStart:
-+ * @var: Timeout variable (with type virTimeBackOffVar).
-+ * @first: Initial time to wait (milliseconds).
-+ * @timeout: Timeout (milliseconds).
-+ *
-+ * Initialize the timeout variable @var and start the timer running.
-+ *
-+ * Returns 0 on success, -1 on error and raises a libvirt error.
-+ */
-+int
-+virTimeBackOffStart(virTimeBackOffVar *var,
-+ unsigned long long first, unsigned long long timeout)
-+{
-+ if (virTimeMillisNow(&var->start_t) < 0)
-+ return -1;
-+
-+ var->next = first;
-+ var->limit_t = var->start_t + timeout;
-+ return 0;
-+}
-+
-+/**
-+ * virTimeBackOffWait
-+ * @var: Timeout variable (with type virTimeBackOffVar *).
-+ *
-+ * You must initialize @var first by calling the following function,
-+ * which also starts the timer:
-+ *
-+ * if (virTimeBackOffStart(&var, first, timeout) < 0) {
-+ * // handle errors
-+ * }
-+ *
-+ * Then you use a while loop:
-+ *
-+ * while (virTimeBackOffWait(&var)) {
-+ * //...
-+ * }
-+ *
-+ * The while loop that runs the body of the code repeatedly, with an
-+ * exponential backoff. It first waits for first milliseconds, then
-+ * runs the body, then waits for 2*first ms, then runs the body again.
-+ * Then 4*first ms, and so on.
-+ *
-+ * When timeout milliseconds is reached, the while loop ends.
-+ *
-+ * The body should use "break" or "goto" when whatever condition it is
-+ * testing for succeeds (or there is an unrecoverable error).
-+ */
-+bool
-+virTimeBackOffWait(virTimeBackOffVar *var)
-+{
-+ unsigned long long t, next;
-+
-+ ignore_value(virTimeMillisNowRaw(&t));
-+
-+ VIR_DEBUG("t=%llu, limit=%llu", t, var->limit_t);
-+
-+ if (t > var->limit_t)
-+ return 0; /* ends the while loop */
-+
-+ next = var->next;
-+ var->next *= 2;
-+
-+ /* If sleeping would take us beyond the limit, then shorten the
-+ * sleep. This is so we always run the body just before the final
-+ * timeout.
-+ */
-+ if (t + next > var->limit_t)
-+ next = var->limit_t - t;
-+
-+ VIR_DEBUG("sleeping for %llu ms", next);
-+
-+ usleep(next * 1000);
-+ return 1;
-+}
-diff --git a/src/util/virtime.h b/src/util/virtime.h
-index 8ebad38..fbcd3ba 100644
---- a/src/util/virtime.h
-+++ b/src/util/virtime.h
-@@ -64,4 +64,15 @@ char *virTimeStringThen(unsigned long long when);
- int virTimeLocalOffsetFromUTC(long *offset)
- ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
-
-+typedef struct {
-+ unsigned long long start_t;
-+ unsigned long long next;
-+ unsigned long long limit_t;
-+} virTimeBackOffVar;
-+
-+int virTimeBackOffStart(virTimeBackOffVar *var,
-+ unsigned long long first, unsigned long long timeout);
-+
-+bool virTimeBackOffWait(virTimeBackOffVar *var);
-+
- #endif
---
-2.7.4
-
diff --git a/0001-qemu-support-virt-2.6-machine-type-on-arm.patch b/0001-qemu-support-virt-2.6-machine-type-on-arm.patch
deleted file mode 100644
index 0f03bef..0000000
--- a/0001-qemu-support-virt-2.6-machine-type-on-arm.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Fri, 8 Apr 2016 10:46:41 +0200
-Subject: [PATCH] qemu: support virt-2.6 machine type on arm
-
-Some places already check for "virt-" prefix as well as plain "virt".
-virQEMUCapsHasPCIMultiBus did not, resulting in multiple PCI devices
-having assigned the same unnumbered "pci" alias.
-
-Add a test for the "virt-2.6" machine type which also omits the
-<model type='virtio'/> in <interface>, to check if
-qemuDomainDefaultNetModel works too.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1325085
-(cherry picked from commit f06ca25d235433f9139cbfb3d5d9eae7409156b9)
----
- src/qemu/qemu_capabilities.c | 3 +-
- src/qemu/qemu_domain.c | 3 +-
- ...l2argv-aarch64-virt-2.6-virtio-pci-default.args | 37 +++++++++++++++++
- ...ml2argv-aarch64-virt-2.6-virtio-pci-default.xml | 47 ++++++++++++++++++++++
- tests/qemuxml2argvtest.c | 6 +++
- 5 files changed, 94 insertions(+), 2 deletions(-)
- create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args
- create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 2823843..57e2056 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -2172,7 +2172,8 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
- /* If 'virt' supports PCI, it supports multibus.
- * No extra conditions here for simplicity.
- */
-- if (STREQ(def->os.machine, "virt"))
-+ if (STREQ(def->os.machine, "virt") ||
-+ STRPREFIX(def->os.machine, "virt-"))
- return true;
- }
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index f38b0f3..d9d5041 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -1479,7 +1479,8 @@ qemuDomainDefaultNetModel(const virDomainDef *def,
- if (STREQ(def->os.machine, "versatilepb"))
- return "smc91c111";
-
-- if (STREQ(def->os.machine, "virt"))
-+ if (STREQ(def->os.machine, "virt") ||
-+ STRPREFIX(def->os.machine, "virt-"))
- return "virtio";
-
- /* Incomplete. vexpress (and a few others) use this, but not all
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args
-new file mode 100644
-index 0000000..93c181d
---- /dev/null
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args
-@@ -0,0 +1,37 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-aarch64 \
-+-name aarch64test \
-+-S \
-+-M virt-2.6 \
-+-cpu cortex-a53 \
-+-m 1024 \
-+-smp 1 \
-+-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-+-nographic \
-+-nodefconfig \
-+-nodefaults \
-+-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-+-boot c \
-+-kernel /aarch64.kernel \
-+-initrd /aarch64.initrd \
-+-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
-+-dtb /aarch64.dtb \
-+-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \
-+-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \
-+-device virtio-serial-device,id=virtio-serial0 \
-+-usb \
-+-drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
-+-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
-+-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \
-+-net user,vlan=0,name=hostnet0 \
-+-serial pty \
-+-chardev pty,id=charconsole1 \
-+-device virtconsole,chardev=charconsole1,id=console1 \
-+-device virtio-balloon-device,id=balloon0 \
-+-object rng-random,id=objrng0,filename=/dev/random \
-+-device virtio-rng-device,rng=objrng0,id=rng0
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml
-new file mode 100644
-index 0000000..e745101
---- /dev/null
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml
-@@ -0,0 +1,47 @@
-+<domain type="qemu">
-+ <name>aarch64test</name>
-+ <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
-+ <memory>1048576</memory>
-+ <currentMemory>1048576</currentMemory>
-+ <vcpu placement='static'>1</vcpu>
-+ <os>
-+ <type arch="aarch64" machine="virt-2.6">hvm</type>
-+ <kernel>/aarch64.kernel</kernel>
-+ <initrd>/aarch64.initrd</initrd>
-+ <dtb>/aarch64.dtb</dtb>
-+ <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline>
-+ </os>
-+ <features>
-+ <acpi/>
-+ <apic/>
-+ <pae/>
-+ </features>
-+ <cpu match='exact'>
-+ <model>cortex-a53</model>
-+ </cpu>
-+ <clock offset="utc"/>
-+ <on_poweroff>destroy</on_poweroff>
-+ <on_reboot>restart</on_reboot>
-+ <on_crash>restart</on_crash>
-+ <devices>
-+ <emulator>/usr/bin/qemu-system-aarch64</emulator>
-+ <disk type='file' device='disk'>
-+ <source file='/aarch64.raw'/>
-+ <target dev='vda' bus='virtio'/>
-+ </disk>
-+ <interface type='user'>
-+ <mac address='52:54:00:09:a4:37'/>
-+ </interface>
-+ <console type='pty'/>
-+ <console type='pty'>
-+ <target type='virtio' port='0'/>
-+ </console>
-+ <memballoon model='virtio'/>
-+ <!--
-+ This actually doesn't work in practice because vexpress only has
-+ 4 virtio slots available, rng makes 5 -->
-+ <rng model='virtio'>
-+ <backend model='random'>/dev/random</backend>
-+ </rng>
-+ </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index e9b8d64..d1b9e98 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1661,6 +1661,12 @@ mymain(void)
- QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
- QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE);
-+ DO_TEST("aarch64-virt-2.6-virtio-pci-default",
-+ QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
-+ QEMU_CAPS_DEVICE_VIRTIO_MMIO,
-+ QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
-+ QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
-+ QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE);
- /* Example of using virtio-pci with no explicit PCI controller
- but with manual PCI addresses */
- DO_TEST("aarch64-virtio-pci-manual-addresses",
diff --git a/0002-build-cleanup-GCC-4.6-Wlogical-op-workaround.patch b/0002-build-cleanup-GCC-4.6-Wlogical-op-workaround.patch
deleted file mode 100644
index 406f192..0000000
--- a/0002-build-cleanup-GCC-4.6-Wlogical-op-workaround.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Sun, 10 Apr 2016 18:21:13 +0200
-Subject: [PATCH] build: cleanup GCC < 4.6 -Wlogical-op workaround
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 7fb81831fc497aa4a34fdfc036be9c9ae4401084)
----
- m4/virt-compile-warnings.m4 | 2 +-
- src/internal.h | 10 ++++++++++
- src/util/virbuffer.c | 11 +++--------
- src/util/virstring.c | 9 +--------
- src/util/virsysinfo.c | 13 ++-----------
- 5 files changed, 17 insertions(+), 28 deletions(-)
-
-diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4
-index 3dd0665..1b0a2cf 100644
---- a/m4/virt-compile-warnings.m4
-+++ b/m4/virt-compile-warnings.m4
-@@ -236,7 +236,7 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
-
- if test "$gl_cv_warn_c__Wlogical_op" = yes &&
- test "$lv_cv_gcc_wlogical_op_broken" = yes; then
-- AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP], 1,
-+ AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP_STRCHR], 1,
- [Define to 1 if gcc -Wlogical-op reports false positives on strchr])
- fi
- ])
-diff --git a/src/internal.h b/src/internal.h
-index db26fb0..35cc6d4 100644
---- a/src/internal.h
-+++ b/src/internal.h
-@@ -253,6 +253,16 @@
- # define VIR_WARNINGS_RESET
- # endif
-
-+/* Workaround bogus GCC < 4.6 that produces false -Wlogical-op warnings for
-+ * strchr(). Those old GCCs don't support push/pop. */
-+# if BROKEN_GCC_WLOGICALOP_STRCHR
-+# define VIR_WARNINGS_NO_WLOGICALOP_STRCHR \
-+ _Pragma ("GCC diagnostic ignored \"-Wlogical-op\"")
-+# else
-+# define VIR_WARNINGS_NO_WLOGICALOP_STRCHR
-+# endif
-+
-+
- /*
- * Use this when passing possibly-NULL strings to printf-a-likes.
- */
-diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c
-index 43cd1a7..d582e7d 100644
---- a/src/util/virbuffer.c
-+++ b/src/util/virbuffer.c
-@@ -417,14 +417,9 @@ virBufferVasprintf(virBufferPtr buf, const char *format, va_list argptr)
- buf->use += count;
- }
-
--/* Work around spurious strchr() diagnostics given by -Wlogical-op
-- * for gcc < 4.6. Doing it via a local pragma keeps the damage
-- * smaller than disabling it on the package level. Unfortunately, the
-- * affected GCCs don't allow diagnostic push/pop which would have
-- * further reduced the impact. */
--#if BROKEN_GCC_WLOGICALOP
--# pragma GCC diagnostic ignored "-Wlogical-op"
--#endif
-+
-+VIR_WARNINGS_NO_WLOGICALOP_STRCHR
-+
-
- /**
- * virBufferEscapeString:
-diff --git a/src/util/virstring.c b/src/util/virstring.c
-index 7ec42aa..2d7fbf3 100644
---- a/src/util/virstring.c
-+++ b/src/util/virstring.c
-@@ -989,14 +989,7 @@ virStringHasControlChars(const char *str)
- }
-
-
--/* Work around spurious strchr() diagnostics given by -Wlogical-op
-- * for gcc < 4.6. Doing it via a local pragma keeps the damage
-- * smaller than disabling it on the package level. Unfortunately, the
-- * affected GCCs don't allow diagnostic push/pop which would have
-- * further reduced the impact. */
--#if BROKEN_GCC_WLOGICALOP
--# pragma GCC diagnostic ignored "-Wlogical-op"
--#endif
-+VIR_WARNINGS_NO_WLOGICALOP_STRCHR
-
-
- /**
-diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
-index 05d33a8..e8dbd4d 100644
---- a/src/util/virsysinfo.c
-+++ b/src/util/virsysinfo.c
-@@ -428,17 +428,8 @@ virSysinfoRead(void)
-
-
- #elif defined(__s390__) || defined(__s390x__)
--/*
-- we need to ignore warnings about strchr caused by -Wlogical-op
-- for some GCC versions.
-- Doing it via a local pragma keeps the damage smaller than
-- disabling it on the package level.
-- Unfortunately, the affected GCCs don't allow diagnostic push/pop
-- which would have further reduced the impact.
-- */
--# if BROKEN_GCC_WLOGICALOP
--# pragma GCC diagnostic ignored "-Wlogical-op"
--# endif
-+
-+VIR_WARNINGS_NO_WLOGICALOP_STRCHR
-
- static char *
- virSysinfoParseDelimited(const char *base, const char *name, char **value,
diff --git a/0003-build-add-GCC-6.0-Wlogical-op-workaround.patch b/0003-build-add-GCC-6.0-Wlogical-op-workaround.patch
deleted file mode 100644
index d944d82..0000000
--- a/0003-build-add-GCC-6.0-Wlogical-op-workaround.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Sun, 10 Apr 2016 18:22:20 +0200
-Subject: [PATCH] build: add GCC 6.0 -Wlogical-op workaround
-
-fdstream.c: In function 'virFDStreamWrite':
-fdstream.c:390:29: error: logical 'or' of equal expressions [-Werror=logical-op]
- if (errno == EAGAIN || errno == EWOULDBLOCK) {
- ^~
-
-Fedora rawhide now uses gcc 6.0 and there is a bug with -Wlogical-op
-producing false warnings.
-
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602
-
-Use GCC pragma push/pop and ignore -Wlogical-op for GCC that supports
-push/pop pragma and also has this bug.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit d713a6b120904c488170e7920c482b2fade70ae1)
----
- m4/virt-compile-warnings.m4 | 20 ++++++++++++++++++++
- src/fdstream.c | 4 ++++
- src/internal.h | 12 ++++++++++++
- src/rpc/virnetsshsession.c | 6 ++++++
- src/security/security_selinux.c | 2 ++
- 5 files changed, 44 insertions(+)
-
-diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4
-index 1b0a2cf..eb689e2 100644
---- a/m4/virt-compile-warnings.m4
-+++ b/m4/virt-compile-warnings.m4
-@@ -117,6 +117,20 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
- [lv_cv_gcc_wlogical_op_broken=yes])
- CFLAGS="$save_CFLAGS"])
-
-+ AC_CACHE_CHECK([whether gcc gives bogus warnings for -Wlogical-op],
-+ [lv_cv_gcc_wlogical_op_equal_expr_broken], [
-+ save_CFLAGS="$CFLAGS"
-+ CFLAGS="-O2 -Wlogical-op -Werror"
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+ #define TEST1 1
-+ #define TEST2 TEST1
-+ ]], [[
-+ int test = 0;
-+ return test == TEST1 || test == TEST2;]])],
-+ [lv_cv_gcc_wlogical_op_equal_expr_broken=no],
-+ [lv_cv_gcc_wlogical_op_equal_expr_broken=yes])
-+ CFLAGS="$save_CFLAGS"])
-+
- # We might fundamentally need some of these disabled forever, but
- # ideally we'd turn many of them on
- dontwarn="$dontwarn -Wfloat-equal"
-@@ -239,4 +253,10 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
- AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP_STRCHR], 1,
- [Define to 1 if gcc -Wlogical-op reports false positives on strchr])
- fi
-+
-+ if test "$gl_cv_warn_c__Wlogical_op" = yes &&
-+ test "$lv_cv_gcc_wlogical_op_equal_expr_broken" = yes; then
-+ AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP_EQUAL_EXPR], 1,
-+ [Define to 1 if gcc -Wlogical-op reports false positive 'or' equal expr])
-+ fi
- ])
-diff --git a/src/fdstream.c b/src/fdstream.c
-index a85cf9d..ef118b5 100644
---- a/src/fdstream.c
-+++ b/src/fdstream.c
-@@ -387,7 +387,9 @@ static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes)
- retry:
- ret = write(fdst->fd, bytes, nbytes);
- if (ret < 0) {
-+ VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
- if (errno == EAGAIN || errno == EWOULDBLOCK) {
-+ VIR_WARNINGS_RESET
- ret = -2;
- } else if (errno == EINTR) {
- goto retry;
-@@ -437,7 +439,9 @@ static int virFDStreamRead(virStreamPtr st, char *bytes, size_t nbytes)
- retry:
- ret = read(fdst->fd, bytes, nbytes);
- if (ret < 0) {
-+ VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
- if (errno == EAGAIN || errno == EWOULDBLOCK) {
-+ VIR_WARNINGS_RESET
- ret = -2;
- } else if (errno == EINTR) {
- goto retry;
-diff --git a/src/internal.h b/src/internal.h
-index 35cc6d4..926e990 100644
---- a/src/internal.h
-+++ b/src/internal.h
-@@ -245,11 +245,23 @@
- _Pragma ("GCC diagnostic push")
- # endif
-
-+/* Workaround bogus GCC 6.0 for logical 'or' equal expression warnings.
-+ * (GCC bz 69602) */
-+# if BROKEN_GCC_WLOGICALOP_EQUAL_EXPR
-+# define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR \
-+ _Pragma ("GCC diagnostic push") \
-+ _Pragma ("GCC diagnostic ignored \"-Wlogical-op\"")
-+# else
-+# define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR \
-+ _Pragma ("GCC diagnostic push")
-+# endif
-+
- # define VIR_WARNINGS_RESET \
- _Pragma ("GCC diagnostic pop")
- # else
- # define VIR_WARNINGS_NO_CAST_ALIGN
- # define VIR_WARNINGS_NO_PRINTF
-+# define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
- # define VIR_WARNINGS_RESET
- # endif
-
-diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
-index 406a831..e742175 100644
---- a/src/rpc/virnetsshsession.c
-+++ b/src/rpc/virnetsshsession.c
-@@ -545,9 +545,11 @@ virNetSSHAuthenticateAgent(virNetSSHSessionPtr sess,
- agent_identity)))
- return 0; /* key accepted */
-
-+ VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
- if (ret != LIBSSH2_ERROR_AUTHENTICATION_FAILED &&
- ret != LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED &&
- ret != LIBSSH2_ERROR_PUBLICKEY_UNVERIFIED) {
-+ VIR_WARNINGS_RESET
- libssh2_session_last_error(sess->session, &errmsg, NULL, 0);
- virReportError(VIR_ERR_AUTH_FAILED,
- _("failed to authenticate using SSH agent: %s"),
-@@ -605,9 +607,11 @@ virNetSSHAuthenticatePrivkey(virNetSSHSessionPtr sess,
- priv->password)) == 0)
- return 0; /* success */
-
-+ VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
- if (priv->password ||
- ret == LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED ||
- ret == LIBSSH2_ERROR_AUTHENTICATION_FAILED) {
-+ VIR_WARNINGS_RESET
- libssh2_session_last_error(sess->session, &errmsg, NULL, 0);
- virReportError(VIR_ERR_AUTH_FAILED,
- _("authentication with private key '%s' "
-@@ -673,11 +677,13 @@ virNetSSHAuthenticatePrivkey(virNetSSHSessionPtr sess,
- "has failed: %s"),
- priv->filename, errmsg);
-
-+ VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
- if (ret == LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED ||
- ret == LIBSSH2_ERROR_AUTHENTICATION_FAILED)
- return 1;
- else
- return -1;
-+ VIR_WARNINGS_RESET
- }
-
- return 0;
-diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index 26d95d1..04760a1 100644
---- a/src/security/security_selinux.c
-+++ b/src/security/security_selinux.c
-@@ -911,8 +911,10 @@ virSecuritySELinuxSetFileconHelper(const char *path, char *tcon,
- * hopefully sets one of the necessary SELinux virt_use_{nfs,usb,pci}
- * boolean tunables to allow it ...
- */
-+ VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
- if (setfilecon_errno != EOPNOTSUPP && setfilecon_errno != ENOTSUP &&
- setfilecon_errno != EROFS) {
-+ VIR_WARNINGS_RESET
- virReportSystemError(setfilecon_errno,
- _("unable to set security context '%s' on '%s'"),
- tcon, path);
diff --git a/libvirt.spec b/libvirt.spec
index 11446a3..3674343 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -13,7 +13,6 @@
# Default to skipping autoreconf. Distros can change just this one line
# (or provide a command-line override) if they backport any patches that
# touch configure.ac or Makefile.am.
-%global enable_autotools 1
%{!?enable_autotools:%global enable_autotools 0}
# A client only build will create a libvirt.so only containing
@@ -79,6 +78,9 @@
%if 0%{?rhel}
%define with_qemu_tcg 0
%define qemu_kvm_arches x86_64
+ %if 0%{?rhel} >= 7
+ %define qemu_kvm_arches x86_64 %{power64}
+ %endif
%endif
%ifarch %{qemu_kvm_arches}
@@ -379,8 +381,8 @@
Summary: Library providing a simple virtualization API
Name: libvirt
-Version: 1.3.3
-Release: 3%{?dist}%{?extra_release}
+Version: 1.3.4
+Release: 1%{?dist}%{?extra_release}
License: LGPLv2+
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -391,17 +393,6 @@ URL: http://libvirt.org/
%endif
Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz
-# libvirt assigns same address to two PCI devices (bz #1325085)
-Patch0001: 0001-qemu-support-virt-2.6-machine-type-on-arm.patch
-# Fix build with -Werror
-Patch0002: 0002-build-cleanup-GCC-4.6-Wlogical-op-workaround.patch
-Patch0003: 0003-build-add-GCC-6.0-Wlogical-op-workaround.patch
-
-# Fix 200ms performance problem when waiting for monitor socket of
-# new domains.
-# Upstream commit beaa447a2982bc78adb26c183560d0ee566c1268.
-Patch0004: 0001-Add-functions-for-handling-exponential-backoff-loops.patch
-
%if %{with_libvirtd}
Requires: libvirt-daemon = %{version}-%{release}
%if %{with_network}
@@ -1206,7 +1197,6 @@ namespaces.
Summary: Libraries, includes, etc. to compile with the libvirt library
Group: Development/Libraries
Requires: %{name}-client = %{version}-%{release}
-Requires: %{name}-docs = %{version}-%{release}
Requires: pkgconfig
%description devel
@@ -1719,7 +1709,7 @@ exit 0
%if %{with_systemd}
%if %{with_systemd_macros}
- %systemd_post virtlockd.socket virtlogd.socket libvirtd.service libvirtd.socket
+ %systemd_post virtlockd.socket virtlogd.socket libvirtd.service
%else
if [ $1 -eq 1 ] ; then
# Initial installation
@@ -1748,19 +1738,17 @@ fi
%preun daemon
%if %{with_systemd}
%if %{with_systemd_macros}
- %systemd_preun libvirtd.socket libvirtd.service virtlogd.socket virtlogd.service virtlockd.socket virtlockd.service
+ %systemd_preun libvirtd.service virtlogd.socket virtlogd.service virtlockd.socket virtlockd.service
%else
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/bin/systemctl --no-reload disable \
- libvirtd.socket \
libvirtd.service \
virtlogd.socket \
virtlogd.service \
virtlockd.socket \
virtlockd.service > /dev/null 2>&1 || :
/bin/systemctl stop \
- libvirtd.socket \
libvirtd.service \
virtlogd.socket \
virtlogd.service \
@@ -1861,6 +1849,14 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ;
< %{_datadir}/libvirt/networks/default.xml \
> %{_sysconfdir}/libvirt/qemu/networks/default.xml
ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
+
+ # Make sure libvirt picks up the new network defininiton
+ %if %{with_systemd}
+ /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 ||:
+ %else
+ /sbin/service libvirtd condrestart > /dev/null 2>&1 || :
+ %endif
+
fi
%endif
@@ -1958,7 +1954,9 @@ exit 0
%files docs
%defattr(-, root, root)
-%doc AUTHORS ChangeLog.gz NEWS README TODO libvirt-docs/*
+%doc AUTHORS ChangeLog.gz NEWS README TODO
+%doc libvirt-docs/*
+%doc docs/*.html docs/html docs/*.gif
# API docs
%dir %{_datadir}/gtk-doc/html/libvirt/
@@ -1966,6 +1964,16 @@ exit 0
%doc %{_datadir}/gtk-doc/html/libvirt/*.html
%doc %{_datadir}/gtk-doc/html/libvirt/*.png
%doc %{_datadir}/gtk-doc/html/libvirt/*.css
+%doc examples/hellolibvirt
+%doc examples/object-events
+%doc examples/dominfo
+%doc examples/domsuspend
+%doc examples/dommigrate
+%doc examples/openauth
+%doc examples/xml
+%doc examples/rename
+%doc examples/systemtap
+
%if %{with_libvirtd}
%files daemon
@@ -1975,7 +1983,6 @@ exit 0
%if %{with_systemd}
%{_unitdir}/libvirtd.service
-%{_unitdir}/libvirtd.socket
%{_unitdir}/virtlogd.service
%{_unitdir}/virtlogd.socket
%{_unitdir}/virtlockd.service
@@ -2395,21 +2402,14 @@ exit 0
%{_datadir}/libvirt/api/libvirt-api.xml
%{_datadir}/libvirt/api/libvirt-qemu-api.xml
%{_datadir}/libvirt/api/libvirt-lxc-api.xml
-
-
-%doc docs/*.html docs/html docs/*.gif
+# Needed building python bindings
%doc docs/libvirt-api.xml
-%doc examples/hellolibvirt
-%doc examples/object-events
-%doc examples/dominfo
-%doc examples/domsuspend
-%doc examples/dommigrate
-%doc examples/openauth
-%doc examples/xml
-%doc examples/rename
-%doc examples/systemtap
+
%changelog
+* Mon May 02 2016 Cole Robinson <crobinso@redhat.com> - 1.3.4-1
+- Rebased to version 1.3.4
+
* Tue Apr 19 2016 Cole Robinson <crobinso@redhat.com> - 1.3.3-3
- Fix 200ms performance problem when waiting for monitor socket of new domains.
diff --git a/sources b/sources
index dedfac4..bd7a41a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-698e0949a41a2b669dbe374759aaa64b libvirt-1.3.3.tar.gz
+f7c35c90c0a4fd215be2a27aab3580dc libvirt-1.3.4.tar.gz