diff --git a/3e428670-post-parse-implicit-video.patch b/3e428670-post-parse-implicit-video.patch new file mode 100644 index 0000000..2b394cf --- /dev/null +++ b/3e428670-post-parse-implicit-video.patch @@ -0,0 +1,84 @@ +commit 3e4286703273b06a21ae07f3e76a66f9661199dc +Author: Ján Tomko +Date: Wed May 11 12:13:51 2016 +0200 + + 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 + +Index: libvirt-1.3.4/src/conf/domain_conf.c +=================================================================== +--- libvirt-1.3.4.orig/src/conf/domain_conf.c ++++ libvirt-1.3.4/src/conf/domain_conf.c +@@ -4321,8 +4321,7 @@ virDomainDefPostParseDeviceIterator(virD + + 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) { +@@ -4331,7 +4330,7 @@ virDomainDefPostParseInternal(virDomainD + return -1; + } + +- if (virDomainDefPostParseMemory(def, parseFlags) < 0) ++ if (virDomainDefPostParseMemory(def, data->parseFlags) < 0) + return -1; + + if (virDomainDefRejectDuplicateControllers(def) < 0) +@@ -4346,11 +4345,22 @@ virDomainDefPostParseInternal(virDomainD + 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); + +@@ -4388,7 +4398,7 @@ virDomainDefPostParse(virDomainDefPtr de + 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/400e716d-libxl-noprope-emulator.patch b/400e716d-libxl-noprope-emulator.patch new file mode 100644 index 0000000..f75a5c5 --- /dev/null +++ b/400e716d-libxl-noprope-emulator.patch @@ -0,0 +1,37 @@ +commit 400e716d7d8371fa718c27bb4f05b9a68929e64a +Author: Jim Fehlig +Date: Thu May 12 14:40:28 2016 -0600 + + libxl: don't attempt to probe a non-existent emulator + + When probing the 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 + +Index: libvirt-1.3.4/src/libxl/libxl_conf.c +=================================================================== +--- libvirt-1.3.4.orig/src/libxl/libxl_conf.c ++++ libvirt-1.3.4/src/libxl/libxl_conf.c +@@ -916,6 +916,9 @@ libxlDomainGetEmulatorType(const virDoma + + 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/538012c8-default-vram.patch b/538012c8-default-vram.patch new file mode 100644 index 0000000..c925a8d --- /dev/null +++ b/538012c8-default-vram.patch @@ -0,0 +1,81 @@ +commit 538012c8a30230065d1bfe09892279dd8b89193f +Author: Ján Tomko +Date: Wed May 11 12:39:52 2016 +0200 + + 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. + +Index: libvirt-1.3.4/src/conf/domain_conf.c +=================================================================== +--- libvirt-1.3.4.orig/src/conf/domain_conf.c ++++ libvirt-1.3.4/src/conf/domain_conf.c +@@ -4155,6 +4155,12 @@ virDomainDeviceDefPostParseInternal(virD + + 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); + } +@@ -11970,10 +11976,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: +@@ -12152,8 +12154,6 @@ virDomainVideoDefParseXML(xmlNodePtr nod + _("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) { +@@ -12162,8 +12162,6 @@ virDomainVideoDefParseXML(xmlNodePtr nod + _("cannot parse video vram '%s'"), vram); + goto error; + } +- } else { +- def->vram = virDomainVideoDefaultRAM(dom, def->type); + } + + if (vram64) { +@@ -18612,7 +18610,6 @@ virDomainDefAddImplicitVideo(virDomainDe + _("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; +Index: libvirt-1.3.4/src/qemu/qemu_parse_command.c +=================================================================== +--- libvirt-1.3.4.orig/src/qemu/qemu_parse_command.c ++++ libvirt-1.3.4/src/qemu/qemu_parse_command.c +@@ -2585,9 +2585,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/96b21fb0-vram-tests.patch b/96b21fb0-vram-tests.patch new file mode 100644 index 0000000..466847f --- /dev/null +++ b/96b21fb0-vram-tests.patch @@ -0,0 +1,958 @@ +commit 96b21fb0ecf8242ceb298607da61b5718511a388 +Author: Ján Tomko +Date: Thu May 12 14:19:52 2016 +0200 + + 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. + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-curmem.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-curmem.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-curmem.xml +@@ -35,7 +35,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml +@@ -51,7 +51,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml +@@ -44,7 +44,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml +@@ -47,7 +47,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml +@@ -47,7 +47,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml +@@ -44,7 +44,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml +@@ -45,7 +45,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml +@@ -49,7 +49,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml +@@ -56,7 +56,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml +@@ -52,7 +52,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml +@@ -52,7 +52,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml +@@ -50,7 +50,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml +@@ -52,7 +52,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml +@@ -50,7 +50,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml +@@ -50,7 +50,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml +@@ -54,7 +54,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml +@@ -54,7 +54,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml +@@ -54,7 +54,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml +@@ -52,7 +52,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml +@@ -46,7 +46,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml +@@ -46,7 +46,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml +@@ -45,7 +45,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml +@@ -45,7 +45,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml +@@ -44,7 +44,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml +@@ -44,7 +44,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv.xml +@@ -44,7 +44,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml +@@ -49,7 +49,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml +@@ -30,7 +30,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml +@@ -30,7 +30,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml +@@ -33,7 +33,7 @@ + + + + + +Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml ++++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml +@@ -48,7 +48,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-full.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-disk-positional-parms-full.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-full.xml +@@ -52,7 +52,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-partial.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-disk-positional-parms-partial.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-partial.xml +@@ -52,7 +52,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml +@@ -49,7 +49,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml +@@ -49,7 +49,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml +@@ -49,7 +49,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-multiusb.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-multiusb.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-multiusb.xml +@@ -48,7 +48,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-nohap.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-nohap.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-nohap.xml +@@ -56,7 +56,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-new-disk.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-new-disk.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-new-disk.xml +@@ -52,7 +52,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-rbd-multihost-noauth.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-rbd-multihost-noauth.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-rbd-multihost-noauth.xml +@@ -49,7 +49,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-spice-features.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-spice-features.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-spice-features.xml +@@ -48,7 +48,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-spice.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-spice.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-spice.xml +@@ -48,7 +48,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-vif-rate.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-vif-rate.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-vif-rate.xml +@@ -55,7 +55,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-escape-paths.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-escape-paths.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-escape-paths.xml +@@ -54,7 +54,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-default-feature.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-default-feature.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-default-feature.xml +@@ -48,7 +48,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-force-hpet.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-force-hpet.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-force-hpet.xml +@@ -48,7 +48,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-force-nohpet.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-force-nohpet.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-force-nohpet.xml +@@ -48,7 +48,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-localtime.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-localtime.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-localtime.xml +@@ -46,7 +46,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-net-netfront.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-net-netfront.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-net-netfront.xml +@@ -46,7 +46,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-new-cdrom.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-new-cdrom.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-new-cdrom.xml +@@ -46,7 +46,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-nohap.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-nohap.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-nohap.xml +@@ -47,7 +47,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml +@@ -51,7 +51,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml +@@ -58,7 +58,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml +@@ -54,7 +54,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-file.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-file.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-file.xml +@@ -54,7 +54,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-null.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-null.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-null.xml +@@ -52,7 +52,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-pipe.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-pipe.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-pipe.xml +@@ -54,7 +54,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-pty.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-pty.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-pty.xml +@@ -52,7 +52,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-stdio.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-stdio.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-stdio.xml +@@ -52,7 +52,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml +@@ -56,7 +56,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-tcp.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-tcp.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-tcp.xml +@@ -56,7 +56,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-udp.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-udp.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-udp.xml +@@ -56,7 +56,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-unix.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-unix.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-unix.xml +@@ -54,7 +54,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-sound.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-sound.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-sound.xml +@@ -48,7 +48,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-usbmouse.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-usbmouse.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-usbmouse.xml +@@ -47,7 +47,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-usbtablet.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-usbtablet.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-usbtablet.xml +@@ -47,7 +47,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-utc.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-utc.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-utc.xml +@@ -46,7 +46,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-no-source-cdrom.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-no-source-cdrom.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-no-source-cdrom.xml +@@ -49,7 +49,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-paravirt-net-e1000.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-paravirt-net-e1000.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-paravirt-net-e1000.xml +@@ -33,7 +33,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-paravirt-net-vifname.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-paravirt-net-vifname.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-paravirt-net-vifname.xml +@@ -34,7 +34,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml +@@ -32,7 +32,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-paravirt-new-pvfb.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-paravirt-new-pvfb.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-paravirt-new-pvfb.xml +@@ -32,7 +32,7 @@ + + + + + +Index: libvirt-1.3.4/tests/xmconfigdata/test-pci-devs.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xmconfigdata/test-pci-devs.xml ++++ libvirt-1.3.4/tests/xmconfigdata/test-pci-devs.xml +@@ -49,7 +49,7 @@ + + + + + diff --git a/b90c4b5f-tests-use-qemu-xen.patch b/b90c4b5f-tests-use-qemu-xen.patch new file mode 100644 index 0000000..0f655df --- /dev/null +++ b/b90c4b5f-tests-use-qemu-xen.patch @@ -0,0 +1,257 @@ +commit b90c4b5f505698d600303c5b4f03f5d229b329dd +Author: Jim Fehlig +Date: Thu May 12 14:40:29 2016 -0600 + + 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 + +Index: libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-full.cfg +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-disk-positional-parms-full.cfg ++++ libvirt-1.3.4/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 +Index: libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-full.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-disk-positional-parms-full.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-full.xml +@@ -19,7 +19,7 @@ + restart + restart + +- /usr/lib/xen/bin/qemu-dm ++ /usr/lib/xen/bin/qemu-system-i386 + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-partial.cfg +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-disk-positional-parms-partial.cfg ++++ libvirt-1.3.4/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 +Index: libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-partial.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-disk-positional-parms-partial.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-partial.xml +@@ -19,7 +19,7 @@ + restart + restart + +- /usr/lib/xen/bin/qemu-dm ++ /usr/lib/xen/bin/qemu-system-i386 + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-multiusb.cfg +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-multiusb.cfg ++++ libvirt-1.3.4/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 +Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-multiusb.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-multiusb.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-multiusb.xml +@@ -19,7 +19,7 @@ + restart + restart + +- /usr/lib/xen/bin/qemu-dm ++ /usr/lib/xen/bin/qemu-system-i386 + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-nohap.cfg +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-nohap.cfg ++++ libvirt-1.3.4/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 +Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-nohap.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-nohap.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-nohap.xml +@@ -20,7 +20,7 @@ + restart + restart + +- /usr/lib/xen/bin/qemu-dm ++ /usr/lib/xen/bin/qemu-system-i386 + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-new-disk.cfg +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-new-disk.cfg ++++ libvirt-1.3.4/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 +Index: libvirt-1.3.4/tests/xlconfigdata/test-new-disk.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-new-disk.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-new-disk.xml +@@ -19,7 +19,7 @@ + restart + restart + +- /usr/lib/xen/bin/qemu-dm ++ /usr/lib/xen/bin/qemu-system-i386 + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-rbd-multihost-noauth.cfg +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-rbd-multihost-noauth.cfg ++++ libvirt-1.3.4/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 +Index: libvirt-1.3.4/tests/xlconfigdata/test-rbd-multihost-noauth.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-rbd-multihost-noauth.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-rbd-multihost-noauth.xml +@@ -19,7 +19,7 @@ + restart + restart + +- /usr/lib/xen/bin/qemu-dm ++ /usr/lib/xen/bin/qemu-system-i386 + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-spice-features.cfg +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-spice-features.cfg ++++ libvirt-1.3.4/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" +Index: libvirt-1.3.4/tests/xlconfigdata/test-spice-features.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-spice-features.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-spice-features.xml +@@ -19,7 +19,7 @@ + restart + restart + +- /usr/lib/xen/bin/qemu-dm ++ /usr/lib/xen/bin/qemu-system-i386 + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-spice.cfg +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-spice.cfg ++++ libvirt-1.3.4/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" +Index: libvirt-1.3.4/tests/xlconfigdata/test-spice.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-spice.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-spice.xml +@@ -19,7 +19,7 @@ + restart + restart + +- /usr/lib/xen/bin/qemu-dm ++ /usr/lib/xen/bin/qemu-system-i386 + + + +Index: libvirt-1.3.4/tests/xlconfigdata/test-vif-rate.cfg +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-vif-rate.cfg ++++ libvirt-1.3.4/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 +Index: libvirt-1.3.4/tests/xlconfigdata/test-vif-rate.xml +=================================================================== +--- libvirt-1.3.4.orig/tests/xlconfigdata/test-vif-rate.xml ++++ libvirt-1.3.4/tests/xlconfigdata/test-vif-rate.xml +@@ -19,7 +19,7 @@ + restart + restart + +- /usr/lib/xen/bin/qemu-dm ++ /usr/lib/xen/bin/qemu-system-i386 + + + diff --git a/e4d131b8-mv-virDomainDefPostParseInternal.patch b/e4d131b8-mv-virDomainDefPostParseInternal.patch new file mode 100644 index 0000000..10f6b26 --- /dev/null +++ b/e4d131b8-mv-virDomainDefPostParseInternal.patch @@ -0,0 +1,105 @@ +commit e4d131b8cb12679814b6fda159281f472b615524 +Author: Ján Tomko +Date: Wed May 11 11:57:33 2016 +0200 + + Move virDomainDefPostParseInternal after virDomainDeviceDefPostParse + + Future commit will call DeviceDefPostParse on a device auto-added + in DomainDefPostParse. + +Index: libvirt-1.3.4/src/conf/domain_conf.c +=================================================================== +--- libvirt-1.3.4.orig/src/conf/domain_conf.c ++++ libvirt-1.3.4/src/conf/domain_conf.c +@@ -3905,45 +3905,6 @@ virDomainDefPostParseTimer(virDomainDefP + } + + +-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. + */ +@@ -4358,6 +4319,45 @@ virDomainDefPostParseDeviceIterator(virD + } + + ++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/libvirt.changes b/libvirt.changes index c11ba81..6b51727 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri May 13 17:23:24 UTC 2016 - jfehlig@suse.com + +- Fix default video RAM setting + e4d131b8-mv-virDomainDefPostParseInternal.patch, + 3e428670-post-parse-implicit-video.patch, + 538012c8-default-vram.patch, 96b21fb0-vram-tests.patch, + 400e716d-libxl-noprope-emulator.patch, + b90c4b5f-tests-use-qemu-xen.patch + bsc#979397 + ------------------------------------------------------------------- Fri May 6 16:38:37 UTC 2016 - olaf@aepfle.de diff --git a/libvirt.spec b/libvirt.spec index be6c500..89c1768 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -458,6 +458,12 @@ Source4: libvirtd-relocation-server.fw Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches +Patch0: e4d131b8-mv-virDomainDefPostParseInternal.patch +Patch1: 3e428670-post-parse-implicit-video.patch +Patch2: 538012c8-default-vram.patch +Patch3: 96b21fb0-vram-tests.patch +Patch4: 400e716d-libxl-noprope-emulator.patch +Patch5: b90c4b5f-tests-use-qemu-xen.patch # Patches pending upstream review # Need to go upstream Patch150: xen-pv-cdrom.patch @@ -981,6 +987,12 @@ libvirt plugin for NSS for translating domain names into IP addresses. %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 %patch150 -p1 %patch151 -p1 %patch152 -p1 diff --git a/libxl-support-block-script.patch b/libxl-support-block-script.patch index 8290797..6d2eb74 100644 --- a/libxl-support-block-script.patch +++ b/libxl-support-block-script.patch @@ -37,7 +37,7 @@ Index: libvirt-1.3.4/src/libxl/libxl_conf.c #define LIBXL_QEMU_DM_STR "Options specific to the Xen version:" int -@@ -1052,6 +1071,7 @@ libxlMakeNetworkDiskSrc(virStorageSource +@@ -1055,6 +1074,7 @@ libxlMakeNetworkDiskSrc(virStorageSource int libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) { @@ -45,7 +45,7 @@ Index: libvirt-1.3.4/src/libxl/libxl_conf.c const char *driver; int format; int actual_type = virStorageSourceGetActualType(l_disk->src); -@@ -1062,7 +1082,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1065,7 +1085,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0) return -1; } else { @@ -54,7 +54,7 @@ Index: libvirt-1.3.4/src/libxl/libxl_conf.c return -1; } -@@ -1171,6 +1191,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1174,6 +1194,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0) return -1;