diff --git a/0001-conf-reduce-indentation-in-virDomainDefAddImplicitVi.patch b/0001-conf-reduce-indentation-in-virDomainDefAddImplicitVi.patch
deleted file mode 100644
index c1f5f51..0000000
--- a/0001-conf-reduce-indentation-in-virDomainDefAddImplicitVi.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Mon, 11 Apr 2016 15:26:06 +0200
-Subject: [PATCH] conf: reduce indentation in virDomainDefAddImplicitVideo
-
-Return early if there is nothing to do.
-
-(cherry picked from commit 1485be178461b6e9504d21216b7ef480f4980ffa)
----
- src/conf/domain_conf.c | 31 ++++++++++++++++---------------
- 1 file changed, 16 insertions(+), 15 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index cc99301..7c8fa4e 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -18572,22 +18572,23 @@ virDomainDefAddImplicitVideo(virDomainDefPtr def)
- 
-     /* For backwards compatibility, if no <video> tag is set but there
-      * is a <graphics> tag, then we add a single video tag */
--    if (def->ngraphics && !def->nvideos) {
--        if (VIR_ALLOC(video) < 0)
--            goto cleanup;
--        video->type = virDomainVideoDefaultType(def);
--        if (video->type < 0) {
--            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
--                           _("cannot determine default video type"));
--            goto cleanup;
--        }
--        video->vram = virDomainVideoDefaultRAM(def, video->type);
--        video->heads = 1;
--        if (VIR_ALLOC_N(def->videos, 1) < 0)
--            goto cleanup;
--        def->videos[def->nvideos++] = video;
--        video = NULL;
-+    if (def->ngraphics == 0 || def->nvideos > 0)
-+        return 0;
-+
-+    if (VIR_ALLOC(video) < 0)
-+        goto cleanup;
-+    video->type = virDomainVideoDefaultType(def);
-+    if (video->type < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("cannot determine default video type"));
-+        goto cleanup;
-     }
-+    video->vram = virDomainVideoDefaultRAM(def, video->type);
-+    video->heads = 1;
-+    if (VIR_ALLOC_N(def->videos, 1) < 0)
-+        goto cleanup;
-+    def->videos[def->nvideos++] = video;
-+    video = NULL;
- 
-     ret = 0;
-  cleanup:
diff --git a/0002-conf-use-VIR_APPEND_ELEMENT-in-virDomainDefAddImplic.patch b/0002-conf-use-VIR_APPEND_ELEMENT-in-virDomainDefAddImplic.patch
deleted file mode 100644
index 21af9d4..0000000
--- a/0002-conf-use-VIR_APPEND_ELEMENT-in-virDomainDefAddImplic.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Mon, 11 Apr 2016 15:28:29 +0200
-Subject: [PATCH] conf: use VIR_APPEND_ELEMENT in virDomainDefAddImplicitVideo
-
-(cherry picked from commit 1278688921b5721b6b9af63899fad0310f63b979)
----
- src/conf/domain_conf.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 7c8fa4e..7497f20 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -18585,10 +18585,8 @@ virDomainDefAddImplicitVideo(virDomainDefPtr def)
-     }
-     video->vram = virDomainVideoDefaultRAM(def, video->type);
-     video->heads = 1;
--    if (VIR_ALLOC_N(def->videos, 1) < 0)
-+    if (VIR_APPEND_ELEMENT(def->videos, def->nvideos, video) < 0)
-         goto cleanup;
--    def->videos[def->nvideos++] = video;
--    video = NULL;
- 
-     ret = 0;
-  cleanup:
diff --git a/0003-Move-virDomainDefPostParseInternal-after-virDomainDe.patch b/0003-Move-virDomainDefPostParseInternal-after-virDomainDe.patch
deleted file mode 100644
index 6c0cacd..0000000
--- a/0003-Move-virDomainDefPostParseInternal-after-virDomainDe.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Wed, 11 May 2016 11:57:33 +0200
-Subject: [PATCH] Move virDomainDefPostParseInternal after
- virDomainDeviceDefPostParse
-
-Future commit will call DeviceDefPostParse on a device auto-added
-in DomainDefPostParse.
-
-(cherry picked from commit e4d131b8cb12679814b6fda159281f472b615524)
----
- src/conf/domain_conf.c | 78 +++++++++++++++++++++++++-------------------------
- 1 file changed, 39 insertions(+), 39 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 7497f20..73b6653 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -3899,45 +3899,6 @@ virDomainDefPostParseTimer(virDomainDefPtr def)
- }
- 
- 
--static int
--virDomainDefPostParseInternal(virDomainDefPtr def,
--                              virCapsPtr caps ATTRIBUTE_UNUSED,
--                              unsigned int parseFlags)
--{
--    /* verify init path for container based domains */
--    if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && !def->os.init) {
--        virReportError(VIR_ERR_XML_ERROR, "%s",
--                       _("init binary must be specified"));
--        return -1;
--    }
--
--    if (virDomainDefPostParseMemory(def, parseFlags) < 0)
--        return -1;
--
--    if (virDomainDefRejectDuplicateControllers(def) < 0)
--        return -1;
--
--    if (virDomainDefRejectDuplicatePanics(def) < 0)
--        return -1;
--
--    if (virDomainDefPostParseTimer(def) < 0)
--        return -1;
--
--    if (virDomainDefAddImplicitDevices(def) < 0)
--        return -1;
--
--    /* Mark the first video as primary. If the user specified primary="yes",
--     * the parser already inserted the device at def->videos[0] */
--    if (def->nvideos != 0)
--        def->videos[0]->primary = true;
--
--    /* clean up possibly duplicated metadata entries */
--    virDomainDefMetadataSanitize(def);
--
--    return 0;
--}
--
--
- /* Check if a drive type address $controller:$bus:$target:$unit is already
-  * taken by a disk or not.
-  */
-@@ -4352,6 +4313,45 @@ virDomainDefPostParseDeviceIterator(virDomainDefPtr def ATTRIBUTE_UNUSED,
- }
- 
- 
-+static int
-+virDomainDefPostParseInternal(virDomainDefPtr def,
-+                              virCapsPtr caps ATTRIBUTE_UNUSED,
-+                              unsigned int parseFlags)
-+{
-+    /* verify init path for container based domains */
-+    if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && !def->os.init) {
-+        virReportError(VIR_ERR_XML_ERROR, "%s",
-+                       _("init binary must be specified"));
-+        return -1;
-+    }
-+
-+    if (virDomainDefPostParseMemory(def, parseFlags) < 0)
-+        return -1;
-+
-+    if (virDomainDefRejectDuplicateControllers(def) < 0)
-+        return -1;
-+
-+    if (virDomainDefRejectDuplicatePanics(def) < 0)
-+        return -1;
-+
-+    if (virDomainDefPostParseTimer(def) < 0)
-+        return -1;
-+
-+    if (virDomainDefAddImplicitDevices(def) < 0)
-+        return -1;
-+
-+    /* Mark the first video as primary. If the user specified primary="yes",
-+     * the parser already inserted the device at def->videos[0] */
-+    if (def->nvideos != 0)
-+        def->videos[0]->primary = true;
-+
-+    /* clean up possibly duplicated metadata entries */
-+    virDomainDefMetadataSanitize(def);
-+
-+    return 0;
-+}
-+
-+
- int
- virDomainDefPostParse(virDomainDefPtr def,
-                       virCapsPtr caps,
diff --git a/0004-Call-per-device-post-parse-callback-even-on-implicit.patch b/0004-Call-per-device-post-parse-callback-even-on-implicit.patch
deleted file mode 100644
index 1cb0022..0000000
--- a/0004-Call-per-device-post-parse-callback-even-on-implicit.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Wed, 11 May 2016 12:13:51 +0200
-Subject: [PATCH] Call per-device post-parse callback even on implicit video
-
-Commit 6879be48 moved adding of an implicit video device after XML
-parsing. As a result, libxlDomainDeviceDefPostParse() is no longer
-called to set the default vram when adding an implicit device.
-Commit 6879be48 assumes virDomainVideoDefaultRAM() will set the
-default vram, but it returns 0 if the domain virtType is
-VIR_DOMAIN_VIRT_XEN. Attempting to start an HVM domain with vram=0
-results in
-
-error: unsupported configuration: videoram must be at least 4MB for CIRRUS
-
-The default vram setting for Xen HVM domains depends on the device
-model used (qemu-xen vs qemu-traditional), hence setting the
-default is deferred to libxlDomainDeviceDefPostParse().
-
-Call the device post-parse callback even for implicit video,
-to fill out the default vram even for VIR_DOMAIN_VIRT_XEN.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1334557
-Most-of-commit-message-by: Jim Fehlig <jfehlig@suse.com>
-(cherry picked from commit 3e4286703273b06a21ae07f3e76a66f9661199dc)
----
- src/conf/domain_conf.c | 24 +++++++++++++++++-------
- 1 file changed, 17 insertions(+), 7 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 73b6653..6b3309b 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -4315,8 +4315,7 @@ virDomainDefPostParseDeviceIterator(virDomainDefPtr def ATTRIBUTE_UNUSED,
- 
- static int
- virDomainDefPostParseInternal(virDomainDefPtr def,
--                              virCapsPtr caps ATTRIBUTE_UNUSED,
--                              unsigned int parseFlags)
-+                              struct virDomainDefPostParseDeviceIteratorData *data)
- {
-     /* verify init path for container based domains */
-     if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && !def->os.init) {
-@@ -4325,7 +4324,7 @@ virDomainDefPostParseInternal(virDomainDefPtr def,
-         return -1;
-     }
- 
--    if (virDomainDefPostParseMemory(def, parseFlags) < 0)
-+    if (virDomainDefPostParseMemory(def, data->parseFlags) < 0)
-         return -1;
- 
-     if (virDomainDefRejectDuplicateControllers(def) < 0)
-@@ -4340,11 +4339,22 @@ virDomainDefPostParseInternal(virDomainDefPtr def,
-     if (virDomainDefAddImplicitDevices(def) < 0)
-         return -1;
- 
--    /* Mark the first video as primary. If the user specified primary="yes",
--     * the parser already inserted the device at def->videos[0] */
--    if (def->nvideos != 0)
-+    if (def->nvideos != 0) {
-+        virDomainDeviceDef device = {
-+            .type = VIR_DOMAIN_DEVICE_VIDEO,
-+            .data.video = def->videos[0],
-+        };
-+
-+        /* Mark the first video as primary. If the user specified primary="yes",
-+         * the parser already inserted the device at def->videos[0] */
-         def->videos[0]->primary = true;
- 
-+        /* videos[0] might have been added in AddImplicitDevices, after we've
-+         * done the per-device post-parse */
-+        if (virDomainDefPostParseDeviceIterator(NULL, &device, NULL, data) < 0)
-+            return -1;
-+    }
-+
-     /* clean up possibly duplicated metadata entries */
-     virDomainDefMetadataSanitize(def);
- 
-@@ -4382,7 +4392,7 @@ virDomainDefPostParse(virDomainDefPtr def,
-         return ret;
- 
- 
--    if ((ret = virDomainDefPostParseInternal(def, caps, parseFlags)) < 0)
-+    if ((ret = virDomainDefPostParseInternal(def, &data)) < 0)
-         return ret;
- 
-     if (virDomainDefPostParseCheckFeatures(def, xmlopt) < 0)
diff --git a/0005-Fill-out-default-vram-in-DeviceDefPostParse.patch b/0005-Fill-out-default-vram-in-DeviceDefPostParse.patch
deleted file mode 100644
index 9cf7c85..0000000
--- a/0005-Fill-out-default-vram-in-DeviceDefPostParse.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Wed, 11 May 2016 12:39:52 +0200
-Subject: [PATCH] Fill out default vram in DeviceDefPostParse
-
-Move filling out the default video (v)ram to DeviceDefPostParse.
-
-This means it can be removed from virDomainVideoDefParseXML
-and qemuParseCommandLine. Also, we no longer need to special case
-VIR_DOMAIN_VIRT_XEN, since the per-driver callback gets called
-before the generic one.
-
-(cherry picked from commit 538012c8a30230065d1bfe09892279dd8b89193f)
----
- src/conf/domain_conf.c        | 15 ++++++---------
- src/qemu/qemu_parse_command.c |  2 --
- 2 files changed, 6 insertions(+), 11 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 6b3309b..0c2850e 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -4149,6 +4149,12 @@ virDomainDeviceDefPostParseInternal(virDomainDeviceDefPtr dev,
- 
-     if (dev->type == VIR_DOMAIN_DEVICE_VIDEO) {
-         virDomainVideoDefPtr video = dev->data.video;
-+        /* Fill out (V)RAM if the driver-specific callback did not do so */
-+        if (video->ram == 0 && video->type == VIR_DOMAIN_VIDEO_TYPE_QXL)
-+            video->ram = virDomainVideoDefaultRAM(def, video->type);
-+        if (video->vram == 0)
-+            video->vram = virDomainVideoDefaultRAM(def, video->type);
-+
-         video->ram = VIR_ROUND_UP_POWER_OF_TWO(video->ram);
-         video->vram = VIR_ROUND_UP_POWER_OF_TWO(video->vram);
-     }
-@@ -11948,10 +11954,6 @@ unsigned int
- virDomainVideoDefaultRAM(const virDomainDef *def,
-                          const virDomainVideoType type)
- {
--    /* Defer setting default vram to the Xen drivers */
--    if (def->virtType == VIR_DOMAIN_VIRT_XEN)
--        return 0;
--
-     switch (type) {
-     case VIR_DOMAIN_VIDEO_TYPE_VGA:
-     case VIR_DOMAIN_VIDEO_TYPE_CIRRUS:
-@@ -12130,8 +12132,6 @@ virDomainVideoDefParseXML(xmlNodePtr node,
-                            _("cannot parse video ram '%s'"), ram);
-             goto error;
-         }
--    } else if (def->type == VIR_DOMAIN_VIDEO_TYPE_QXL) {
--        def->ram = virDomainVideoDefaultRAM(dom, def->type);
-     }
- 
-     if (vram) {
-@@ -12140,8 +12140,6 @@ virDomainVideoDefParseXML(xmlNodePtr node,
-                            _("cannot parse video vram '%s'"), vram);
-             goto error;
-         }
--    } else {
--        def->vram = virDomainVideoDefaultRAM(dom, def->type);
-     }
- 
-     if (vram64) {
-@@ -18593,7 +18591,6 @@ virDomainDefAddImplicitVideo(virDomainDefPtr def)
-                        _("cannot determine default video type"));
-         goto cleanup;
-     }
--    video->vram = virDomainVideoDefaultRAM(def, video->type);
-     video->heads = 1;
-     if (VIR_APPEND_ELEMENT(def->videos, def->nvideos, video) < 0)
-         goto cleanup;
-diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c
-index 45b64a6..074a7c4 100644
---- a/src/qemu/qemu_parse_command.c
-+++ b/src/qemu/qemu_parse_command.c
-@@ -2584,9 +2584,7 @@ qemuParseCommandLine(virCapsPtr caps,
-             vid->type = VIR_DOMAIN_VIDEO_TYPE_XEN;
-         else
-             vid->type = video;
--        vid->vram = virDomainVideoDefaultRAM(def, vid->type);
-         if (vid->type == VIR_DOMAIN_VIDEO_TYPE_QXL) {
--            vid->ram = virDomainVideoDefaultRAM(def, vid->type);
-             vid->vgamem = QEMU_QXL_VGAMEM_DEFAULT;
-         } else {
-             vid->ram = 0;
diff --git a/0006-Fix-tests-to-include-video-ram-size.patch b/0006-Fix-tests-to-include-video-ram-size.patch
deleted file mode 100644
index f07ea83..0000000
--- a/0006-Fix-tests-to-include-video-ram-size.patch
+++ /dev/null
@@ -1,1033 +0,0 @@
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Thu, 12 May 2016 14:19:52 +0200
-Subject: [PATCH] Fix tests to include video ram size
-
-My commit 3e42867 started filling out the video size in post-parse,
-but did not adjust the tests.
-
-(cherry picked from commit 96b21fb0ecf8242ceb298607da61b5718511a388)
----
- tests/sexpr2xmldata/sexpr2xml-curmem.xml                            | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml                       | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml                   | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml                     | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml                   | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml                      | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml                   | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml                   | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml             | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml            | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml                    | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml                    | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml                    | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml                     | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml                   | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml              | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml                     | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml                     | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml                    | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml                      | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-sound.xml                          | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml                       | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml                      | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-utc.xml                            | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv-v2.xml                             | 2 +-
- tests/sexpr2xmldata/sexpr2xml-fv.xml                                | 2 +-
- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml                   | 2 +-
- tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml             | 2 +-
- tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml                        | 2 +-
- tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml                 | 2 +-
- tests/sexpr2xmldata/sexpr2xml-vif-rate.xml                          | 2 +-
- tests/xlconfigdata/test-disk-positional-parms-full.xml              | 2 +-
- tests/xlconfigdata/test-disk-positional-parms-partial.xml           | 2 +-
- tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml | 2 +-
- tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml       | 2 +-
- tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml             | 2 +-
- tests/xlconfigdata/test-fullvirt-multiusb.xml                       | 2 +-
- tests/xlconfigdata/test-fullvirt-nohap.xml                          | 2 +-
- tests/xlconfigdata/test-new-disk.xml                                | 2 +-
- tests/xlconfigdata/test-rbd-multihost-noauth.xml                    | 2 +-
- tests/xlconfigdata/test-spice-features.xml                          | 2 +-
- tests/xlconfigdata/test-spice.xml                                   | 2 +-
- tests/xlconfigdata/test-vif-rate.xml                                | 2 +-
- tests/xmconfigdata/test-escape-paths.xml                            | 2 +-
- tests/xmconfigdata/test-fullvirt-default-feature.xml                | 2 +-
- tests/xmconfigdata/test-fullvirt-force-hpet.xml                     | 2 +-
- tests/xmconfigdata/test-fullvirt-force-nohpet.xml                   | 2 +-
- tests/xmconfigdata/test-fullvirt-localtime.xml                      | 2 +-
- tests/xmconfigdata/test-fullvirt-net-netfront.xml                   | 2 +-
- tests/xmconfigdata/test-fullvirt-new-cdrom.xml                      | 2 +-
- tests/xmconfigdata/test-fullvirt-nohap.xml                          | 2 +-
- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml                   | 2 +-
- tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml             | 2 +-
- tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml            | 2 +-
- tests/xmconfigdata/test-fullvirt-serial-file.xml                    | 2 +-
- tests/xmconfigdata/test-fullvirt-serial-null.xml                    | 2 +-
- tests/xmconfigdata/test-fullvirt-serial-pipe.xml                    | 2 +-
- tests/xmconfigdata/test-fullvirt-serial-pty.xml                     | 2 +-
- tests/xmconfigdata/test-fullvirt-serial-stdio.xml                   | 2 +-
- tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml              | 2 +-
- tests/xmconfigdata/test-fullvirt-serial-tcp.xml                     | 2 +-
- tests/xmconfigdata/test-fullvirt-serial-udp.xml                     | 2 +-
- tests/xmconfigdata/test-fullvirt-serial-unix.xml                    | 2 +-
- tests/xmconfigdata/test-fullvirt-sound.xml                          | 2 +-
- tests/xmconfigdata/test-fullvirt-usbmouse.xml                       | 2 +-
- tests/xmconfigdata/test-fullvirt-usbtablet.xml                      | 2 +-
- tests/xmconfigdata/test-fullvirt-utc.xml                            | 2 +-
- tests/xmconfigdata/test-no-source-cdrom.xml                         | 2 +-
- tests/xmconfigdata/test-paravirt-net-e1000.xml                      | 2 +-
- tests/xmconfigdata/test-paravirt-net-vifname.xml                    | 2 +-
- tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml            | 2 +-
- tests/xmconfigdata/test-paravirt-new-pvfb.xml                       | 2 +-
- tests/xmconfigdata/test-pci-devs.xml                                | 2 +-
- 73 files changed, 73 insertions(+), 73 deletions(-)
-
-diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.xml b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
-index a2668d1..6932e33 100644
---- a/tests/sexpr2xmldata/sexpr2xml-curmem.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
-@@ -35,7 +35,7 @@
-     <input type='keyboard' bus='xen'/>
-     <graphics type='vnc' port='-1' autoport='yes'/>
-     <video>
--      <model type='xen' heads='1' primary='yes'/>
-+      <model type='xen' vram='4096' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
-index c4b22f6..fdd7c7d 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
-@@ -51,7 +51,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='5925' autoport='yes' keymap='en-us'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
-index 17d4016..42d529c 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
-@@ -44,7 +44,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
-index 20a0d76..5e26804 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
-@@ -47,7 +47,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
-index 13fb299..f6af578 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
-@@ -47,7 +47,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
-index 1380426..aba6045 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
-@@ -44,7 +44,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
-index 64111fe..22e2035 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
-@@ -45,7 +45,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
-index f362aee..aa5122b 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
-@@ -49,7 +49,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
-index 4d3bdde..bcccb94 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
-@@ -56,7 +56,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
-index d3eaf82..82c41a6 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
-@@ -52,7 +52,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
-index 0f209d6..062f349 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
-@@ -52,7 +52,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
-index b157f63..38a2fb3 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
-@@ -50,7 +50,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
-index d9cd840..4d76e34 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
-@@ -52,7 +52,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
-index 2cffa65..e0f90ef 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
-@@ -50,7 +50,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
-index 6e473d4..7de5731 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
-@@ -50,7 +50,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
-index f03bd29..c22e2a5 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
-@@ -54,7 +54,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
-index 2e9c629..439a66e 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
-@@ -54,7 +54,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
-index 3f3f676..b4bdc8a 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
-@@ -54,7 +54,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
-index 4f28511..af9f928 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
-@@ -52,7 +52,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
-index f934a85..d0240c4 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
-@@ -46,7 +46,7 @@
-     <sound model='sb16'/>
-     <sound model='es1370'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
-index f934a85..d0240c4 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
-@@ -46,7 +46,7 @@
-     <sound model='sb16'/>
-     <sound model='es1370'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
-index 8b5887e..e84e172 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
-@@ -45,7 +45,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
-index 3e4b366..187d867 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
-@@ -45,7 +45,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
-index 9c2b9e3..2816f4a 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
-@@ -44,7 +44,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
-index 9c2b9e3..2816f4a 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
-@@ -44,7 +44,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml
-index 9c2b9e3..2816f4a 100644
---- a/tests/sexpr2xmldata/sexpr2xml-fv.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-fv.xml
-@@ -44,7 +44,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
-index 97d9482..41fb3b7 100644
---- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
-@@ -49,7 +49,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
-index dbdacf9..72fec25 100644
---- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
-@@ -30,7 +30,7 @@
-       <listen type='address' address='0.0.0.0'/>
-     </graphics>
-     <video>
--      <model type='xen' heads='1' primary='yes'/>
-+      <model type='xen' vram='4096' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
-index c415aab..0fd7a88 100644
---- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
-@@ -30,7 +30,7 @@
-       <listen type='address' address='0.0.0.0'/>
-     </graphics>
-     <video>
--      <model type='xen' heads='1' primary='yes'/>
-+      <model type='xen' vram='4096' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
-index c1acba1..ee24536 100644
---- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
-@@ -33,7 +33,7 @@
-     <input type='keyboard' bus='xen'/>
-     <graphics type='vnc' port='-1' autoport='yes'/>
-     <video>
--      <model type='xen' heads='1' primary='yes'/>
-+      <model type='xen' vram='4096' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
-index 45887e5..1ebd5f0 100644
---- a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
-+++ b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
-@@ -48,7 +48,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xlconfigdata/test-disk-positional-parms-full.xml b/tests/xlconfigdata/test-disk-positional-parms-full.xml
-index 3d4868c..41e8804 100644
---- a/tests/xlconfigdata/test-disk-positional-parms-full.xml
-+++ b/tests/xlconfigdata/test-disk-positional-parms-full.xml
-@@ -52,7 +52,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-     </video>
-   </devices>
- </domain>
-diff --git a/tests/xlconfigdata/test-disk-positional-parms-partial.xml b/tests/xlconfigdata/test-disk-positional-parms-partial.xml
-index 402f479..6578e59 100644
---- a/tests/xlconfigdata/test-disk-positional-parms-partial.xml
-+++ b/tests/xlconfigdata/test-disk-positional-parms-partial.xml
-@@ -52,7 +52,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-     </video>
-   </devices>
- </domain>
-diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml
-index 686a409..3738c8e 100644
---- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml
-+++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml
-@@ -49,7 +49,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-     </video>
-   </devices>
- </domain>
-diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml
-index 686a409..3738c8e 100644
---- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml
-+++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml
-@@ -49,7 +49,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-     </video>
-   </devices>
- </domain>
-diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
-index 686a409..3738c8e 100644
---- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
-+++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
-@@ -49,7 +49,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-     </video>
-   </devices>
- </domain>
-diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.xml b/tests/xlconfigdata/test-fullvirt-multiusb.xml
-index 5ec72c4..d7df23a 100644
---- a/tests/xlconfigdata/test-fullvirt-multiusb.xml
-+++ b/tests/xlconfigdata/test-fullvirt-multiusb.xml
-@@ -48,7 +48,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-     </video>
-   </devices>
- </domain>
-diff --git a/tests/xlconfigdata/test-fullvirt-nohap.xml b/tests/xlconfigdata/test-fullvirt-nohap.xml
-index a997c7a..9cd7b0b 100644
---- a/tests/xlconfigdata/test-fullvirt-nohap.xml
-+++ b/tests/xlconfigdata/test-fullvirt-nohap.xml
-@@ -56,7 +56,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-     </video>
-   </devices>
- </domain>
-diff --git a/tests/xlconfigdata/test-new-disk.xml b/tests/xlconfigdata/test-new-disk.xml
-index 3d4868c..41e8804 100644
---- a/tests/xlconfigdata/test-new-disk.xml
-+++ b/tests/xlconfigdata/test-new-disk.xml
-@@ -52,7 +52,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-     </video>
-   </devices>
- </domain>
-diff --git a/tests/xlconfigdata/test-rbd-multihost-noauth.xml b/tests/xlconfigdata/test-rbd-multihost-noauth.xml
-index f8f663f..728aa1e 100644
---- a/tests/xlconfigdata/test-rbd-multihost-noauth.xml
-+++ b/tests/xlconfigdata/test-rbd-multihost-noauth.xml
-@@ -49,7 +49,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-     </video>
-   </devices>
- </domain>
-diff --git a/tests/xlconfigdata/test-spice-features.xml b/tests/xlconfigdata/test-spice-features.xml
-index f9eb857..3820732 100644
---- a/tests/xlconfigdata/test-spice-features.xml
-+++ b/tests/xlconfigdata/test-spice-features.xml
-@@ -48,7 +48,7 @@
-       <clipboard copypaste='yes'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-     </video>
-   </devices>
- </domain>
-diff --git a/tests/xlconfigdata/test-spice.xml b/tests/xlconfigdata/test-spice.xml
-index fc2fa3f..f33691f 100644
---- a/tests/xlconfigdata/test-spice.xml
-+++ b/tests/xlconfigdata/test-spice.xml
-@@ -48,7 +48,7 @@
-       <clipboard copypaste='no'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-     </video>
-   </devices>
- </domain>
-diff --git a/tests/xlconfigdata/test-vif-rate.xml b/tests/xlconfigdata/test-vif-rate.xml
-index 0e13f2e..3620e2a 100644
---- a/tests/xlconfigdata/test-vif-rate.xml
-+++ b/tests/xlconfigdata/test-vif-rate.xml
-@@ -55,7 +55,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-     </video>
-   </devices>
- </domain>
-diff --git a/tests/xmconfigdata/test-escape-paths.xml b/tests/xmconfigdata/test-escape-paths.xml
-index 6373fdf..a5daa2c 100644
---- a/tests/xmconfigdata/test-escape-paths.xml
-+++ b/tests/xmconfigdata/test-escape-paths.xml
-@@ -54,7 +54,7 @@
-     <sound model='sb16'/>
-     <sound model='es1370'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.xml b/tests/xmconfigdata/test-fullvirt-default-feature.xml
-index 6f4dae6..ce1280d 100644
---- a/tests/xmconfigdata/test-fullvirt-default-feature.xml
-+++ b/tests/xmconfigdata/test-fullvirt-default-feature.xml
-@@ -48,7 +48,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.xml b/tests/xmconfigdata/test-fullvirt-force-hpet.xml
-index 6f4dae6..ce1280d 100644
---- a/tests/xmconfigdata/test-fullvirt-force-hpet.xml
-+++ b/tests/xmconfigdata/test-fullvirt-force-hpet.xml
-@@ -48,7 +48,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
-index 6015405..7636f31 100644
---- a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
-+++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
-@@ -48,7 +48,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-localtime.xml b/tests/xmconfigdata/test-fullvirt-localtime.xml
-index 5f81e25..b3adf86 100644
---- a/tests/xmconfigdata/test-fullvirt-localtime.xml
-+++ b/tests/xmconfigdata/test-fullvirt-localtime.xml
-@@ -46,7 +46,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.xml b/tests/xmconfigdata/test-fullvirt-net-netfront.xml
-index cb0615b..c22ad8d 100644
---- a/tests/xmconfigdata/test-fullvirt-net-netfront.xml
-+++ b/tests/xmconfigdata/test-fullvirt-net-netfront.xml
-@@ -46,7 +46,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
-index d29892e..2bb3d72 100644
---- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
-+++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
-@@ -46,7 +46,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-nohap.xml b/tests/xmconfigdata/test-fullvirt-nohap.xml
-index f38366c..234856c 100644
---- a/tests/xmconfigdata/test-fullvirt-nohap.xml
-+++ b/tests/xmconfigdata/test-fullvirt-nohap.xml
-@@ -47,7 +47,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
-index 3269aee..be149fd 100644
---- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
-+++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
-@@ -51,7 +51,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
-index a20d6c8..753043d 100644
---- a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
-+++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
-@@ -58,7 +58,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
-index 8344da3..a104c6f 100644
---- a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
-+++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
-@@ -54,7 +54,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml b/tests/xmconfigdata/test-fullvirt-serial-file.xml
-index b9439d7..f27aba9 100644
---- a/tests/xmconfigdata/test-fullvirt-serial-file.xml
-+++ b/tests/xmconfigdata/test-fullvirt-serial-file.xml
-@@ -54,7 +54,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml b/tests/xmconfigdata/test-fullvirt-serial-null.xml
-index 6e8196b..ea29944 100644
---- a/tests/xmconfigdata/test-fullvirt-serial-null.xml
-+++ b/tests/xmconfigdata/test-fullvirt-serial-null.xml
-@@ -52,7 +52,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
-index da0c9bd..69bf51c 100644
---- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
-+++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
-@@ -54,7 +54,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
-index acff588..0c6e477 100644
---- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml
-+++ b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
-@@ -52,7 +52,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
-index 6909053..1f12081 100644
---- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
-+++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
-@@ -52,7 +52,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
-index a3fd449..47544df 100644
---- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
-+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
-@@ -56,7 +56,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
-index 9dba76d..8f1777a 100644
---- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
-+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
-@@ -56,7 +56,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
-index 3577f92..c59e2b6 100644
---- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml
-+++ b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
-@@ -56,7 +56,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
-index 919108b..e678786 100644
---- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml
-+++ b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
-@@ -54,7 +54,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-sound.xml b/tests/xmconfigdata/test-fullvirt-sound.xml
-index 0e85953..3bd2e76 100644
---- a/tests/xmconfigdata/test-fullvirt-sound.xml
-+++ b/tests/xmconfigdata/test-fullvirt-sound.xml
-@@ -48,7 +48,7 @@
-     <sound model='sb16'/>
-     <sound model='es1370'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.xml b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
-index 8eb5aa5..f1421b6 100644
---- a/tests/xmconfigdata/test-fullvirt-usbmouse.xml
-+++ b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
-@@ -47,7 +47,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.xml b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
-index dcdd951..566c842 100644
---- a/tests/xmconfigdata/test-fullvirt-usbtablet.xml
-+++ b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
-@@ -47,7 +47,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-fullvirt-utc.xml b/tests/xmconfigdata/test-fullvirt-utc.xml
-index d29892e..2bb3d72 100644
---- a/tests/xmconfigdata/test-fullvirt-utc.xml
-+++ b/tests/xmconfigdata/test-fullvirt-utc.xml
-@@ -46,7 +46,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-no-source-cdrom.xml b/tests/xmconfigdata/test-no-source-cdrom.xml
-index d4c2fd6..246123c 100644
---- a/tests/xmconfigdata/test-no-source-cdrom.xml
-+++ b/tests/xmconfigdata/test-no-source-cdrom.xml
-@@ -49,7 +49,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.xml b/tests/xmconfigdata/test-paravirt-net-e1000.xml
-index ad44d11..735e8b0 100644
---- a/tests/xmconfigdata/test-paravirt-net-e1000.xml
-+++ b/tests/xmconfigdata/test-paravirt-net-e1000.xml
-@@ -33,7 +33,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='xen' heads='1' primary='yes'/>
-+      <model type='xen' vram='4096' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-paravirt-net-vifname.xml b/tests/xmconfigdata/test-paravirt-net-vifname.xml
-index e94b685..3ce3639 100644
---- a/tests/xmconfigdata/test-paravirt-net-vifname.xml
-+++ b/tests/xmconfigdata/test-paravirt-net-vifname.xml
-@@ -34,7 +34,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='xen' heads='1' primary='yes'/>
-+      <model type='xen' vram='4096' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
-index 3ca3023..20c31ec 100644
---- a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
-+++ b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
-@@ -32,7 +32,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='xen' heads='1' primary='yes'/>
-+      <model type='xen' vram='4096' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.xml b/tests/xmconfigdata/test-paravirt-new-pvfb.xml
-index d97799a..33c48f4 100644
---- a/tests/xmconfigdata/test-paravirt-new-pvfb.xml
-+++ b/tests/xmconfigdata/test-paravirt-new-pvfb.xml
-@@ -32,7 +32,7 @@
-       <listen type='address' address='127.0.0.1'/>
-     </graphics>
-     <video>
--      <model type='xen' heads='1' primary='yes'/>
-+      <model type='xen' vram='4096' heads='1' primary='yes'/>
-     </video>
-     <memballoon model='xen'/>
-   </devices>
-diff --git a/tests/xmconfigdata/test-pci-devs.xml b/tests/xmconfigdata/test-pci-devs.xml
-index 4c3f5f2..a88853d 100644
---- a/tests/xmconfigdata/test-pci-devs.xml
-+++ b/tests/xmconfigdata/test-pci-devs.xml
-@@ -49,7 +49,7 @@
-     <input type='keyboard' bus='ps2'/>
-     <graphics type='vnc' port='-1' autoport='yes'/>
-     <video>
--      <model type='cirrus' heads='1' primary='yes'/>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-     </video>
-     <hostdev mode='subsystem' type='pci' managed='no'>
-       <source>
diff --git a/0007-libxl-don-t-attempt-to-probe-a-non-existent-emulator.patch b/0007-libxl-don-t-attempt-to-probe-a-non-existent-emulator.patch
deleted file mode 100644
index 5710f98..0000000
--- a/0007-libxl-don-t-attempt-to-probe-a-non-existent-emulator.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Jim Fehlig <jfehlig@suse.com>
-Date: Thu, 12 May 2016 14:40:28 -0600
-Subject: [PATCH] libxl: don't attempt to probe a non-existent emulator
-
-When probing the <emulator> with '-help' to determine if
-it is the old qemu, errors are reported if the emulator
-doesn't exist
-
-libvirt:  error : internal error: Child process
-(/usr/lib/xen/bin/qemu-dm -help) unexpected exit status 127:
-libvirt:  error : cannot execute binary /usr/lib/xen/bin/qemu-dm:
-No such file or directory
-
-Avoid the probe if the specified emulator doesn't exist,
-squelching the error. There is no behavior change since
-libxlDomainGetEmulatorType() would return
-LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN if the probe failed
-via virCommandRun().
-
-Signed-off-by: Jim Fehlig <jfehlig@suse.com>
-(cherry picked from commit 400e716d7d8371fa718c27bb4f05b9a68929e64a)
----
- src/libxl/libxl_conf.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
-index 82ba417..3d73e51 100644
---- a/src/libxl/libxl_conf.c
-+++ b/src/libxl/libxl_conf.c
-@@ -916,6 +916,9 @@ libxlDomainGetEmulatorType(const virDomainDef *def)
- 
-     if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
-         if (def->emulator) {
-+            if (!virFileExists(def->emulator))
-+                goto cleanup;
-+
-             cmd = virCommandNew(def->emulator);
- 
-             virCommandAddArgList(cmd, "-help", NULL);
diff --git a/0008-xlconfigtests-use-qemu-xen-in-all-test-data-files.patch b/0008-xlconfigtests-use-qemu-xen-in-all-test-data-files.patch
deleted file mode 100644
index e2cb437..0000000
--- a/0008-xlconfigtests-use-qemu-xen-in-all-test-data-files.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-From: Jim Fehlig <jfehlig@suse.com>
-Date: Thu, 12 May 2016 14:40:29 -0600
-Subject: [PATCH] xlconfigtests: use qemu-xen in all test data files
-
-Some of the test configuration files in tests/xlconfigdata
-use the old qemu-dm as the emulator. Many of the configuration
-features tested (spice, rbd, multi-usb) are not even usable with
-the old qemu. Change these files to use the new qemu-xen (also
-known as qemu upstream) emulator.
-
-Note: This change fixes xlconfigtest failures when the old
-qemu is actually installed on the system. During device post
-parse, the libxl driver attempts to invoke the emulator to
-determine if it is the old or new qemu so it can properly set
-video RAM defaults. With the old qemu installed, the default
-video RAM was set differently than the expected value.
-Changing all the test data files to use qemu-xen ensures
-predictable results wrt default video RAM size.
-
-Signed-off-by: Jim Fehlig <jfehlig@suse.com>
-(cherry picked from commit b90c4b5f505698d600303c5b4f03f5d229b329dd)
----
- tests/xlconfigdata/test-disk-positional-parms-full.cfg    | 2 +-
- tests/xlconfigdata/test-disk-positional-parms-full.xml    | 2 +-
- tests/xlconfigdata/test-disk-positional-parms-partial.cfg | 2 +-
- tests/xlconfigdata/test-disk-positional-parms-partial.xml | 2 +-
- tests/xlconfigdata/test-fullvirt-multiusb.cfg             | 2 +-
- tests/xlconfigdata/test-fullvirt-multiusb.xml             | 2 +-
- tests/xlconfigdata/test-fullvirt-nohap.cfg                | 2 +-
- tests/xlconfigdata/test-fullvirt-nohap.xml                | 2 +-
- tests/xlconfigdata/test-new-disk.cfg                      | 2 +-
- tests/xlconfigdata/test-new-disk.xml                      | 2 +-
- tests/xlconfigdata/test-rbd-multihost-noauth.cfg          | 2 +-
- tests/xlconfigdata/test-rbd-multihost-noauth.xml          | 2 +-
- tests/xlconfigdata/test-spice-features.cfg                | 2 +-
- tests/xlconfigdata/test-spice-features.xml                | 2 +-
- tests/xlconfigdata/test-spice.cfg                         | 2 +-
- tests/xlconfigdata/test-spice.xml                         | 2 +-
- tests/xlconfigdata/test-vif-rate.cfg                      | 2 +-
- tests/xlconfigdata/test-vif-rate.xml                      | 2 +-
- 18 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/tests/xlconfigdata/test-disk-positional-parms-full.cfg b/tests/xlconfigdata/test-disk-positional-parms-full.cfg
-index c5bbb03..217d4dc 100644
---- a/tests/xlconfigdata/test-disk-positional-parms-full.cfg
-+++ b/tests/xlconfigdata/test-disk-positional-parms-full.cfg
-@@ -12,7 +12,7 @@ localtime = 0
- on_poweroff = "destroy"
- on_reboot = "restart"
- on_crash = "restart"
--device_model = "/usr/lib/xen/bin/qemu-dm"
-+device_model = "/usr/lib/xen/bin/qemu-system-i386"
- sdl = 0
- vnc = 1
- vncunused = 1
-diff --git a/tests/xlconfigdata/test-disk-positional-parms-full.xml b/tests/xlconfigdata/test-disk-positional-parms-full.xml
-index 41e8804..1bc5b43 100644
---- a/tests/xlconfigdata/test-disk-positional-parms-full.xml
-+++ b/tests/xlconfigdata/test-disk-positional-parms-full.xml
-@@ -19,7 +19,7 @@
-   <on_reboot>restart</on_reboot>
-   <on_crash>restart</on_crash>
-   <devices>
--    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-     <disk type='block' device='disk'>
-       <driver name='phy' type='raw'/>
-       <source dev='/dev/HostVG/XenGuest2'/>
-diff --git a/tests/xlconfigdata/test-disk-positional-parms-partial.cfg b/tests/xlconfigdata/test-disk-positional-parms-partial.cfg
-index 09eeb94..fd16db0 100644
---- a/tests/xlconfigdata/test-disk-positional-parms-partial.cfg
-+++ b/tests/xlconfigdata/test-disk-positional-parms-partial.cfg
-@@ -12,7 +12,7 @@ localtime = 0
- on_poweroff = "destroy"
- on_reboot = "restart"
- on_crash = "restart"
--device_model = "/usr/lib/xen/bin/qemu-dm"
-+device_model = "/usr/lib/xen/bin/qemu-system-i386"
- sdl = 0
- vnc = 1
- vncunused = 1
-diff --git a/tests/xlconfigdata/test-disk-positional-parms-partial.xml b/tests/xlconfigdata/test-disk-positional-parms-partial.xml
-index 6578e59..e86a5be 100644
---- a/tests/xlconfigdata/test-disk-positional-parms-partial.xml
-+++ b/tests/xlconfigdata/test-disk-positional-parms-partial.xml
-@@ -19,7 +19,7 @@
-   <on_reboot>restart</on_reboot>
-   <on_crash>restart</on_crash>
-   <devices>
--    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-     <disk type='block' device='disk'>
-       <driver name='phy' type='raw'/>
-       <source dev='/dev/HostVG/XenGuest2'/>
-diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.cfg b/tests/xlconfigdata/test-fullvirt-multiusb.cfg
-index 003eb2b..6d456de 100755
---- a/tests/xlconfigdata/test-fullvirt-multiusb.cfg
-+++ b/tests/xlconfigdata/test-fullvirt-multiusb.cfg
-@@ -12,7 +12,7 @@ localtime = 0
- on_poweroff = "destroy"
- on_reboot = "restart"
- on_crash = "restart"
--device_model = "/usr/lib/xen/bin/qemu-dm"
-+device_model = "/usr/lib/xen/bin/qemu-system-i386"
- sdl = 0
- vnc = 1
- vncunused = 1
-diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.xml b/tests/xlconfigdata/test-fullvirt-multiusb.xml
-index d7df23a..fcd14e9 100644
---- a/tests/xlconfigdata/test-fullvirt-multiusb.xml
-+++ b/tests/xlconfigdata/test-fullvirt-multiusb.xml
-@@ -19,7 +19,7 @@
-   <on_reboot>restart</on_reboot>
-   <on_crash>restart</on_crash>
-   <devices>
--    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-     <disk type='block' device='disk'>
-       <driver name='phy' type='raw'/>
-       <source dev='/dev/HostVG/XenGuest2'/>
-diff --git a/tests/xlconfigdata/test-fullvirt-nohap.cfg b/tests/xlconfigdata/test-fullvirt-nohap.cfg
-index 44bfa3c..e7e933d 100644
---- a/tests/xlconfigdata/test-fullvirt-nohap.cfg
-+++ b/tests/xlconfigdata/test-fullvirt-nohap.cfg
-@@ -13,7 +13,7 @@ localtime = 0
- on_poweroff = "destroy"
- on_reboot = "restart"
- on_crash = "restart"
--device_model = "/usr/lib/xen/bin/qemu-dm"
-+device_model = "/usr/lib/xen/bin/qemu-system-i386"
- sdl = 0
- vnc = 1
- vncunused = 1
-diff --git a/tests/xlconfigdata/test-fullvirt-nohap.xml b/tests/xlconfigdata/test-fullvirt-nohap.xml
-index 9cd7b0b..e57e28b 100644
---- a/tests/xlconfigdata/test-fullvirt-nohap.xml
-+++ b/tests/xlconfigdata/test-fullvirt-nohap.xml
-@@ -20,7 +20,7 @@
-   <on_reboot>restart</on_reboot>
-   <on_crash>restart</on_crash>
-   <devices>
--    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-     <disk type='block' device='disk'>
-       <driver name='phy' type='raw'/>
-       <source dev='/dev/HostVG/XenGuest2'/>
-diff --git a/tests/xlconfigdata/test-new-disk.cfg b/tests/xlconfigdata/test-new-disk.cfg
-index b079056..4fe76b2 100644
---- a/tests/xlconfigdata/test-new-disk.cfg
-+++ b/tests/xlconfigdata/test-new-disk.cfg
-@@ -12,7 +12,7 @@ localtime = 0
- on_poweroff = "destroy"
- on_reboot = "restart"
- on_crash = "restart"
--device_model = "/usr/lib/xen/bin/qemu-dm"
-+device_model = "/usr/lib/xen/bin/qemu-system-i386"
- sdl = 0
- vnc = 1
- vncunused = 1
-diff --git a/tests/xlconfigdata/test-new-disk.xml b/tests/xlconfigdata/test-new-disk.xml
-index 41e8804..1bc5b43 100644
---- a/tests/xlconfigdata/test-new-disk.xml
-+++ b/tests/xlconfigdata/test-new-disk.xml
-@@ -19,7 +19,7 @@
-   <on_reboot>restart</on_reboot>
-   <on_crash>restart</on_crash>
-   <devices>
--    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-     <disk type='block' device='disk'>
-       <driver name='phy' type='raw'/>
-       <source dev='/dev/HostVG/XenGuest2'/>
-diff --git a/tests/xlconfigdata/test-rbd-multihost-noauth.cfg b/tests/xlconfigdata/test-rbd-multihost-noauth.cfg
-index 99f0889..01c15d5 100644
---- a/tests/xlconfigdata/test-rbd-multihost-noauth.cfg
-+++ b/tests/xlconfigdata/test-rbd-multihost-noauth.cfg
-@@ -12,7 +12,7 @@ localtime = 0
- on_poweroff = "destroy"
- on_reboot = "restart"
- on_crash = "restart"
--device_model = "/usr/lib/xen/bin/qemu-dm"
-+device_model = "/usr/lib/xen/bin/qemu-system-i386"
- sdl = 0
- vnc = 1
- vncunused = 1
-diff --git a/tests/xlconfigdata/test-rbd-multihost-noauth.xml b/tests/xlconfigdata/test-rbd-multihost-noauth.xml
-index 728aa1e..ef9bd17 100644
---- a/tests/xlconfigdata/test-rbd-multihost-noauth.xml
-+++ b/tests/xlconfigdata/test-rbd-multihost-noauth.xml
-@@ -19,7 +19,7 @@
-   <on_reboot>restart</on_reboot>
-   <on_crash>restart</on_crash>
-   <devices>
--    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-     <disk type='block' device='disk'>
-       <driver name='phy' type='raw'/>
-       <source dev='/dev/HostVG/XenGuest2'/>
-diff --git a/tests/xlconfigdata/test-spice-features.cfg b/tests/xlconfigdata/test-spice-features.cfg
-index 48dcd86..f8a25e4 100644
---- a/tests/xlconfigdata/test-spice-features.cfg
-+++ b/tests/xlconfigdata/test-spice-features.cfg
-@@ -12,7 +12,7 @@ localtime = 0
- on_poweroff = "destroy"
- on_reboot = "restart"
- on_crash = "restart"
--device_model = "/usr/lib/xen/bin/qemu-dm"
-+device_model = "/usr/lib/xen/bin/qemu-system-i386"
- vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
- parallel = "none"
- serial = "none"
-diff --git a/tests/xlconfigdata/test-spice-features.xml b/tests/xlconfigdata/test-spice-features.xml
-index 3820732..8175760 100644
---- a/tests/xlconfigdata/test-spice-features.xml
-+++ b/tests/xlconfigdata/test-spice-features.xml
-@@ -19,7 +19,7 @@
-   <on_reboot>restart</on_reboot>
-   <on_crash>restart</on_crash>
-   <devices>
--    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-     <disk type='block' device='disk'>
-       <driver name='phy' type='raw'/>
-       <source dev='/dev/HostVG/XenGuest2'/>
-diff --git a/tests/xlconfigdata/test-spice.cfg b/tests/xlconfigdata/test-spice.cfg
-index 7ab23e1..abdf63d 100644
---- a/tests/xlconfigdata/test-spice.cfg
-+++ b/tests/xlconfigdata/test-spice.cfg
-@@ -12,7 +12,7 @@ localtime = 0
- on_poweroff = "destroy"
- on_reboot = "restart"
- on_crash = "restart"
--device_model = "/usr/lib/xen/bin/qemu-dm"
-+device_model = "/usr/lib/xen/bin/qemu-system-i386"
- vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
- parallel = "none"
- serial = "none"
-diff --git a/tests/xlconfigdata/test-spice.xml b/tests/xlconfigdata/test-spice.xml
-index f33691f..32cad27 100644
---- a/tests/xlconfigdata/test-spice.xml
-+++ b/tests/xlconfigdata/test-spice.xml
-@@ -19,7 +19,7 @@
-   <on_reboot>restart</on_reboot>
-   <on_crash>restart</on_crash>
-   <devices>
--    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-     <disk type='block' device='disk'>
-       <driver name='phy' type='raw'/>
-       <source dev='/dev/HostVG/XenGuest2'/>
-diff --git a/tests/xlconfigdata/test-vif-rate.cfg b/tests/xlconfigdata/test-vif-rate.cfg
-index db932e5..34a19a2 100644
---- a/tests/xlconfigdata/test-vif-rate.cfg
-+++ b/tests/xlconfigdata/test-vif-rate.cfg
-@@ -12,7 +12,7 @@ localtime = 0
- on_poweroff = "destroy"
- on_reboot = "restart"
- on_crash = "restart"
--device_model = "/usr/lib/xen/bin/qemu-dm"
-+device_model = "/usr/lib/xen/bin/qemu-system-i386"
- sdl = 0
- vnc = 1
- vncunused = 1
-diff --git a/tests/xlconfigdata/test-vif-rate.xml b/tests/xlconfigdata/test-vif-rate.xml
-index 3620e2a..3ab7488 100644
---- a/tests/xlconfigdata/test-vif-rate.xml
-+++ b/tests/xlconfigdata/test-vif-rate.xml
-@@ -19,7 +19,7 @@
-   <on_reboot>restart</on_reboot>
-   <on_crash>restart</on_crash>
-   <devices>
--    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-     <disk type='block' device='disk'>
-       <driver name='phy' type='raw'/>
-       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/0101-spec-Advertise-nvram-paths-of-official-fedora-edk2-b.patch b/0101-spec-Advertise-nvram-paths-of-official-fedora-edk2-b.patch
deleted file mode 100644
index 7f3d5bc..0000000
--- a/0101-spec-Advertise-nvram-paths-of-official-fedora-edk2-b.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Cole Robinson <crobinso@redhat.com>
-Date: Fri, 20 May 2016 15:50:16 -0400
-Subject: [PATCH] spec: Advertise nvram paths of official fedora edk2 builds
-
-Fedora now ships edk2 firmware in its official repos, so adapt
-the nvram path list to match. Eventually we can remove the nightly
-links as well once some integration kinks have been worked out,
-and documentation updated.
-
-Move the macro building into the %build target, which lets us
-build up a shell variable and make things a bit more readable
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1335395
-(cherry picked from commit e9ef4dfac88806d02bd2f31eeb3f3bbafe505888)
----
- libvirt.spec.in | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/libvirt.spec.in b/libvirt.spec.in
-index 7a35387..87514f0 100644
---- a/libvirt.spec.in
-+++ b/libvirt.spec.in
-@@ -345,12 +345,6 @@
- %endif
- 
- 
--# Advertise OVMF and AAVMF from nightly firmware repo
--%if 0%{?fedora}
--    %define with_loader_nvram --with-loader-nvram="/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw"
--%endif
--
--
- # The RHEL-5 Xen package has some feature backports. This
- # flag is set to enable use of those special bits on RHEL-5
- %if 0%{?rhel} == 5
-@@ -1485,6 +1479,18 @@ rm -rf .git
-     %endif
- %endif
- 
-+%if 0%{?fedora}
-+    # Nightly firmware repo x86/OVMF
-+    LOADERS="/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd"
-+    # Nightly firmware repo aarch64/AAVMF
-+    LOADERS="$LOADERS:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw"
-+    # Fedora official x86/OVMF
-+    LOADERS="$LOADERS:/usr/share/edk2/ovmf/OVMF_CODE.fd:/usr/share/edk2/ovmf/OVMF_VARS.fd"
-+    # Fedora official aarch64/AAVMF
-+    LOADERS="$LOADERS:/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2/aarch64/vars-template-pflash.raw"
-+    %define with_loader_nvram --with-loader-nvram="$LOADERS"
-+%endif
-+
- # place macros above and build commands below this comment
- 
- %if 0%{?enable_autotools}
diff --git a/0102-util-Add-exitstatus-parameter-to-virCommandRunRegex.patch b/0102-util-Add-exitstatus-parameter-to-virCommandRunRegex.patch
deleted file mode 100644
index e50d643..0000000
--- a/0102-util-Add-exitstatus-parameter-to-virCommandRunRegex.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From: John Ferlan <jferlan@redhat.com>
-Date: Fri, 13 May 2016 12:36:39 -0400
-Subject: [PATCH] util: Add exitstatus parameter to virCommandRunRegex
-
-Rather than have virCommandRun just spit out the error, allow callers
-to decide to pass the exitstatus so the caller can make intelligent
-decisions based on the error.
-
-(cherry picked from commit 8b1049473317c09d34b3ce9671d0f9e91dd4f1c0)
----
- src/storage/storage_backend_fs.c      |  2 +-
- src/storage/storage_backend_logical.c | 10 ++++++----
- src/util/vircommand.c                 |  9 ++++++---
- src/util/vircommand.h                 |  3 ++-
- src/util/viriscsi.c                   |  4 ++--
- 5 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
-index 692c9ff..93d65aa 100644
---- a/src/storage/storage_backend_fs.c
-+++ b/src/storage/storage_backend_fs.c
-@@ -261,7 +261,7 @@ virStorageBackendFileSystemNetFindNFSPoolSources(virNetfsDiscoverState *state)
- 
-     if (virCommandRunRegex(cmd, 1, regexes, vars,
-                            virStorageBackendFileSystemNetFindPoolSourcesFunc,
--                           state, NULL) < 0)
-+                           state, NULL, NULL) < 0)
-         goto cleanup;
- 
-     ret = 0;
-diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c
-index 90a194e..ca05fe1 100644
---- a/src/storage/storage_backend_logical.c
-+++ b/src/storage/storage_backend_logical.c
-@@ -398,7 +398,8 @@ virStorageBackendLogicalFindLVs(virStoragePoolObjPtr pool,
-                            vars,
-                            virStorageBackendLogicalMakeVol,
-                            &cbdata,
--                           "lvs") < 0)
-+                           "lvs",
-+                           NULL) < 0)
-         goto cleanup;
- 
-     ret = 0;
-@@ -511,10 +512,10 @@ virStorageBackendLogicalGetPoolSources(virStoragePoolSourceListPtr sourceList)
-     cmd = virCommandNewArgList(PVS,
-                                "--noheadings",
-                                "-o", "pv_name,vg_name",
--                               NULL);
-+                               NULL, NULL);
-     if (virCommandRunRegex(cmd, 1, regexes, vars,
-                            virStorageBackendLogicalFindPoolSourcesFunc,
--                           sourceList, "pvs") < 0)
-+                           sourceList, "pvs", NULL) < 0)
-         goto cleanup;
-     ret = 0;
- 
-@@ -799,7 +800,8 @@ virStorageBackendLogicalRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED,
-                            vars,
-                            virStorageBackendLogicalRefreshPoolFunc,
-                            pool,
--                           "vgs") < 0)
-+                           "vgs",
-+                           NULL) < 0)
-         goto cleanup;
- 
-     ret = 0;
-diff --git a/src/util/vircommand.c b/src/util/vircommand.c
-index 027cb64..f5bd7af 100644
---- a/src/util/vircommand.c
-+++ b/src/util/vircommand.c
-@@ -2900,6 +2900,7 @@ virCommandSetDryRun(virBufferPtr buf,
-  * needs to return 0 on success
-  * @data: additional data that will be passed to the callback function
-  * @prefix: prefix that will be skipped at the beginning of each line
-+ * @exitstatus: allows the caller to handle command run exit failures
-  *
-  * Run an external program.
-  *
-@@ -2917,7 +2918,8 @@ virCommandRunRegex(virCommandPtr cmd,
-                    int *nvars,
-                    virCommandRunRegexFunc func,
-                    void *data,
--                   const char *prefix)
-+                   const char *prefix,
-+                   int *exitstatus)
- {
-     int err;
-     regex_t *reg;
-@@ -2959,7 +2961,7 @@ virCommandRunRegex(virCommandPtr cmd,
-         goto cleanup;
- 
-     virCommandSetOutputBuffer(cmd, &outbuf);
--    if (virCommandRun(cmd, NULL) < 0)
-+    if (virCommandRun(cmd, exitstatus) < 0)
-         goto cleanup;
- 
-     if (!outbuf) {
-@@ -3114,7 +3116,8 @@ virCommandRunRegex(virCommandPtr cmd ATTRIBUTE_UNUSED,
-                    int *nvars ATTRIBUTE_UNUSED,
-                    virCommandRunRegexFunc func ATTRIBUTE_UNUSED,
-                    void *data ATTRIBUTE_UNUSED,
--                   const char *prefix ATTRIBUTE_UNUSED)
-+                   const char *prefix ATTRIBUTE_UNUSED,
-+                   int *exitstatus ATTRIBUTE_UNUSED)
- {
-     virReportError(VIR_ERR_INTERNAL_ERROR,
-                    _("%s not implemented on Win32"), __FUNCTION__);
-diff --git a/src/util/vircommand.h b/src/util/vircommand.h
-index 198da2f..44818ef 100644
---- a/src/util/vircommand.h
-+++ b/src/util/vircommand.h
-@@ -205,7 +205,8 @@ int virCommandRunRegex(virCommandPtr cmd,
-                        int *nvars,
-                        virCommandRunRegexFunc func,
-                        void *data,
--                       const char *cmd_to_ignore);
-+                       const char *cmd_to_ignore,
-+                       int *exitstatus);
- 
- int virCommandRunNul(virCommandPtr cmd,
-                      size_t n_columns,
-diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c
-index bd34fea..846ea68 100644
---- a/src/util/viriscsi.c
-+++ b/src/util/viriscsi.c
-@@ -87,7 +87,7 @@ virISCSIGetSession(const char *devpath,
-                            regexes,
-                            vars,
-                            virISCSIExtractSession,
--                           &cbdata, NULL) < 0)
-+                           &cbdata, NULL, NULL) < 0)
-         goto cleanup;
- 
-     if (cbdata.session == NULL && !probe) {
-@@ -437,7 +437,7 @@ virISCSIScanTargets(const char *portal,
-                            regexes,
-                            vars,
-                            virISCSIGetTargets,
--                           &list, NULL) < 0)
-+                           &list, NULL, NULL) < 0)
-         goto cleanup;
- 
-     for (i = 0; i < list.ntargets; i++) {
diff --git a/0103-iscsi-Add-exit-status-checking-for-virISCSIGetSessio.patch b/0103-iscsi-Add-exit-status-checking-for-virISCSIGetSessio.patch
deleted file mode 100644
index 5c35bd5..0000000
--- a/0103-iscsi-Add-exit-status-checking-for-virISCSIGetSessio.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From: John Ferlan <jferlan@redhat.com>
-Date: Fri, 13 May 2016 13:25:30 -0400
-Subject: [PATCH] iscsi: Add exit status checking for virISCSIGetSession
-
-Utilize the exit status parameter for virCommandRunRegex in order to
-check the return error from the 'iscsiadm --mode session' command.
-Without this enabled, if there are no sessions running then virCommandRun
-would have displayed an error such as:
-
-    2016-05-13 15:17:15.165+0000: 10920: error : virCommandWait:2553 :
-               internal error: Child process (iscsiadm --mode session)
-               unexpected exit status 21: iscsiadm: No active sessions.
-
-It is possible that for certain paths (when probe is true) we only care
-whether it's running or not to make certain decisions.  Spitting out
-the error for those paths is unnecessary.
-
-If we do have a situation where probe = false and there's an error,
-then display the error from iscsiadm if it's there.
-
-(cherry picked from commit 8f54e0d6328eb593c2226459a03afed0da23043d)
----
- src/util/viriscsi.c | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c
-index 846ea68..65a8677 100644
---- a/src/util/viriscsi.c
-+++ b/src/util/viriscsi.c
-@@ -79,24 +79,28 @@ virISCSIGetSession(const char *devpath,
-         .session = NULL,
-         .devpath = devpath,
-     };
-+    char *error = NULL;
-+    int exitstatus = 0;
- 
--    virCommandPtr cmd = virCommandNewArgList(ISCSIADM, "--mode", "session", NULL);
-+    virCommandPtr cmd = virCommandNewArgList(ISCSIADM, "--mode",
-+                                             "session", NULL);
-+    virCommandSetErrorBuffer(cmd, &error);
- 
-     if (virCommandRunRegex(cmd,
-                            1,
-                            regexes,
-                            vars,
-                            virISCSIExtractSession,
--                           &cbdata, NULL, NULL) < 0)
-+                           &cbdata, NULL, &exitstatus) < 0)
-         goto cleanup;
- 
--    if (cbdata.session == NULL && !probe) {
-+    if (cbdata.session == NULL && !probe)
-         virReportError(VIR_ERR_INTERNAL_ERROR,
--                       "%s", _("cannot find session"));
--        goto cleanup;
--    }
-+                       _("cannot find iscsiadm session: %s"),
-+                       NULLSTR(error));
- 
-  cleanup:
-+    VIR_FREE(error);
-     virCommandFree(cmd);
-     return cbdata.session;
- }
diff --git a/0104-util-Remove-disabling-of-autologin-for-iscsi-targets.patch b/0104-util-Remove-disabling-of-autologin-for-iscsi-targets.patch
deleted file mode 100644
index e72c013..0000000
--- a/0104-util-Remove-disabling-of-autologin-for-iscsi-targets.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From: Fritz Elfert <fritz@fritz-elfert.de>
-Date: Fri, 13 May 2016 11:19:09 -0400
-Subject: [PATCH] util: Remove disabling of autologin for iscsi-targets
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1331552
-
-Instead of disabling auto-login of all scsi targets (even those
-that do not "belong" to libvirt), use iscsiadm's "--op nonpersistent"
-during discovery of iSCSI targets (e.g. "iscsiadm --mode discovery
---type sendtargets") in order to avoid the node database being altered
-which led to the need for the "large hammer" approach taken by
-commit id '3c12b654'.
-
-This commit removes the virISCSITargetAutologin adjustment (eg. the setting
-of node.startup to "manual"). The iscsiadm command has supported this mode
-of operation as of commit id 'ad873767' to open-iscsi.
-
-(cherry picked from commit 56057900dc53df490d953d56de1195ebfa025bdd)
----
- src/util/viriscsi.c  | 30 ++----------------------------
- tests/viriscsitest.c |  4 +++-
- 2 files changed, 5 insertions(+), 29 deletions(-)
-
-diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c
-index 65a8677..f4e3254 100644
---- a/src/util/viriscsi.c
-+++ b/src/util/viriscsi.c
-@@ -390,24 +390,9 @@ virISCSIGetTargets(char **const groups,
- }
- 
- 
--static int
--virISCSITargetAutologin(const char *portal,
--                        const char *initiatoriqn,
--                        const char *target,
--                        bool enable)
--{
--    const char *extraargv[] = { "--op", "update",
--                                "--name", "node.startup",
--                                "--value", enable ? "automatic" : "manual",
--                                NULL };
--
--    return virISCSIConnection(portal, initiatoriqn, target, extraargv);
--}
--
--
- int
- virISCSIScanTargets(const char *portal,
--                    const char *initiatoriqn,
-+                    const char *initiatoriqn ATTRIBUTE_UNUSED,
-                     size_t *ntargetsret,
-                     char ***targetsret)
- {
-@@ -432,6 +417,7 @@ virISCSIScanTargets(const char *portal,
-                                              "--mode", "discovery",
-                                              "--type", "sendtargets",
-                                              "--portal", portal,
-+                                             "--op", "nonpersistent",
-                                              NULL);
- 
-     memset(&list, 0, sizeof(list));
-@@ -444,18 +430,6 @@ virISCSIScanTargets(const char *portal,
-                            &list, NULL, NULL) < 0)
-         goto cleanup;
- 
--    for (i = 0; i < list.ntargets; i++) {
--        /* We have to ignore failure, because we can't undo
--         * the results of 'sendtargets', unless we go scrubbing
--         * around in the dirt in /var/lib/iscsi.
--         */
--        if (virISCSITargetAutologin(portal,
--                                    initiatoriqn,
--                                    list.targets[i], false) < 0)
--            VIR_WARN("Unable to disable auto-login on iSCSI target %s: %s",
--                     portal, list.targets[i]);
--    }
--
-     if (ntargetsret && targetsret) {
-         *ntargetsret = list.ntargets;
-         *targetsret = list.targets;
-diff --git a/tests/viriscsitest.c b/tests/viriscsitest.c
-index c697a4a..b5b0e20 100644
---- a/tests/viriscsitest.c
-+++ b/tests/viriscsitest.c
-@@ -90,7 +90,9 @@ static void testIscsiadmCb(const char *const*args,
-                args[4] && STREQ(args[4], "sendtargets") &&
-                args[5] && STREQ(args[5], "--portal") &&
-                args[6] && STREQ(args[6], "10.20.30.40:3260,1") &&
--               args[7] == NULL) {
-+               args[7] && STREQ(args[7], "--op") &&
-+               args[8] && STREQ(args[8], "nonpersistent") &&
-+               args[9] == NULL) {
-         ignore_value(VIR_STRDUP(*output, iscsiadmSendtargetsOutput));
-     } else {
-         *status = -1;
diff --git a/0105-iscsi-Remove-initiatoriqn-from-virISCSIScanTargets.patch b/0105-iscsi-Remove-initiatoriqn-from-virISCSIScanTargets.patch
deleted file mode 100644
index 03ced19..0000000
--- a/0105-iscsi-Remove-initiatoriqn-from-virISCSIScanTargets.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From: John Ferlan <jferlan@redhat.com>
-Date: Fri, 13 May 2016 11:38:45 -0400
-Subject: [PATCH] iscsi: Remove initiatoriqn from virISCSIScanTargets
-
-No longer necessary to have it, so remove it.
-
-(cherry picked from commit 027986f5bff0d89375e94e1344074f82eed27d7b)
----
- src/storage/storage_backend_iscsi.c | 8 ++------
- src/util/viriscsi.c                 | 3 +--
- src/util/viriscsi.h                 | 1 -
- tests/viriscsitest.c                | 3 +--
- 4 files changed, 4 insertions(+), 11 deletions(-)
-
-diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
-index 9e2d01e..bccfba3 100644
---- a/src/storage/storage_backend_iscsi.c
-+++ b/src/storage/storage_backend_iscsi.c
-@@ -197,9 +197,7 @@ virStorageBackendISCSIFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED,
-     if (!(portal = virStorageBackendISCSIPortal(source)))
-         goto cleanup;
- 
--    if (virISCSIScanTargets(portal,
--                            source->initiator.iqn,
--                            &ntargets, &targets) < 0)
-+    if (virISCSIScanTargets(portal, &ntargets, &targets) < 0)
-         goto cleanup;
- 
-     if (VIR_ALLOC_N(list.sources, ntargets) < 0)
-@@ -399,9 +397,7 @@ virStorageBackendISCSIStartPool(virConnectPtr conn,
-          * iscsiadm doesn't let you login to a target, unless you've
-          * first issued a 'sendtargets' command to the portal :-(
-          */
--        if (virISCSIScanTargets(portal,
--                                pool->def->source.initiator.iqn,
--                                NULL, NULL) < 0)
-+        if (virISCSIScanTargets(portal, NULL, NULL) < 0)
-             goto cleanup;
- 
-         if (virStorageBackendISCSISetAuth(portal, conn, &pool->def->source) < 0)
-diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c
-index f4e3254..e705517 100644
---- a/src/util/viriscsi.c
-+++ b/src/util/viriscsi.c
-@@ -307,7 +307,7 @@ virISCSIConnection(const char *portal,
-              * portal. Without the sendtargets all that is received is a
-              * "iscsiadm: No records found"
-              */
--            if (virISCSIScanTargets(portal, initiatoriqn, NULL, NULL) < 0)
-+            if (virISCSIScanTargets(portal, NULL, NULL) < 0)
-                 goto cleanup;
- 
-             break;
-@@ -392,7 +392,6 @@ virISCSIGetTargets(char **const groups,
- 
- int
- virISCSIScanTargets(const char *portal,
--                    const char *initiatoriqn ATTRIBUTE_UNUSED,
-                     size_t *ntargetsret,
-                     char ***targetsret)
- {
-diff --git a/src/util/viriscsi.h b/src/util/viriscsi.h
-index f4093f7..459249e 100644
---- a/src/util/viriscsi.h
-+++ b/src/util/viriscsi.h
-@@ -49,7 +49,6 @@ virISCSIRescanLUNs(const char *session)
- 
- int
- virISCSIScanTargets(const char *portal,
--                    const char *initiatoriqn,
-                     size_t *ntargetsret,
-                     char ***targetsret)
-     ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
-diff --git a/tests/viriscsitest.c b/tests/viriscsitest.c
-index b5b0e20..40e4d10 100644
---- a/tests/viriscsitest.c
-+++ b/tests/viriscsitest.c
-@@ -145,8 +145,7 @@ testISCSIScanTargets(const void *data)
- 
-     virCommandSetDryRun(NULL, testIscsiadmCb, NULL);
- 
--    if (virISCSIScanTargets(info->portal, NULL,
--                            &ntargets, &targets) < 0)
-+    if (virISCSIScanTargets(info->portal, &ntargets, &targets) < 0)
-         goto cleanup;
- 
-     if (info->nexpected != ntargets) {
diff --git a/0106-qemu-process-Refresh-ejectable-media-tray-state-on-V.patch b/0106-qemu-process-Refresh-ejectable-media-tray-state-on-V.patch
deleted file mode 100644
index 37aff57..0000000
--- a/0106-qemu-process-Refresh-ejectable-media-tray-state-on-V.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Fri, 29 Apr 2016 13:38:51 +0200
-Subject: [PATCH] qemu: process: Refresh ejectable media tray state on VM start
-
-Empty floppy drives start with tray in "open" state and libvirt did not
-refresh it after startup. The code that inserts media into the tray then
-waited until the tray was open before inserting the media and thus
-floppies could not be inserted.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1326660
-(cherry picked from commit a34faf33011c5c0d7b47ee0849bf1e11635e17c5)
----
- src/qemu/qemu_hotplug.c | 10 ++++++++--
- src/qemu/qemu_process.c |  4 ++++
- 2 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 67fb624..b8ab068 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -299,8 +299,14 @@ qemuDomainCheckEjectableMedia(virQEMUDriverPtr driver,
-         if (!info)
-             goto cleanup;
- 
--        if (info->tray_open && virDomainDiskGetSource(disk))
--            ignore_value(virDomainDiskSetSource(disk, NULL));
-+        if (info->tray_open) {
-+            if (virDomainDiskGetSource(disk))
-+                ignore_value(virDomainDiskSetSource(disk, NULL));
-+
-+            disk->tray_status = VIR_DOMAIN_DISK_TRAY_OPEN;
-+        } else {
-+            disk->tray_status = VIR_DOMAIN_DISK_TRAY_CLOSED;
-+        }
-     }
- 
-     ret = 0;
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index e3df265..2698178 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -5457,6 +5457,10 @@ qemuProcessLaunch(virConnectPtr conn,
-     if (qemuProcessUpdateVideoRamSize(driver, vm, asyncJob) < 0)
-         goto cleanup;
- 
-+    VIR_DEBUG("Updating ejectable media status");
-+    if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0)
-+        goto cleanup;
-+
-     if (flags & VIR_QEMU_PROCESS_START_AUTODESTROY &&
-         qemuProcessAutoDestroyAdd(driver, vm, conn) < 0)
-         goto cleanup;
diff --git a/0107-qemu-Move-struct-qemuDomainDiskInfo-to-qemu_domain.h.patch b/0107-qemu-Move-struct-qemuDomainDiskInfo-to-qemu_domain.h.patch
deleted file mode 100644
index 9954a6d..0000000
--- a/0107-qemu-Move-struct-qemuDomainDiskInfo-to-qemu_domain.h.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Fri, 20 May 2016 07:21:04 +0200
-Subject: [PATCH] qemu: Move struct qemuDomainDiskInfo to qemu_domain.h
-
-(cherry picked from commit 5f963d89b1220460fadb1bf6fc347d26b311c1b2)
----
- src/qemu/qemu_conf.h        | 7 -------
- src/qemu/qemu_domain.h      | 7 +++++++
- tests/qemumonitorjsontest.c | 2 +-
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
-index a714b84..1fdef70 100644
---- a/src/qemu/qemu_conf.h
-+++ b/src/qemu/qemu_conf.h
-@@ -287,13 +287,6 @@ virCapsPtr virQEMUDriverCreateCapabilities(virQEMUDriverPtr driver);
- virCapsPtr virQEMUDriverGetCapabilities(virQEMUDriverPtr driver,
-                                         bool refresh);
- 
--struct qemuDomainDiskInfo {
--    bool removable;
--    bool locked;
--    bool tray_open;
--    int io_status;
--};
--
- typedef struct _qemuSharedDeviceEntry qemuSharedDeviceEntry;
- typedef qemuSharedDeviceEntry *qemuSharedDeviceEntryPtr;
- 
-diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
-index 54d7bd7..ada4a17 100644
---- a/src/qemu/qemu_domain.h
-+++ b/src/qemu/qemu_domain.h
-@@ -238,6 +238,13 @@ struct _qemuDomainDiskPrivate {
-     bool migrating; /* the disk is being migrated */
- };
- 
-+struct qemuDomainDiskInfo {
-+    bool removable;
-+    bool locked;
-+    bool tray_open;
-+    int io_status;
-+};
-+
- typedef enum {
-     QEMU_PROCESS_EVENT_WATCHDOG = 0,
-     QEMU_PROCESS_EVENT_GUESTPANIC,
-diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
-index 1be0bee..cb917c2 100644
---- a/tests/qemumonitorjsontest.c
-+++ b/tests/qemumonitorjsontest.c
-@@ -22,7 +22,7 @@
- #include "testutils.h"
- #include "testutilsqemu.h"
- #include "qemumonitortestutils.h"
--#include "qemu/qemu_conf.h"
-+#include "qemu/qemu_domain.h"
- #include "qemu/qemu_monitor_json.h"
- #include "virthread.h"
- #include "virerror.h"
diff --git a/0108-qemu-Extract-more-information-about-qemu-drives.patch b/0108-qemu-Extract-more-information-about-qemu-drives.patch
deleted file mode 100644
index c0f39b9..0000000
--- a/0108-qemu-Extract-more-information-about-qemu-drives.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 19 May 2016 14:57:41 +0200
-Subject: [PATCH] qemu: Extract more information about qemu drives
-
-Extract whether a given drive has a tray and whether there is no image
-inserted.
-
-Negative logic for the image insertion is chosen so that the flag is set
-only if we are certain of the fact.
-
-(cherry picked from commit f1690dc3d7934bf70f4fbc84d55bf210276c6f27)
----
- src/qemu/qemu_domain.h       |  2 ++
- src/qemu/qemu_monitor_json.c | 12 +++++++-----
- tests/qemumonitorjsontest.c  | 23 +++++++++++++++++++++++
- 3 files changed, 32 insertions(+), 5 deletions(-)
-
-diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
-index ada4a17..fbf5b1c 100644
---- a/src/qemu/qemu_domain.h
-+++ b/src/qemu/qemu_domain.h
-@@ -241,7 +241,9 @@ struct _qemuDomainDiskPrivate {
- struct qemuDomainDiskInfo {
-     bool removable;
-     bool locked;
-+    bool tray;
-     bool tray_open;
-+    bool empty;
-     int io_status;
- };
- 
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index e140d0e..bd5537a 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -1797,11 +1797,13 @@ int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon,
-             goto cleanup;
-         }
- 
--        /* Don't check for success here, because 'tray_open' is presented iff
--         * medium is ejected.
--         */
--        ignore_value(virJSONValueObjectGetBoolean(dev, "tray_open",
--                                                  &info->tray_open));
-+        /* 'tray_open' is present only if the device has a tray */
-+        if (virJSONValueObjectGetBoolean(dev, "tray_open", &info->tray_open) == 0)
-+            info->tray = true;
-+
-+        /* presence of 'inserted' notifies that a medium is in the device */
-+        if (!virJSONValueObjectGetObject(dev, "inserted"))
-+            info->empty = true;
- 
-         /* Missing io-status indicates no error */
-         if ((status = virJSONValueObjectGetString(dev, "io-status"))) {
-diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
-index cb917c2..315baea 100644
---- a/tests/qemumonitorjsontest.c
-+++ b/tests/qemumonitorjsontest.c
-@@ -114,6 +114,14 @@ const char *queryBlockReply =
- "            },"
- "            \"tray_open\": false,"
- "            \"type\": \"unknown\""
-+"        },"
-+"        {"
-+"            \"io-status\": \"ok\","
-+"            \"device\": \"drive-ide0-1-1\","
-+"            \"locked\": false,"
-+"            \"removable\": true,"
-+"            \"tray_open\": false,"
-+"            \"type\": \"unknown\""
- "        }"
- "    ],"
- "    \"id\": \"libvirt-10\""
-@@ -1404,12 +1412,27 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const void *data)
- 
-     info->locked = true;
-     info->removable = true;
-+    info->tray = true;
-+
-     if (virHashAddEntry(expectedBlockDevices, "ide0-1-0", info) < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                        "Unable to create expectedBlockDevices hash table");
-         goto cleanup;
-     }
- 
-+    if (VIR_ALLOC(info) < 0)
-+        goto cleanup;
-+
-+    info->removable = true;
-+    info->tray = true;
-+    info->empty = true;
-+
-+    if (virHashAddEntry(expectedBlockDevices, "ide0-1-1", info) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       "Unable to create expectedBlockDevices hash table");
-+        goto cleanup;
-+    }
-+
-     if (qemuMonitorTestAddItem(test, "query-block", queryBlockReply) < 0)
-         goto cleanup;
- 
diff --git a/0109-qemu-Move-and-rename-qemuDomainCheckEjectableMedia-t.patch b/0109-qemu-Move-and-rename-qemuDomainCheckEjectableMedia-t.patch
deleted file mode 100644
index dd2e57c..0000000
--- a/0109-qemu-Move-and-rename-qemuDomainCheckEjectableMedia-t.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 23 May 2016 14:00:35 +0200
-Subject: [PATCH] qemu: Move and rename qemuDomainCheckEjectableMedia to
- qemuProcessRefreshDisks
-
-Move it to a more sane place since it's refreshing data about disks.
-
-(cherry picked from commit d9bee413ade28e1e43ef222c7aaaa3c6d6fda0f1)
----
- src/qemu/qemu_hotplug.c   | 48 ----------------------------------------
- src/qemu/qemu_hotplug.h   |  3 ---
- src/qemu/qemu_migration.c |  2 +-
- src/qemu/qemu_process.c   | 56 ++++++++++++++++++++++++++++++++++++++++++++---
- src/qemu/qemu_process.h   |  5 +++++
- 5 files changed, 59 insertions(+), 55 deletions(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index b8ab068..a58dd57 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -267,54 +267,6 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
-     goto cleanup;
- }
- 
--int
--qemuDomainCheckEjectableMedia(virQEMUDriverPtr driver,
--                              virDomainObjPtr vm,
--                              qemuDomainAsyncJob asyncJob)
--{
--    qemuDomainObjPrivatePtr priv = vm->privateData;
--    virHashTablePtr table = NULL;
--    int ret = -1;
--    size_t i;
--
--    if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) {
--        table = qemuMonitorGetBlockInfo(priv->mon);
--        if (qemuDomainObjExitMonitor(driver, vm) < 0)
--            goto cleanup;
--    }
--
--    if (!table)
--        goto cleanup;
--
--    for (i = 0; i < vm->def->ndisks; i++) {
--        virDomainDiskDefPtr disk = vm->def->disks[i];
--        struct qemuDomainDiskInfo *info;
--
--        if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK ||
--            disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) {
--                 continue;
--        }
--
--        info = qemuMonitorBlockInfoLookup(table, disk->info.alias);
--        if (!info)
--            goto cleanup;
--
--        if (info->tray_open) {
--            if (virDomainDiskGetSource(disk))
--                ignore_value(virDomainDiskSetSource(disk, NULL));
--
--            disk->tray_status = VIR_DOMAIN_DISK_TRAY_OPEN;
--        } else {
--            disk->tray_status = VIR_DOMAIN_DISK_TRAY_CLOSED;
--        }
--    }
--
--    ret = 0;
--
-- cleanup:
--    virHashFree(table);
--    return ret;
--}
- 
- static int
- qemuDomainAttachVirtioDiskDevice(virConnectPtr conn,
-diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h
-index 4140da3..fe7c563 100644
---- a/src/qemu/qemu_hotplug.h
-+++ b/src/qemu/qemu_hotplug.h
-@@ -34,9 +34,6 @@ int qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
-                                    virDomainDiskDefPtr disk,
-                                    virStorageSourcePtr newsrc,
-                                    bool force);
--int qemuDomainCheckEjectableMedia(virQEMUDriverPtr driver,
--                                  virDomainObjPtr vm,
--                                  qemuDomainAsyncJob asyncJob);
- int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver,
-                                      virDomainObjPtr vm,
-                                      virDomainControllerDefPtr controller);
-diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index 8d2ca3b..6808a9c 100644
---- a/src/qemu/qemu_migration.c
-+++ b/src/qemu/qemu_migration.c
-@@ -3273,7 +3273,7 @@ qemuMigrationBegin(virConnectPtr conn,
-      * We don't want to require them on the destination.
-      */
-     if (!(flags & VIR_MIGRATE_OFFLINE) &&
--        qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0)
-+        qemuProcessRefreshDisks(driver, vm, asyncJob) < 0)
-         goto endjob;
- 
-     if (!(xml = qemuMigrationBeginPhase(driver, vm, xmlin, dname,
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 2698178..f13d902 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -3603,7 +3603,7 @@ qemuProcessReconnect(void *opaque)
-     if (qemuProcessFiltersInstantiate(obj->def))
-         goto error;
- 
--    if (qemuDomainCheckEjectableMedia(driver, obj, QEMU_ASYNC_JOB_NONE) < 0)
-+    if (qemuProcessRefreshDisks(driver, obj, QEMU_ASYNC_JOB_NONE) < 0)
-         goto error;
- 
-     if (qemuRefreshVirtioChannelState(driver, obj) < 0)
-@@ -5457,8 +5457,8 @@ qemuProcessLaunch(virConnectPtr conn,
-     if (qemuProcessUpdateVideoRamSize(driver, vm, asyncJob) < 0)
-         goto cleanup;
- 
--    VIR_DEBUG("Updating ejectable media status");
--    if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0)
-+    VIR_DEBUG("Updating disk data");
-+    if (qemuProcessRefreshDisks(driver, vm, asyncJob) < 0)
-         goto cleanup;
- 
-     if (flags & VIR_QEMU_PROCESS_START_AUTODESTROY &&
-@@ -6380,3 +6380,53 @@ bool qemuProcessAutoDestroyActive(virQEMUDriverPtr driver,
-     cb = virCloseCallbacksGet(driver->closeCallbacks, vm, NULL);
-     return cb == qemuProcessAutoDestroy;
- }
-+
-+
-+int
-+qemuProcessRefreshDisks(virQEMUDriverPtr driver,
-+                        virDomainObjPtr vm,
-+                        qemuDomainAsyncJob asyncJob)
-+{
-+    qemuDomainObjPrivatePtr priv = vm->privateData;
-+    virHashTablePtr table = NULL;
-+    int ret = -1;
-+    size_t i;
-+
-+    if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) {
-+        table = qemuMonitorGetBlockInfo(priv->mon);
-+        if (qemuDomainObjExitMonitor(driver, vm) < 0)
-+            goto cleanup;
-+    }
-+
-+    if (!table)
-+        goto cleanup;
-+
-+    for (i = 0; i < vm->def->ndisks; i++) {
-+        virDomainDiskDefPtr disk = vm->def->disks[i];
-+        struct qemuDomainDiskInfo *info;
-+
-+        if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK ||
-+            disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) {
-+                 continue;
-+        }
-+
-+        info = qemuMonitorBlockInfoLookup(table, disk->info.alias);
-+        if (!info)
-+            goto cleanup;
-+
-+        if (info->tray_open) {
-+            if (virDomainDiskGetSource(disk))
-+                ignore_value(virDomainDiskSetSource(disk, NULL));
-+
-+            disk->tray_status = VIR_DOMAIN_DISK_TRAY_OPEN;
-+        } else {
-+            disk->tray_status = VIR_DOMAIN_DISK_TRAY_CLOSED;
-+        }
-+    }
-+
-+    ret = 0;
-+
-+ cleanup:
-+    virHashFree(table);
-+    return ret;
-+}
-diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
-index d5f50f2..7c67274 100644
---- a/src/qemu/qemu_process.h
-+++ b/src/qemu/qemu_process.h
-@@ -193,4 +193,9 @@ int qemuProcessSetupIOThread(virDomainObjPtr vm,
- 
- int qemuRefreshVirtioChannelState(virQEMUDriverPtr driver,
-                                   virDomainObjPtr vm);
-+
-+int qemuProcessRefreshDisks(virQEMUDriverPtr driver,
-+                            virDomainObjPtr vm,
-+                            qemuDomainAsyncJob asyncJob);
-+
- #endif /* __QEMU_PROCESS_H__ */
diff --git a/0110-qemu-process-Fix-and-improve-disk-data-extraction.patch b/0110-qemu-process-Fix-and-improve-disk-data-extraction.patch
deleted file mode 100644
index 15a4d8e..0000000
--- a/0110-qemu-process-Fix-and-improve-disk-data-extraction.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 19 May 2016 15:29:02 +0200
-Subject: [PATCH] qemu: process: Fix and improve disk data extraction
-
-Extract information for all disks and update tray state and source only
-for removable drives. Additionally store whether a drive is removable
-and whether it has a tray.
-
-(cherry picked from commit 894dc85fd1ebcd63d8c897b355c550e68a5f432d)
----
- src/qemu/qemu_domain.h  |  4 ++++
- src/qemu/qemu_monitor.c | 18 ------------------
- src/qemu/qemu_monitor.h |  3 ---
- src/qemu/qemu_process.c | 28 +++++++++++++++-------------
- 4 files changed, 19 insertions(+), 34 deletions(-)
-
-diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
-index fbf5b1c..15790ea 100644
---- a/src/qemu/qemu_domain.h
-+++ b/src/qemu/qemu_domain.h
-@@ -236,6 +236,10 @@ struct _qemuDomainDiskPrivate {
-     bool blockJobSync; /* the block job needs synchronized termination */
- 
-     bool migrating; /* the disk is being migrated */
-+
-+    /* information about the device */
-+    bool tray; /* device has tray */
-+    bool removable; /* device media can be removed/changed */
- };
- 
- struct qemuDomainDiskInfo {
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index 96eac14..c994fec 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -1807,24 +1807,6 @@ qemuMonitorGetBlockInfo(qemuMonitorPtr mon)
- }
- 
- 
--struct qemuDomainDiskInfo *
--qemuMonitorBlockInfoLookup(virHashTablePtr blockInfo,
--                           const char *dev)
--{
--    struct qemuDomainDiskInfo *info;
--
--    VIR_DEBUG("blockInfo=%p dev=%s", blockInfo, NULLSTR(dev));
--
--    if (!(info = virHashLookup(blockInfo, dev))) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("cannot find info for device '%s'"),
--                       NULLSTR(dev));
--    }
--
--    return info;
--}
--
--
- /**
-  * qemuMonitorGetAllBlockStatsInfo:
-  * @mon: monitor object
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index 7906361..1a9d009 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -385,9 +385,6 @@ int qemuMonitorSetMemoryStatsPeriod(qemuMonitorPtr mon,
- 
- int qemuMonitorBlockIOStatusToError(const char *status);
- virHashTablePtr qemuMonitorGetBlockInfo(qemuMonitorPtr mon);
--struct qemuDomainDiskInfo *
--qemuMonitorBlockInfoLookup(virHashTablePtr blockInfo,
--                           const char *dev_name);
- 
- typedef struct _qemuBlockStats qemuBlockStats;
- typedef qemuBlockStats *qemuBlockStatsPtr;
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index f13d902..aa56ccd 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -6403,25 +6403,27 @@ qemuProcessRefreshDisks(virQEMUDriverPtr driver,
- 
-     for (i = 0; i < vm->def->ndisks; i++) {
-         virDomainDiskDefPtr disk = vm->def->disks[i];
-+        qemuDomainDiskPrivatePtr diskpriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
-         struct qemuDomainDiskInfo *info;
- 
--        if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK ||
--            disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) {
--                 continue;
--        }
--
--        info = qemuMonitorBlockInfoLookup(table, disk->info.alias);
--        if (!info)
--            goto cleanup;
-+        if (!(info = virHashLookup(table, disk->info.alias)))
-+            continue;
- 
--        if (info->tray_open) {
--            if (virDomainDiskGetSource(disk))
-+        if (info->removable) {
-+            if (info->empty)
-                 ignore_value(virDomainDiskSetSource(disk, NULL));
- 
--            disk->tray_status = VIR_DOMAIN_DISK_TRAY_OPEN;
--        } else {
--            disk->tray_status = VIR_DOMAIN_DISK_TRAY_CLOSED;
-+            if (info->tray) {
-+                if (info->tray_open)
-+                    disk->tray_status = VIR_DOMAIN_DISK_TRAY_OPEN;
-+                else
-+                    disk->tray_status = VIR_DOMAIN_DISK_TRAY_CLOSED;
-+            }
-         }
-+
-+        /* fill in additional data */
-+        diskpriv->removable = info->removable;
-+        diskpriv->tray = info->tray;
-     }
- 
-     ret = 0;
diff --git a/0111-qemu-hotplug-Skip-waiting-for-tray-opening-if-qemu-d.patch b/0111-qemu-hotplug-Skip-waiting-for-tray-opening-if-qemu-d.patch
deleted file mode 100644
index 2153c38..0000000
--- a/0111-qemu-hotplug-Skip-waiting-for-tray-opening-if-qemu-d.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Fri, 29 Apr 2016 13:49:13 +0200
-Subject: [PATCH] qemu: hotplug: Skip waiting for tray opening if qemu doesn't
- notify us
-
-If qemu doesn't support DEVICE_TRAY_MOVED event the code that attempts
-to change media would attempt to re-eject the tray even if it wouldn't
-be notified when the tray opened. Add a capability bit and skip retrying
-for old qemus.
-
-(cherry picked from commit 833ae6b4356934e7b779c4be01bd2bf051930dde)
----
- src/qemu/qemu_capabilities.c                  | 2 ++
- src/qemu/qemu_capabilities.h                  | 1 +
- src/qemu/qemu_hotplug.c                       | 9 +++++++++
- tests/qemucapabilitiesdata/caps_1.2.2-1.caps  | 1 +
- tests/qemucapabilitiesdata/caps_1.3.1-1.caps  | 1 +
- tests/qemucapabilitiesdata/caps_1.4.2-1.caps  | 1 +
- tests/qemucapabilitiesdata/caps_1.5.3-1.caps  | 1 +
- tests/qemucapabilitiesdata/caps_1.6.0-1.caps  | 1 +
- tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 +
- tests/qemucapabilitiesdata/caps_2.1.1-1.caps  | 1 +
- tests/qemucapabilitiesdata/caps_2.4.0-1.caps  | 1 +
- tests/qemucapabilitiesdata/caps_2.5.0-1.caps  | 1 +
- tests/qemucapabilitiesdata/caps_2.6.0-1.caps  | 1 +
- 13 files changed, 22 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 57e2056..94a357f 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -321,6 +321,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
-               "qxl-vga.vram64_size_mb", /* 215 */
-               "chardev-logfile",
-               "debug-threads",
-+              "device-tray-moved-event",
-     );
- 
- 
-@@ -1493,6 +1494,7 @@ struct virQEMUCapsStringFlags virQEMUCapsEvents[] = {
-     { "DEVICE_DELETED", QEMU_CAPS_DEVICE_DEL_EVENT },
-     { "MIGRATION", QEMU_CAPS_MIGRATION_EVENT },
-     { "VSERPORT_CHANGE", QEMU_CAPS_VSERPORT_CHANGE },
-+    { "DEVICE_TRAY_MOVED", QEMU_CAPS_DEVICE_TRAY_MOVED },
- };
- 
- struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index caf3d1b..c942be5 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -351,6 +351,7 @@ typedef enum {
-     QEMU_CAPS_QXL_VGA_VRAM64, /* -device qxl-vga.vram64_size_mb */
-     QEMU_CAPS_CHARDEV_LOGFILE, /* -chardev logfile=xxxx */
-     QEMU_CAPS_NAME_DEBUG_THREADS, /* Is -name debug-threads= available */
-+    QEMU_CAPS_DEVICE_TRAY_MOVED, /* DEVICE_TRAY_MOVED event */
- 
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index a58dd57..40d5683 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -202,6 +202,15 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
-         if (qemuDomainObjExitMonitor(driver, vm) < 0)
-             goto cleanup;
- 
-+        /* skip all retrying if qemu doesn't notify us on tray change */
-+        if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_TRAY_MOVED)) {
-+            if (rc == 0)
-+                break;
-+
-+            if (rc < 0)
-+                goto error;
-+        }
-+
-         if (rc < 0) {
-             /* we've already tried, error out */
-             if (ejectRetry)
-diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
-index 2e452ea..5fdc791 100644
---- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
-+++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
-@@ -114,4 +114,5 @@
-     <flag name='virtio-net'/>
-     <flag name='qxl.vram64_size_mb'/>
-     <flag name='qxl-vga.vram64_size_mb'/>
-+    <flag name='device-tray-moved-event'/>
-   </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
-index 5ad56aa..9402e68 100644
---- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
-+++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
-@@ -129,4 +129,5 @@
-     <flag name='virtio-net'/>
-     <flag name='qxl.vram64_size_mb'/>
-     <flag name='qxl-vga.vram64_size_mb'/>
-+    <flag name='device-tray-moved-event'/>
-   </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
-index d0341fd..1944dc3 100644
---- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
-+++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
-@@ -130,4 +130,5 @@
-     <flag name='virtio-net'/>
-     <flag name='qxl.vram64_size_mb'/>
-     <flag name='qxl-vga.vram64_size_mb'/>
-+    <flag name='device-tray-moved-event'/>
-   </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
-index 93ea687..d9d35ce 100644
---- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
-+++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
-@@ -139,4 +139,5 @@
-     <flag name='virtio-net'/>
-     <flag name='qxl.vram64_size_mb'/>
-     <flag name='qxl-vga.vram64_size_mb'/>
-+    <flag name='device-tray-moved-event'/>
-   </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
-index c25b076..1a52a6f 100644
---- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
-+++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
-@@ -145,4 +145,5 @@
-     <flag name='virtio-net'/>
-     <flag name='qxl.vram64_size_mb'/>
-     <flag name='qxl-vga.vram64_size_mb'/>
-+    <flag name='device-tray-moved-event'/>
-   </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
-index 30b70e9..973bdf5 100644
---- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
-+++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
-@@ -145,4 +145,5 @@
-     <flag name='virtio-net'/>
-     <flag name='qxl.vram64_size_mb'/>
-     <flag name='qxl-vga.vram64_size_mb'/>
-+    <flag name='device-tray-moved-event'/>
-   </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
-index 59d0323..254eb2a 100644
---- a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
-+++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
-@@ -163,4 +163,5 @@
-     <flag name='qxl.vram64_size_mb'/>
-     <flag name='qxl-vga.vram64_size_mb'/>
-     <flag name='debug-threads'/>
-+    <flag name='device-tray-moved-event'/>
-   </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
-index efbf9af..bb76ddb 100644
---- a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
-+++ b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
-@@ -174,4 +174,5 @@
-     <flag name='qxl.vram64_size_mb'/>
-     <flag name='qxl-vga.vram64_size_mb'/>
-     <flag name='debug-threads'/>
-+    <flag name='device-tray-moved-event'/>
-   </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
-index 5fd3bce..0734fbd 100644
---- a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
-+++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
-@@ -175,4 +175,5 @@
-     <flag name='qxl.vram64_size_mb'/>
-     <flag name='qxl-vga.vram64_size_mb'/>
-     <flag name='debug-threads'/>
-+    <flag name='device-tray-moved-event'/>
-   </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.caps b/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
-index 549759c..7c9eb13 100644
---- a/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
-+++ b/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
-@@ -178,4 +178,5 @@
-     <flag name='qxl.vram64_size_mb'/>
-     <flag name='qxl-vga.vram64_size_mb'/>
-     <flag name='debug-threads'/>
-+    <flag name='device-tray-moved-event'/>
-   </qemuCaps>
diff --git a/0112-qemu-hotplug-Report-error-if-we-hit-tray-status-time.patch b/0112-qemu-hotplug-Report-error-if-we-hit-tray-status-time.patch
deleted file mode 100644
index d49cae3..0000000
--- a/0112-qemu-hotplug-Report-error-if-we-hit-tray-status-time.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Cole Robinson <crobinso@redhat.com>
-Date: Mon, 2 May 2016 19:07:34 -0400
-Subject: [PATCH] qemu: hotplug: Report error if we hit tray status timeout
-
-If we exceed the timeout waiting for the tray status to change,
-we don't report an error. Fix it
-
-(cherry picked from commit 1fad65d49aae364576bd91352a001249510f8d4e)
----
- src/qemu/qemu_hotplug.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 40d5683..12653e3 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -225,7 +225,13 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
-             goto error;
- 
-         while (disk->tray_status != VIR_DOMAIN_DISK_TRAY_OPEN) {
--            if (virDomainObjWaitUntil(vm, now + CHANGE_MEDIA_TIMEOUT) != 0)
-+            int wait_rc = virDomainObjWaitUntil(vm, now + CHANGE_MEDIA_TIMEOUT);
-+            if (wait_rc > 0) {
-+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                               _("timed out waiting for "
-+                                 "disk tray status update"));
-+            }
-+            if (wait_rc != 0)
-                 goto error;
-         }
-     } while (rc < 0);
diff --git a/0113-qemu-hotplug-Extract-code-for-waiting-for-tray-eject.patch b/0113-qemu-hotplug-Extract-code-for-waiting-for-tray-eject.patch
deleted file mode 100644
index e8fa6a9..0000000
--- a/0113-qemu-hotplug-Extract-code-for-waiting-for-tray-eject.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 23 May 2016 14:50:17 +0200
-Subject: [PATCH] qemu: hotplug: Extract code for waiting for tray eject
-
-The code grew rather convoluted. Extract it to a separate function.
-
-(cherry picked from commit 0aa19f35e0f3c1712f2569986d4d0a93b488c35c)
----
- src/qemu/qemu_hotplug.c | 85 ++++++++++++++++++++++++++-----------------------
- 1 file changed, 46 insertions(+), 39 deletions(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 12653e3..d180b38 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -144,6 +144,40 @@ qemuDomainPrepareDisk(virQEMUDriverPtr driver,
- }
- 
- 
-+static int
-+qemuHotplugWaitForTrayEject(virQEMUDriverPtr driver,
-+                            virDomainObjPtr vm,
-+                            virDomainDiskDefPtr disk,
-+                            const char *driveAlias,
-+                            bool force)
-+{
-+    unsigned long long now;
-+    int rc;
-+
-+    if (virTimeMillisNow(&now) < 0)
-+        return -1;
-+
-+    while (disk->tray_status != VIR_DOMAIN_DISK_TRAY_OPEN) {
-+        if ((rc = virDomainObjWaitUntil(vm, now + CHANGE_MEDIA_TIMEOUT)) < 0)
-+            return -1;
-+
-+        if (rc > 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                           _("timed out waiting for disk tray status update"));
-+            return -1;
-+        }
-+    }
-+
-+    /* re-issue ejection command to pop out the media */
-+    qemuDomainObjEnterMonitor(driver, vm);
-+    rc = qemuMonitorEjectMedia(qemuDomainGetMonitor(vm), driveAlias, force);
-+    if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
-+
- /**
-  * qemuDomainChangeEjectableMedia:
-  * @driver: qemu driver structure
-@@ -173,8 +207,6 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
-     qemuDomainObjPrivatePtr priv = vm->privateData;
-     const char *format = NULL;
-     char *sourcestr = NULL;
--    bool ejectRetry = false;
--    unsigned long long now;
- 
-     if (!disk->info.alias) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-@@ -196,45 +228,20 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
-     if (!(driveAlias = qemuDeviceDriveHostAlias(disk, priv->qemuCaps)))
-         goto error;
- 
--    do {
--        qemuDomainObjEnterMonitor(driver, vm);
--        rc = qemuMonitorEjectMedia(priv->mon, driveAlias, force);
--        if (qemuDomainObjExitMonitor(driver, vm) < 0)
--            goto cleanup;
--
--        /* skip all retrying if qemu doesn't notify us on tray change */
--        if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_TRAY_MOVED)) {
--            if (rc == 0)
--                break;
--
--            if (rc < 0)
--                goto error;
--        }
--
--        if (rc < 0) {
--            /* we've already tried, error out */
--            if (ejectRetry)
--                goto error;
--
--            ejectRetry = true;
--            VIR_DEBUG("tray may be locked, wait for the guest to unlock "
--                      "the tray and try to eject it again");
--        }
-+    qemuDomainObjEnterMonitor(driver, vm);
-+    rc = qemuMonitorEjectMedia(priv->mon, driveAlias, force);
-+    if (qemuDomainObjExitMonitor(driver, vm) < 0)
-+        goto cleanup;
- 
--        if (virTimeMillisNow(&now) < 0)
-+    /* If the tray change event is supported wait for it to open. */
-+    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_TRAY_MOVED)) {
-+        if (qemuHotplugWaitForTrayEject(driver, vm, disk, driveAlias, force) < 0)
-             goto error;
--
--        while (disk->tray_status != VIR_DOMAIN_DISK_TRAY_OPEN) {
--            int wait_rc = virDomainObjWaitUntil(vm, now + CHANGE_MEDIA_TIMEOUT);
--            if (wait_rc > 0) {
--                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
--                               _("timed out waiting for "
--                                 "disk tray status update"));
--            }
--            if (wait_rc != 0)
--                goto error;
--        }
--    } while (rc < 0);
-+    } else  {
-+        /* otherwise report possible errors from the attempt to eject the media*/
-+        if (rc < 0)
-+            goto error;
-+    }
- 
-     if (!virStorageSourceIsEmpty(newsrc)) {
-         if (qemuGetDriveSourceString(newsrc, conn, &sourcestr) < 0)
diff --git a/0114-qemu-hotplug-Fix-error-reported-when-cdrom-tray-is-l.patch b/0114-qemu-hotplug-Fix-error-reported-when-cdrom-tray-is-l.patch
deleted file mode 100644
index 43cd099..0000000
--- a/0114-qemu-hotplug-Fix-error-reported-when-cdrom-tray-is-l.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 23 May 2016 16:32:06 +0200
-Subject: [PATCH] qemu: hotplug: Fix error reported when cdrom tray is locked
-
-Commit 1fad65d49aae364576bd91352a001249510f8d4e used a really big hammer
-and overwrote the error message that might be reported by qemu if the
-tray is locked. Fix it by reporting the error only if no error is
-currently set.
-
-Error after commit mentioned above:
-error: internal error: timed out waiting for disk tray status update
-
-New error:
-error: internal error: unable to execute QEMU command 'eject': Tray of
-device 'drive-ide0-0-0' is not open
-
-(cherry picked from commit 2e75da42e41af0cd48ca6f75d0606b40a366cc54)
----
- src/qemu/qemu_hotplug.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index d180b38..9f42e94 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -162,8 +162,12 @@ qemuHotplugWaitForTrayEject(virQEMUDriverPtr driver,
-             return -1;
- 
-         if (rc > 0) {
--            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
--                           _("timed out waiting for disk tray status update"));
-+            /* the caller called qemuMonitorEjectMedia which usually reports an
-+             * error. Report the failure in an off-chance that it didn't. */
-+            if (!virGetLastError()) {
-+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                               _("timed out waiting for disk tray status update"));
-+            }
-             return -1;
-         }
-     }
diff --git a/0115-qemu-hotplug-wait-for-the-tray-to-eject-only-for-dri.patch b/0115-qemu-hotplug-wait-for-the-tray-to-eject-only-for-dri.patch
deleted file mode 100644
index 954f164..0000000
--- a/0115-qemu-hotplug-wait-for-the-tray-to-eject-only-for-dri.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 19 May 2016 15:30:12 +0200
-Subject: [PATCH] qemu: hotplug: wait for the tray to eject only for drives
- with a tray
-
-Use the detected tray presence flag to trigger the tray waiting code
-only if the given storage device in qemu reports to have a tray.
-
-This is necessary as the floppy device lost it's tray as of qemu commit:
-
-commit abb3e55b5b718d6392441f56ba0729a62105ac56
-Author: Max Reitz <mreitz@redhat.com>
-Date:   Fri Jan 29 20:49:12 2016 +0100
-
-    Revert "hw/block/fdc: Implement tray status"
-
-(cherry picked from commit 72a7ff6b507bcf389cc493ac0ba07d32de266d6e)
----
- src/qemu/qemu_hotplug.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 9f42e94..4db180b 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -209,6 +209,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
-     int ret = -1, rc;
-     char *driveAlias = NULL;
-     qemuDomainObjPrivatePtr priv = vm->privateData;
-+    qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
-     const char *format = NULL;
-     char *sourcestr = NULL;
- 
-@@ -237,8 +238,9 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
-     if (qemuDomainObjExitMonitor(driver, vm) < 0)
-         goto cleanup;
- 
--    /* If the tray change event is supported wait for it to open. */
--    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_TRAY_MOVED)) {
-+    /* If the tray is present and tray change event is supported wait for it to open. */
-+    if (diskPriv->tray &&
-+        virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_TRAY_MOVED)) {
-         if (qemuHotplugWaitForTrayEject(driver, vm, disk, driveAlias, force) < 0)
-             goto error;
-     } else  {
diff --git a/libvirt.spec b/libvirt.spec
index b5a7a7a..e6b540a 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -372,8 +372,8 @@
 
 Summary: Library providing a simple virtualization API
 Name: libvirt
-Version: 1.3.3.1
-Release: 4%{?dist}%{?extra_release}
+Version: 1.3.3.2
+Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -384,35 +384,6 @@ URL: http://libvirt.org/
 %endif
 Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz
 
-# Fix libxl video config via virt-install (bz #1334557)
-Patch0001: 0001-conf-reduce-indentation-in-virDomainDefAddImplicitVi.patch
-Patch0002: 0002-conf-use-VIR_APPEND_ELEMENT-in-virDomainDefAddImplic.patch
-Patch0003: 0003-Move-virDomainDefPostParseInternal-after-virDomainDe.patch
-Patch0004: 0004-Call-per-device-post-parse-callback-even-on-implicit.patch
-Patch0005: 0005-Fill-out-default-vram-in-DeviceDefPostParse.patch
-Patch0006: 0006-Fix-tests-to-include-video-ram-size.patch
-Patch0007: 0007-libxl-don-t-attempt-to-probe-a-non-existent-emulator.patch
-Patch0008: 0008-xlconfigtests-use-qemu-xen-in-all-test-data-files.patch
-
-# Advertise fedora edk2 firmware builds to apps (bz #1335395)
-Patch0101: 0101-spec-Advertise-nvram-paths-of-official-fedora-edk2-b.patch
-# Don't disable auto_login of non-libvirt-managed iscsi (bz #1331552)
-Patch0102: 0102-util-Add-exitstatus-parameter-to-virCommandRunRegex.patch
-Patch0103: 0103-iscsi-Add-exit-status-checking-for-virISCSIGetSessio.patch
-Patch0104: 0104-util-Remove-disabling-of-autologin-for-iscsi-targets.patch
-Patch0105: 0105-iscsi-Remove-initiatoriqn-from-virISCSIScanTargets.patch
-# Fix floppy media change (bz #1341998)
-Patch0106: 0106-qemu-process-Refresh-ejectable-media-tray-state-on-V.patch
-Patch0107: 0107-qemu-Move-struct-qemuDomainDiskInfo-to-qemu_domain.h.patch
-Patch0108: 0108-qemu-Extract-more-information-about-qemu-drives.patch
-Patch0109: 0109-qemu-Move-and-rename-qemuDomainCheckEjectableMedia-t.patch
-Patch0110: 0110-qemu-process-Fix-and-improve-disk-data-extraction.patch
-Patch0111: 0111-qemu-hotplug-Skip-waiting-for-tray-opening-if-qemu-d.patch
-Patch0112: 0112-qemu-hotplug-Report-error-if-we-hit-tray-status-time.patch
-Patch0113: 0113-qemu-hotplug-Extract-code-for-waiting-for-tray-eject.patch
-Patch0114: 0114-qemu-hotplug-Fix-error-reported-when-cdrom-tray-is-l.patch
-Patch0115: 0115-qemu-hotplug-wait-for-the-tray-to-eject-only-for-dri.patch
-
 %if %{with_libvirtd}
 Requires: libvirt-daemon = %{version}-%{release}
     %if %{with_network}
@@ -946,9 +917,9 @@ Requires: gzip
 Requires: bzip2
 Requires: lzop
 Requires: xz
-%if 0%{?fedora} >= 24
+            %if 0%{?fedora} >= 24
 Requires: systemd-container
-%endif
+            %endif
 
 %description daemon-driver-qemu
 The qemu driver plugin for the libvirtd daemon, providing
@@ -964,9 +935,9 @@ Group: Development/Libraries
 Requires: libvirt-daemon = %{version}-%{release}
 # There really is a hard cross-driver dependency here
 Requires: libvirt-daemon-driver-network = %{version}-%{release}
-%if 0%{?fedora} >= 24
+            %if 0%{?fedora} >= 24
 Requires: systemd-container
-%endif
+            %endif
 
 %description daemon-driver-lxc
 The LXC driver plugin for the libvirtd daemon, providing
@@ -2444,6 +2415,16 @@ exit 0
 
 
 %changelog
+* Mon Jul 18 2016 Cole Robinson <crobinso@redhat.com> - 1.3.3.2-1
+- Rebased to version 1.3.3.2
+- Fix xen default video device config (bz #1336629)
+- Don't reject duplicate disk serials (bz #1349895)
+- Fix LXC cgroup name mismatch (bz #1350139)
+- Fix managed save/restore with VM USB Keyboard (bz #1353222)
+- Missing dep on systemd-container (bz #1355784)
+- CVE-2016-5008: Setting empty VNC password allows access to unauthorized
+  users (bz #1351516)
+
 * Thu Jun 23 2016 Cole Robinson <crobinso@redhat.com> - 1.3.3.1-4
 - Don't disable auto_login of non-libvirt-managed iscsi (bz #1331552)
 - Fix floppy media change (bz #1341998)
diff --git a/sources b/sources
index c30d876..de11792 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-86335dd5b1cee57e04ea4622e61ddac2  libvirt-1.3.3.1.tar.gz
+4673c7bef9187434cc4e7af5588c0c5a  libvirt-1.3.3.2.tar.gz