- Devel - libvirt List Archives

[libvirt] [PATCH] fix for Bug 460510
by Dave Allan 12 Dec '08

12 Dec '08

Attached is a patch for bug 460510, which is a bug in the RPM spec file. https://bugzilla.redhat.com/show_bug.cgi?id=460510 Dave diff --git a/libvirt.spec.in b/libvirt.spec.in index cddf5c8..8638377 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -21,7 +21,7 @@ %define with_xen_proxy 0 %endif -%if "%{fedora}" +%if 0%{?fedora} %ifarch ppc64 %define with_qemu 0 %endif

2 1

[libvirt] [PATCH] retry poll() in EINTR case in virPipeReadUntilEOF
by Dave Allan 12 Dec '08

12 Dec '08

I saw a few messages: libvir: error : internal error poll error: Interrupted system call during daemon-conf tests. The messages come from virPipeReadUntilEOF. I think the intention is that this case should be retried. Patch attached. Dave diff --git a/src/util.c b/src/util.c index da26009..31a9702 100644 --- a/src/util.c +++ b/src/util.c @@ -473,7 +473,7 @@ virPipeReadUntilEOF(virConnectPtr conn, int outfd, int errfd, while(!(finished[0] && finished[1])) { if (poll(fds, ARRAY_CARDINALITY(fds), -1) < 0) { - if (errno == EAGAIN) + if (errno == EAGAIN || errno == EINTR) continue; goto pollerr; }

3 2

[libvirt] Deploying latest libvirt in rhel / centos 5.2
by Marco Sinhoreli 11 Dec '08

11 Dec '08

Hello all, I'm wanting to know if I will have some difficulty to package libvirt 0.5.x to rhel / centos 5.2. I'm needing of the latest libvirt release to tests with oVirt. Regards, -- Marco Sinhoreli

4 5

[libvirt] [PATCH] Sanitize qemu monitor output
by Cole Robinson 11 Dec '08

11 Dec '08

The attached patch cleans up output we read from the qemu monitor. This is a simplified form of a patch I posted awhile ago. From the patch: /* The monitor doesn't dump clean output after we have written to * it. Every character we write dumps a bunch of useless stuff, * so the result looks like "cXcoXcomXcommXcommaXcommanXcommand" * Try to throw away everything before the first full command * occurence, and inbetween the command and the newline starting * the response */ This extra output makes our qemu log files _huge_ if doing things like polling disk/net stats, and prevents us from returning any useful error message printed from the monitor (say for media/disk eject, disk/net stats, etc). I've been running with this patch for a while and haven't hit any issues. Thanks, Cole

3 5

[libvirt] [PATCH] build: avoid libvirtd link failure with CFLAGS=-g
by Jim Meyering 11 Dec '08

11 Dec '08

Building libvirtd with CFLAGS=-g (and not -O) failed: ../src/.libs/libvirt_driver_qemu.a(libvirt_driver_qemu_la-qemu_driver.o): In function `qemudExtractMonitorPath': /home/meyering/w/co/libvirt/src/qemu_driver.c:549: undefined reference to `c_isspace' ../src/.libs/libvirt_driver_qemu.a(libvirt_driver_qemu_la-qemu_driver.o): In function `qemudDetectVcpuPIDs': /home/meyering/w/co/libvirt/src/qemu_driver.c:702: undefined reference to `c_isspace' collect2: ld returned 1 exit status make[2]: *** [libvirtd] Error 1 make[2]: Leaving directory `/home/meyering/w/co/libvirt/qemud' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/meyering/w/co/libvirt' make: *** [all] Error 2 Here's the fix: >From 7b963a92060c4591ce5c89f85301c35655056557 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 11 Dec 2008 18:43:12 +0100 Subject: [PATCH] build: avoid libvirtd link failure with CFLAGS=-g * qemud/Makefile.am (libvirtd_LDADD): Add gnulib's libgnu.la last. Otherwise, building with -g (no inlining) would fail due to a use of c_isspace in libvirt_driver_qemu.a, which used to followed libgnu.a in the link command. --- qemud/Makefile.am | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 8cb0847..ea89d06 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -93,8 +93,7 @@ libvirtd_LDADD = \ $(LIBXML_LIBS) \ $(GNUTLS_LIBS) \ $(SASL_LIBS) \ - $(POLKIT_LIBS) \ - ../gnulib/lib/libgnu.la + $(POLKIT_LIBS) if ! WITH_DRIVER_MODULES if WITH_QEMU @@ -244,6 +243,9 @@ uninstall-init: endif # DBUS_INIT_SCRIPTS_RED_HAT +# This must be added last. +libvirtd_LDADD += ../gnulib/lib/libgnu.la + endif # WITH_LIBVIRTD CLEANFILES = libvirtd.init -- 1.6.0.4.1044.g77718

2 2

[libvirt] [PATCH] Fix locking issue in testVolumeLookupByPath
by Cole Robinson 11 Dec '08

11 Dec '08

The attached patch fixes a locking issue in the test driver, specifically testStorageVolumeLookupByPath. We were only unlocking the pool object if it was running. This fixed a deadlock I was seeing while adding some new tests to virtinst's test framework. Thanks, Cole

2 2

[libvirt] [PATCH] Fix rpm building with new logrotate file
by Cole Robinson 11 Dec '08

11 Dec '08

The attached patch teaches the rpm spec about the new logrotate file, which unbreaks rpm builds. Thanks, Cole

4 5

[libvirt] [PATCH] Fix 'virsh pool-list' locking issue
by Cole Robinson 11 Dec '08

11 Dec '08

Running 'virsh pool-list' seems to deadlock libvirtd. Dan gave me some debugging tips, and I managed to track it down to the poolGetAutostart function. The attached patch fixes the issue. Thanks, Cole

3 5

[libvirt] [PATCH] Fix segfault if virtual network has no bridge listed
by Cole Robinson 11 Dec '08

11 Dec '08

The attached patch fixes a libvirtd segfault if we try to call virNetworkGetBridgeName on a virtual network with no bridge in its xml. This occurs if the network hasn't been started as long as the daemon has been running. This patch also cleans up an error path in qemu_conf which was overwriting the error returned by virNetworkGetBridgeName. Thanks, Cole

2 2

[libvirt] [PATCH] add fullscreen support to qemu sdl xml (via fullscreen='true' attribute for the graphics element)
by Itamar Heim 11 Dec '08

11 Dec '08

diff --git a/src/domain_conf.c b/src/domain_conf.c index 32ed59f..018d07f 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -212,6 +212,7 @@ void virDomainGraphicsDefFree(virDomainGraphicsDefPtr def) case VIR_DOMAIN_GRAPHICS_TYPE_SDL: VIR_FREE(def->data.sdl.display); VIR_FREE(def->data.sdl.xauth); + VIR_FREE(def->data.sdl.fullscreen); break; } @@ -1403,6 +1404,7 @@ virDomainGraphicsDefParseXML(virConnectPtr conn, } else if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) { def->data.sdl.xauth = virXMLPropString(node, "xauth"); def->data.sdl.display = virXMLPropString(node, "display"); + def->data.sdl.fullscreen = virXMLPropString(node, "fullscreen"); } cleanup: @@ -2951,6 +2953,10 @@ virDomainGraphicsDefFormat(virConnectPtr conn, if (def->data.sdl.xauth) virBufferEscapeString(buf, " xauth='%s'", def->data.sdl.xauth); + if (def->data.sdl.fullscreen) + virBufferEscapeString(buf, " fullscreen='%s'", + def->data.sdl.fullscreen); + break; } diff --git a/src/domain_conf.h b/src/domain_conf.h index 51cf6d5..436d0b1 100644 --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -268,6 +268,7 @@ struct _virDomainGraphicsDef { struct { char *display; char *xauth; + char *fullscreen; } sdl; } data; }; diff --git a/src/qemu_conf.c b/src/qemu_conf.c index e6c378f..e53f5f0 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -35,6 +35,7 @@ #include <sys/wait.h> #include <arpa/inet.h> #include <sys/utsname.h> +#include <stdbool.h> #if HAVE_NUMACTL #define NUMA_VERSION1_COMPATIBILITY 1 @@ -1213,6 +1214,7 @@ int qemudBuildCommandLine(virConnectPtr conn, vm->def->graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) { char *xauth = NULL; char *display = NULL; + bool fullscreen = false; if (vm->def->graphics->data.sdl.xauth && asprintf(&xauth, "XAUTHORITY=%s", @@ -1225,10 +1227,17 @@ int qemudBuildCommandLine(virConnectPtr conn, goto no_memory; } + if (vm->def->graphics->data.sdl.fullscreen && + STREQ(vm->def->graphics->data.sdl.fullscreen, "true")) { + fullscreen=true; + } + if (xauth) ADD_ENV(xauth); if (display) ADD_ENV(display); + if (fullscreen) + ADD_ARG_LIT("-full-screen"); } /* Add sound hardware */ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args new file mode 100644 index 0000000..da2adc0 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test XAUTHORITY=/root/.Xauthority DISPLAY=:0.1 /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -full-screen diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml new file mode 100644 index 0000000..007677a --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml @@ -0,0 +1,24 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <input type='mouse' bus='ps2'/> + <graphics type='sdl' display=':0.1' xauth='/root/.Xauthority' fullscreen='true'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6e5355a..a04d508 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -195,6 +195,7 @@ mymain(int argc, char **argv) DO_TEST("disk-usb", 0); DO_TEST("graphics-vnc", 0); DO_TEST("graphics-sdl", 0); + DO_TEST("graphics-sdl-fullscreen", 0); DO_TEST("input-usbmouse", 0); DO_TEST("input-usbtablet", 0); DO_TEST("input-xen", 0); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index c810f78..613926a 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -98,6 +98,7 @@ mymain(int argc, char **argv) DO_TEST("disk-usb"); DO_TEST("graphics-vnc"); DO_TEST("graphics-sdl"); + DO_TEST("graphics-sdl-fullscreen"); DO_TEST("input-usbmouse"); DO_TEST("input-usbtablet"); DO_TEST("input-xen");

4 13