qemu/qemu.git, branch stable-1.4

update VERSION for 1.4.2

2013-05-23T22:12:44+00:00

Signed-off-by: Michael Roth

ppc: do not register IABR SPR twice for 603e

2013-05-20T21:30:36+00:00

IABR SPR is already registered in gen_spr_603(), called from init_proc_603E(). Signed-off-by: Hervé Poussineau Signed-off-by: Michael Roth

hw/9pfs: use O_NOFOLLOW for mapped readlink operation

2013-05-20T21:23:43+00:00

With mapped security models like mapped-xattr and mapped-file, we save the symlink target as file contents. Now if we ever expose a normal directory with mapped security model and find real symlinks in export path, never follow them and return proper error. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Michael Roth

hw/9pfs: Fix segfault with 9p2000.u

2013-05-20T16:25:00+00:00

When guest tries to chmod a block or char device file over 9pfs, the qemu process segfaults. With 9p2000.u protocol we use wstat to change mode bits and client don't send extension information for chmod. We need to check for size field to check whether extension info is present or not. Signed-off-by: Aneesh Kumar K.V Reviewed-by: Stefan Hajnoczi Reported-by: Michael Tokarev Acked-by: Michael Tokarev Signed-off-by: Michael Roth

rbd: add an asynchronous flush

2013-05-17T20:52:55+00:00

The existing bdrv_co_flush_to_disk implementation uses rbd_flush(), which is sychronous and causes the main qemu thread to block until it is complete. This results in unresponsiveness and extra latency for the guest. Fix this by using an asynchronous version of flush. This was added to librbd with a special #define to indicate its presence, since it will be backported to stable versions. Thus, there is no need to check the version of librbd. Implement this as bdrv_aio_flush, since it matches other aio functions in the rbd block driver, and leave out bdrv_co_flush_to_disk when the asynchronous version is available. Reported-by: Oliver Francke Signed-off-by: Josh Durgin Signed-off-by: Stefan Hajnoczi (cherry picked from commit dc7588c1eb3008bda53dde1d6b890cd299758155) Signed-off-by: Michael Roth

qemu-iotests: add tests for rebasing zero clusters

2013-05-17T18:10:52+00:00

If zero clusters are erroneously treated as unallocated, "qemu-img rebase" will copy the backing file's contents onto the cluster. The bug existed also in image streaming, but since the root cause was in qcow2's is_allocated implementation it is enough to test it with qemu-img. Signed-off-by: Paolo Bonzini Signed-off-by: Stefan Hajnoczi (cherry picked from commit acbf30ec601b1f817febc4500025b7c4181312c4) Conflicts: tests/qemu-iotests/group * fixed up to account for tests 48/49 being missing from 1.4 Signed-off-by: Michael Roth

virtio-balloon: fix integer overflow in BALLOON_CHANGE QMP event

2013-05-17T17:02:18+00:00

Because dev->actual is uint32_t, the expression 'dev->actual << VIRTIO_BALLOON_PFN_SHIFT' is truncated to 32 bits. This overflows when dev->actual >= 1048576. To reproduce: 1. Start a VM with a QMP socket and 5G of RAM 2. Connect to the QMP socket, negotiate capabilities and issue: { "execute":"balloon", "arguments": { "value": 1073741824 } } 3. Watch for BALLOON_CHANGE QMP events, the last one will incorretly be: { "timestamp": { "seconds": 1366228965, "microseconds": 245466 }, "event": "BALLOON_CHANGE", "data": { "actual": 5368709120 } } To fix it this commit casts it to ram_addr_t, which is ram_size's type. Signed-off-by: Luiz Capitulino Reviewed-by: Eric Blake (cherry picked from commit dcc6ceffc066745777960a1f0d32f3a555924f65) Signed-off-by: Michael Roth

qemu-timer: move timeBeginPeriod/timeEndPeriod to os-win32

2013-05-16T22:22:34+00:00

These are needed for any of the Win32 alarm timer implementations. They are not tied to mmtimer exclusively. Jacob tested this patch with both mmtimer and Win32 timers. Cc: qemu-stable@nongnu.org Tested-by: Jacob Kroon Signed-off-by: Paolo Bonzini Signed-off-by: Stefan Weil (cherry picked from commit 0727b867542eea7fedfd2c53568e9782627fd3bd) Conflicts: os-win32.c * updated to retain cpu affinity settings for 1.4 Signed-off-by: Michael Roth

configure: Don't fall back to gthread coroutine backend

2013-05-16T19:35:48+00:00

This is a back port of 7c2acc7062fe863cb71ff5849bb121deafe8df4b to the 1.4 stable branch without needing the new error_exit() function. configure: Don't fall back to gthread coroutine backend The gthread coroutine backend is broken and does not produce a working QEMU; it is only useful for some very limited debugging situations. Clean up the backend selection logic in configure so that it now runs "if on windows use windows; else prefer ucontext; else sigaltstack". To do this we refactor the configure code to separate out "test whether we have a working ucontext", "pick a default if user didn't specify" and "validate that user didn't specify something invalid", rather than having all three of these run together. We also simplify the Makefile logic so it just links in the backend the configure script selects. Signed-off-by: Peter Maydell Message-id: 1365419487-19867-3-git-send-email-peter.maydell@linaro.org Signed-off-by: Anthony Liguori Signed-off-by: Brad Smith Signed-off-by: Michael Roth

usb-redir: Fix crash on migration with no client connected

2013-05-16T17:06:36+00:00

If no client is connected on the src side, then we won't receive a parser during migrate, in this case usbredir_post_load() should be a nop, rather then to try to derefefence the NULL dev->parser pointer. Signed-off-by: Hans de Goede Signed-off-by: Gerd Hoffmann (cherry picked from commit 3713e1485e6eace7d48b9c790602cfd92c616e5f) Signed-off-by: Michael Roth