[Spice-commits] Changes to 'qemu-kvm-0.14.0-spice'
Gerd Hoffmann
kraxel at kemper.freedesktop.org
Wed May 4 08:05:13 PDT 2011
New branch 'qemu-kvm-0.14.0-spice' available with the following commits:
commit 01fa8775b0902677cceba95793643e20338f1e8b
Author: Alon Levy <alevy at redhat.com>
Date: Wed Apr 13 14:42:00 2011 +0300
libcacard: fix opposite usage of isspace
Signed-off-by: Alon Levy <alevy at redhat.com>
commit 8870d022688120ad0e52f873f30f5a0f4aae0ac7
Author: Alon Levy <alevy at redhat.com>
Date: Fri Apr 1 18:36:26 2011 +0300
ccid: add docs
Add documentation for the usb-ccid device and accompanying two card
devices, ccid-card-emulated and ccid-card-passthru.
Signed-off-by: Alon Levy <alevy at redhat.com>
commit c294599d4bc01e1b264c20318f44665b27dba721
Author: Alon Levy <alevy at redhat.com>
Date: Fri Apr 1 18:36:15 2011 +0300
ccid: add ccid-card-emulated device
This devices uses libcacard (internal) to emulate a smartcard conforming
to the CAC standard. It attaches to the usb-ccid bus. Usage instructions
(example command lines) are in the following patch in docs/ccid.txt. It
uses libcacard which uses nss, so it can work with both hw cards and
certificates (files).
Signed-off-by: Alon Levy <alevy at redhat.com>
commit 62c31532fd30d112748dd12faa7406dcc2a4246e
Author: Robert Relyea <rrelyea at redhat.com>
Date: Fri Apr 1 18:36:07 2011 +0300
libcacard: add docs
commit 02d86be99c3cc2a35f9ed5ecdb92a43652850fad
Author: Robert Relyea <rrelyea at redhat.com>
Date: Fri Apr 1 18:35:52 2011 +0300
libcacard: add vscclient
client to talk to ccid-card-passthru and use smartcard on client to
perform actual operations.
v23->v24 changes: (Jes Sorensen review 2)
* use qemu_socket instead of socket
* use fprintf(stderr,..) for errors
* remove unneccessary includes since using qemu_common.h
commit 50c0d19a7e346f233ee1e01c2f51e78e5cc66103
Author: Robert Relyea <rrelyea at redhat.com>
Date: Fri Apr 1 18:23:14 2011 +0300
libcacard: initial commit
libcacard emulates a Common Access Card (CAC) which is a standard
for smartcards. It is used by the emulated ccid card introduced in
a following patch. Docs are available in docs/libcacard.txt
Signed-off-by: Alon Levy <alevy at redhat.com>
commit 7a3d708eca2742cea03406179a995e4ab54689fb
Author: Alon Levy <alevy at redhat.com>
Date: Fri Apr 1 18:23:13 2011 +0300
ccid: add passthru card device
The passthru ccid card is a device sitting on the usb-ccid bus and
using a chardevice to communicate with a remote device using the
VSCard protocol defined in libcacard/vscard_common.h
Usage docs available in following patch in docs/ccid.txt
Signed-off-by: Alon Levy <alevy at redhat.com>
commit c59bb9f4d07b1711b8f1c11653868d020727c074
Author: Alon Levy <alevy at redhat.com>
Date: Fri Apr 1 18:23:12 2011 +0300
introduce libcacard/vscard_common.h
commit c098808d5d22360a2288847f1ebdf0350388617a
Author: Alon Levy <alevy at redhat.com>
Date: Fri Apr 1 18:23:11 2011 +0300
usb-ccid: add CCID bus
A CCID device is a smart card reader. It is a USB device, defined at [1].
This patch introduces the usb-ccid device that is a ccid bus. Next patches will
introduce two card types to use it, a passthru card and an emulated card.
[1] http://www.usb.org/developers/devclass_docs/DWG_Smart-Card_CCID_Rev110.
Signed-off-by: Alon Levy <alevy at redhat.com>
commit 7982f7b775e3b72f0a85c8f2158483ccbc6e1e57
Author: Alon Levy <alevy at redhat.com>
Date: Fri Apr 1 18:23:10 2011 +0300
qemu-thread.h: include inttypes.h
qemu-thread.h relies on uint64_t being defined, but doesn't include
inttypes.h explicitly. This makes it easier to use it from vscclient (part
of libcacard).
commit b636f267c5bdd771f8a4adad252d894d6aa677d8
Author: Alon Levy <alevy at redhat.com>
Date: Fri Apr 1 18:23:09 2011 +0300
trace: move trace objects from Makefile to Makefile.objs
commit 42916b85f308e890bd7737aab7080fbba9eccce9
Author: Hans de Goede <hdegoede at redhat.com>
Date: Sun Mar 27 16:43:54 2011 +0200
spice: add option for disabling copy paste support
Some people want to be able disable spice's guest <-> client copy paste support
because of security considerations.
commit 6bfdb5cc6cfb7820a5b91cc55a634e345d286d7a
Author: Hans de Goede <hdegoede at redhat.com>
Date: Tue Mar 22 16:28:41 2011 +0100
spice-qemu-char: Fix flow control in client -> guest direction
In the old spice-vmc device we used to have:
last_out = virtio_serial_write(&svc->port, p, MIN(len, VMC_MAX_HOST_WRITE));
if (last_out > 0)
...
Now in the chardev backend we have:
last_out = MIN(len, VMC_MAX_HOST_WRITE);
qemu_chr_read(scd->chr, p, last_out);
if (last_out > 0) {
...
Which causes us to no longer detect if the virtio port is not ready
to receive data from us. chardev actually has a mechanism to detect this,
but it requires a separate call to qemu_chr_can_read, before calling
qemu_chr_read (which return void).
This patch uses qemu_chr_can_read to fix the flow control from client to
guest.
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
commit 7d150b0287638b8447a317d63a8cc3f2c4df0f44
Author: Hans de Goede <hdegoede at redhat.com>
Date: Fri Mar 18 15:35:27 2011 +0100
spice-chardev: listen to frontend guest open / close
Note the vmc_register_interface() in spice_chr_write is left in place
in case someone uses spice-chardev with a frontend which does not have
guest open / close notification.
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
commit 97ed6b378741fca7bc4eb82391cd875db49bcb3e
Author: Hans de Goede <hdegoede at redhat.com>
Date: Fri Mar 18 15:30:45 2011 +0100
virtio-console: notify backend of guest open / close
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
commit 6aeb9ead7ecd6bab1da551afd2e45848afe30df5
Author: Hans de Goede <hdegoede at redhat.com>
Date: Fri Mar 18 15:23:21 2011 +0100
chardev: Allow frontends to notify backends of guest open / close
Some frontends know when the guest has opened the "channel" and is actively
listening to it, for example virtio-serial. This patch adds 2 new qemu-chardev
functions which can be used by frontends to signal guest open / close, and
allows interested backends to listen to this.
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
commit adf894d1e66675f670cdf82e95d0b46be0747d42
Author: Alon Levy <alevy at redhat.com>
Date: Tue Mar 22 12:28:00 2011 +0200
spice-qemu-char.c: remove intermediate buffer
BZ: 672191
upstream: not submitted (explained below)
virtio-serial's buffer is valid when it calls us, and we don't
access it otherwise: vmc_read is only called in response to wakeup,
or else we set datalen=0 and throttle. Then vmc_read is called back,
we return 0 (not accessing the buffer) and set the timer to unthrottle.
Also make datalen int and not ssize_t (to fit spice_chr_write signature).
This relied on the previous patch that introduces throttling, which
can't go upstream right now as explained in that patch.
commit dc97e2745ffecf2d2ba325ab63ce6dc476f4c265
Author: Alon Levy <alevy at redhat.com>
Date: Tue Mar 22 12:27:59 2011 +0200
spice-qemu-char.c: add throttling
BZ: 672191
upstream: not submitted (explained below)
Adds throttling support to spicevmc chardev. Uses a timer to avoid recursing:
1. spice-server: reds.c: read_from_vdi_port
2. qemu: spice-qemu-char.c: vmc_read
3. chr_write_unblocked
(calls virtio_serial_throttle_port(port, false))
4. qemu: virtio ...
5. qemu: spice-qemu-char.c: spice_chr_write
6. qemu: spice-qemu-char.c: wakeup (calls into spice-server)
7. spice-server: ...
8. qemu: spice-qemu-char.c: vmc_read
Instead, in vmc_read if we were throttled and we are just about to return
all the bytes we will set a timer to be triggered immediately to call
chr_write_unblocked. Then we return after 2 above, and 3 is called from the
timer callback. This also means we can later remove some ugly recursion protection
from spice-server.
The other tricky point in this patch is not returning the leftover chunk twice.
When we throttle, by definition we have data that spice server didn't consume.
It is being kept by virtio-serial, and by us. The next vmc_read callback needs
to not return it, but just do unthrottling. Then virtio will give us the remaining
chunk as usual in spice_chr_write, and we will pass it to spice server in the
next vmc_read.
This patch relies on Amit's series to expose throttling to chardev's, which
was not accepted upstream, and will not be accepted upstream until the mainloop
is reworked to use glib.
commit 03aaf919b0ceaf3d20a36c1826af0aba2933dc08
Author: Amit Shah <amit.shah at redhat.com>
Date: Mon Mar 21 22:06:41 2011 +0100
virtio-console: Enable port throttling when chardev is slow to consume data
When a chardev indicates it can't accept more data, we tell the
virtio-serial code to stop sending us any more data till we tell
otherwise. This helps in guests continuing to run normally while the vq
keeps getting full and eventually the guest stops queueing more data.
As soon as the chardev indicates it can accept more data, start pushing!
Signed-off-by: Amit Shah <amit.shah at redhat.com>
commit 3b0884ccc6e8602224b98563a11103b0c101b9d8
Author: Amit Shah <amit.shah at redhat.com>
Date: Mon Mar 21 22:05:10 2011 +0100
char: Throttle when host connection is down#
When the host-side connection goes down, throttle the virtio-serial bus
and later unthrottle when a connection gets established. This helps
prevent any lost IO (guest->host) while the host connection was down.
Bugzilla: 621484
This commit actually helps the bug mentioned above as no writes will now
get lost because of the throttling done here. With just the patches
sent earlier for that bug, one write will end up getting lost in the
worst case (host d/c, guest write, host connect).
Signed-off-by: Amit Shah <amit.shah at redhat.com>
commit 2d68bb1ff950e6655caa9e9a59732151250ee505
Author: Amit Shah <amit.shah at redhat.com>
Date: Mon Mar 21 22:02:47 2011 +0100
char: Equip the unix/tcp backend to handle nonblocking writes#
Now that the infrastructure is in place to return -EAGAIN to callers,
individual char drivers can set their update_fd_handlers() function to
set or remove an fd's write handler. This handler checks if the driver
became writable.
A generic callback routine is used for unblocking writes and letting
users of chardevs know that a driver became writable again.
Signed-off-by: Amit Shah <amit.shah at redhat.com>
commit 0007d432a6c70abb2b24aaa713f45c17e4af1b2d
Author: Amit Shah <amit.shah at redhat.com>
Date: Mon Mar 21 22:00:27 2011 +0100
char: Update send_all() to handle nonblocking chardev write requests
The send_all function is modified to return to the caller in case the
driver cannot handle any more data. It returns -EAGAIN or
WSAEWOULDBLOCK on non-Windows and Windows platforms respectively. This
is only done when the caller sets a callback function handler indicating
it's not interested in blocking till the driver has written out all the
data.
Currently there's no driver or caller that supports this. Future
commits will add such capability.
Signed-off-by: Amit Shah <amit.shah at redhat.com>
commit 9d1c043c2860aac57f95cf76947617b32b689161
Author: Amit Shah <amit.shah at redhat.com>
Date: Mon Mar 21 21:41:42 2011 +0100
char: Add framework for a 'write unblocked' callback
The char layer can let users know that the driver will block on further
input. For users interested in not blocking, they can assign a function
pointer that will be called back when the driver becomes writable. This
patch just adds the function pointers to the CharDriverState structure,
future patches will enable the nonblocking and callback functionality.
Signed-off-by: Amit Shah <amit.shah at redhat.com>
commit 1e0c2e4c978fc67d62b6a2abf2aa31f5b7cb102c
Author: Amit Shah <amit.shah at redhat.com>
Date: Mon Mar 21 20:32:58 2011 +0100
iohandlers: Add enable/disable_write_fd_handler() functions
These will be used to provide a cleaner API for the nonblocking case.
Signed-off-by: Amit Shah <amit.shah at redhat.com>
commit 510ba18498a84fb5c82a497ea8ec3ae1692ea42f
Author: Amit Shah <amit.shah at redhat.com>
Date: Mon Mar 21 20:31:45 2011 +0100
char: Add a QemuChrHandlers struct to initialise chardev handlers
Instead of passing each handler in the qemu_add_handlers() function,
create a struct of handlers that can be passed to the function instead.
Signed-off-by: Amit Shah <amit.shah at redhat.com>
commit 983ccf6ea77f3da8c57142a66264bcb6ab91842b
Author: Amit Shah <amit.shah at redhat.com>
Date: Mon Mar 21 21:57:47 2011 +0100
char: Split out tcp socket close code in a separate function
Signed-off-by: Amit Shah <amit.shah at redhat.com>
commit e210e4eb61cceda94df2c137b1badffbf7e5e665
Author: Alon Levy <alevy at redhat.com>
Date: Wed Mar 16 16:02:16 2011 +0100
hw/qxl-render: drop cursor locks, replace with pipe
Switching locking protection of ds->cursor_set/cursor_move to moving
every call to these functions into the iothread and using the ssd->pipe
to transfer that, adding QXL_SERVER_CURSOR_SET, QXL_SERVER_CURSOR_MOVE.
This is tested with both -vnc :0 -spice and -sdl -spice.
commit 5451db479951404ad475862f920b0d537a80bc50
Author: Alon Levy <alevy at redhat.com>
Date: Wed Mar 16 15:46:22 2011 +0100
qxl/spice: remove qemu_mutex_{un,}lock_iothread around dispatcher
with the previous patch making sure get_command no longer needs to lock,
there is no reason to drop the qemu iothread mutex in qxl.c and in
ui/spice-display.c
The only location where the lock remains are the cursor related callbacks,
that path is currently broken. It is only triggered if running spice and sdl,
which is broken already before that.
commit cbdc5ec5a1cd6de2932a3435799682a4fcdf6568
Author: Uri Lublin <uril at redhat.com>
Date: Wed Mar 16 15:43:45 2011 +0100
qxl: implement get_command in vga mode without locks
This patch and the next drop the requirement to lose the global qemu
mutex during dispatcher calls. This patch enables it, the next drops
the unlock/lock pairs around dispatcher calls.
The current solution of dropping the locks is buggy:
* it allows multiple dispatcher calls from two vcpu threads, the
dispatcher doesn't handle that by design (single fd, not locked, can't
handle writes from two threads)
* it requires us to keep track of cpu_single_env, which is magic.
The solution implemented in this patch and the next (the next just
drops the locks, this patch allows that to work):
* the only operation that needed locking was qemu_create_simple_update,
* it required locking because it was called from the spice-server thread.
* do it in the iothread by reusing the existing pipe used for set_irq.
The current flow implemented is now:
spice-server thread:
qxl.c:interface_get_command (called either by polling or from wakeup)
if update!=NULL:
waiting_for_update=0
update=NULL
return update
else:
if not waiting_for_update:
waiting_for_update=1
write to pipe, which is read by iothread (main thread)
iothread:
wakeup from select,
qxl.c:pipe_read
update=qemu_create_simple_update()
wakeup spice-server thread by calling d.worker->wakeup(d.worker)
commit e1b47751ad644703fbec829935011ee433822cf1
Author: Alon Levy <alevy at redhat.com>
Date: Wed Mar 16 15:21:03 2011 +0100
qxl/spice-display: move pipe to ssd
This moves the int pipe[2] and pthread_t main data from the
PCIQXLDevice struct to the SimpleSpiceDisplay. This will let us
reuse it in the next patch for both -spice with no -qxl usage and
for vga mode from qxl.
Also move the pipe creation function (which is effectively completely rewritten
by this patch anyways) from hw/qxl.c to ui/spice-display.c, since
spice-display will depend on it after the next patch and qemu can be build
with ui/spice-display.c in combination with no hw/qxl.c.
commit beb62edc0aa0ebbf4796785548464109192722e9
Merge: 7aa8c46b2d3bc3bebbf87cb68e02baee6338b597 8d610b6ba2b36bbe0159362556455b61c6566526
Author: Avi Kivity <avi at redhat.com>
Date: Tue Feb 22 15:34:38 2011 +0200
Merge remote branch 'upstream/stable-0.14' into stable-0.14
* upstream/stable-0.14:
qemu-char: Check for missing backend name
Update version for 0.14.0
Update version for 0.14.0-rc2
Fix build from previous commit
PATCH] slirp: fix buffer overrun
correctly check ppr priority during interrupt injection]
qcow2: Fix order in L2 table COW
qemu-img: Improve error messages for failed bdrv_open
qed: Report error for unsupported features
qcow2: Report error for version > 2
qerror: Add QERR_UNKNOWN_BLOCK_FORMAT_FEATURE
qcow2: Fix error handling for reading compressed clusters
qcow2: Fix error handling for immediate backing file read failure
QCOW2: bug fix - read base image beyond its size
Change snapshot_blkdev hmp to use correct argument type for device
linux-user: Fix possible realloc memory leak
linux-user: Fix possible realloc memory leak
linux-user: fix for loopmount ioctl
blockdev: Plug memory leak in drive_init() error paths
blockdev: Plug memory leak in drive_uninit()
Signed-off-by: Avi Kivity <avi at redhat.com>
commit 8d610b6ba2b36bbe0159362556455b61c6566526
Author: Stefan Hajnoczi <stefanha at linux.vnet.ibm.com>
Date: Sat Jan 22 13:07:26 2011 +0000
qemu-char: Check for missing backend name
Check if the backend option is missing before searching the backend
table. This fixes a NULL pointer dereference when QEMU is invoked with
the following invalid command-line:
$ qemu -chardev id=foo,path=/tmp/socket
Previously QEMU would segfault, now it produces this error message:
chardev: "foo" missing backend
Signed-off-by: Stefan Hajnoczi <stefanha at linux.vnet.ibm.com>
Signed-off-by: Aurelien Jarno <aurelien at aurel32.net>
commit 0850f81099cff3a37434352455ffbe831e7f62ae
Author: Anthony Liguori <aliguori at us.ibm.com>
Date: Wed Feb 16 08:42:46 2011 -0600
Update version for 0.14.0
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
commit 6a7999b2226b4e999692016c47e50147c500f4c9
Author: Anthony Liguori <aliguori at us.ibm.com>
Date: Mon Feb 14 16:01:01 2011 -0600
Update version for 0.14.0-rc2
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
commit e3c8fc83aa75f90c82d0c5da5b2c9c4be28ad9bd
Author: Anthony Liguori <aliguori at us.ibm.com>
Date: Mon Feb 14 14:24:24 2011 -0600
Fix build from previous commit
I unfortunately got on an unnamed branch and pushed the wrong bits
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
commit bd2483faf127abe9fa5abc3c8e199f5e7d6534d3
Author: Bruce Rogers <brogers at novell.com>
Date: Sat Feb 5 14:47:56 2011 -0700
PATCH] slirp: fix buffer overrun
Since the addition of the slirp member to struct mbuf, the value of
SLIRP_MSIZE and the initialization of m_size have not been correct,
resulting in overrunning the end of the malloc'd buffer in some cases.
Signed-off-by: Bruce Rogers <brogers at novell.com>
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
commit 7083b66b45571c610cc0a9dedff761da8ebe013f
Author: Gleb Natapov <gleb at redhat.com>
Date: Mon Feb 7 16:14:44 2011 +0200
correctly check ppr priority during interrupt injection]
TPR blocks all interrupts in a priority class, so simple "less or
equal" check is not enough.
Signed-off-by: Gleb Natapov <gleb at redhat.com>
Reviewed-by: Jan Kiszka <jan.kiszka at siemens.com>
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
commit 9de12c453d62f7f9bc2a2b47ecea20c8d8ee8836
Merge: c7e9df3bc6bf0cad74081c7492b5aab753bf9cc9 eee37d310c1e53698e317e76db53c63f6bf62af0
Author: Justin M. Forbes <jforbes at redhat.com>
Date: Mon Feb 14 12:11:43 2011 -0600
Merge branch 'linux-user-for-0.14' of git://gitorious.org/qemu-maemo/qemu
commit c7e9df3bc6bf0cad74081c7492b5aab753bf9cc9
Author: Kevin Wolf <kwolf at redhat.com>
Date: Wed Feb 9 17:36:19 2011 +0100
qcow2: Fix order in L2 table COW
When copying L2 tables (this happens only with internal snapshots), the order
wasn't completely safe, so that after a crash you could end up with a L2 table
that has too low refcount, possibly leading to corruption in the long run.
This patch puts the operations in the right order: First allocate the new
L2 table and replace the reference, and only then decrease the refcount of the
old table.
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
(cherry picked from commit 16fde5f2c2788232b16c06d34d0459a5c1ec1f6c)
commit 038a866f8153c45499b80162f8e1b7188620bd8a
Author: Kevin Wolf <kwolf at redhat.com>
Date: Wed Feb 9 11:25:53 2011 +0100
qemu-img: Improve error messages for failed bdrv_open
Output the error message string of the bdrv_open return code. Also set a
non-empty device name for the images because the unknown feature error message
includes it.
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
Reviewed-by: Anthony Liguori <aliguori at us.ibm.com>
(cherry picked from commit b9eaf9ecb15a9c69a592f386159163d5efc3b919)
commit 64a216f58edc1c6d34b728c618342aae2493241a
Author: Kevin Wolf <kwolf at redhat.com>
Date: Wed Feb 9 11:13:26 2011 +0100
qed: Report error for unsupported features
Instead of just returning -ENOTSUP, generate a more detailed error.
Unfortunately we don't have a helpful text for features that we don't know yet,
so just print the feature mask. It might be useful at least if someone asks for
help.
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
Reviewed-by: Anthony Liguori <aliguori at us.ibm.com>
Acked-by: Stefan Hajnoczi <stefanha at linux.vnet.ibm.com>
(cherry picked from commit 10b758e85c9b38b4b370cff81435f6ed26024a26)
commit 12597b06082b5880789a8e738b25a2659a58f64f
Author: Kevin Wolf <kwolf at redhat.com>
Date: Wed Feb 9 11:11:07 2011 +0100
qcow2: Report error for version > 2
The qcow2 driver is now declared responsible for any QCOW image that has
version 2 or greater (before this, version 3 would be detected as raw).
For everything newer than version 2, an error is reported.
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
Reviewed-by: Anthony Liguori <aliguori at us.ibm.com>
(cherry picked from commit e8cdcec123facf0ed273d941caeeeb9b08f14955)
commit e37dcdfb8dc328471c98dc22444be98455e5f0f7
Author: Kevin Wolf <kwolf at redhat.com>
Date: Wed Feb 9 11:09:38 2011 +0100
qerror: Add QERR_UNKNOWN_BLOCK_FORMAT_FEATURE
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
Reviewed-by: Anthony Liguori <aliguori at us.ibm.com>
(cherry picked from commit f54e3641122e51c6343d587805422642f307462e)
commit 5c9596112cbc959a0bbb458540a620ac05ece1a7
Author: Kevin Wolf <kwolf at redhat.com>
Date: Wed Feb 9 10:26:06 2011 +0100
qcow2: Fix error handling for reading compressed clusters
When reading a compressed cluster failed, qcow2 falsely returned success.
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
Reviewed-by: Markus Armbruster <armbru at redhat.com>
(cherry picked from commit 8af364884355b3f0c5d60a2d2f427927739658ea)
commit 16e07bc282c3c2d560ae9c4e9db76106975495eb
Author: Kevin Wolf <kwolf at redhat.com>
Date: Tue Feb 8 18:12:35 2011 +0100
qcow2: Fix error handling for immediate backing file read failure
Requests could return success even though they failed when bdrv_aio_readv
returned NULL for a backing file read.
Reported-by: Chunqiang Tang <ctang at us.ibm.com>
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
(cherry picked from commit 3ab4c7e92d39d40e6dc0bdb1c2320889543691cb)
commit 607a375709625a439c5bbdbfb62f8052276d33ad
Author: Chunqiang Tang <ctang at us.ibm.com>
Date: Thu Feb 3 10:12:49 2011 -0500
QCOW2: bug fix - read base image beyond its size
This patch fixes the following bug in QCOW2. For a QCOW2 image that is larger
than its base image, when handling a read request straddling over the end of the
base image, the QCOW2 driver attempts to read beyond the end of the base image
and the request would fail.
This bug was found by Fast Virtual Disk (FVD)'s fully automated testing tool.
The following test triggered the bug.
dd if=/dev/zero of=/var/ramdisk/truth.raw count=0 bs=1 seek=1098561536
dd if=/dev/zero of=/var/ramdisk/zero-500M.raw count=0 bs=1 seek=593099264
./qemu-img create -f qcow2 -ocluster_size=65536,backing_fmt=blksim -b /var/ramdisk/zero-500M.raw /var/ramdisk/test.qcow2 1098561536
./qemu-io --auto --seed=30477694 --truth=/var/ramdisk/truth.raw --format=qcow2 --test=blksim:/var/ramdisk/test.qcow2 --verify_write=true --compare_before=false --compare_after=true --round=100000 --parallel=100 --io_size=10485760 --fail_prob=0 --cancel_prob=0 --instant_qemubh=true
Signed-off-by: Chunqiang Tang <ctang at us.ibm.com>
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
(cherry picked from commit e0d9c6f93729c9bfc98fcafcd73098bb8e131aeb)
commit ac12a5af0bb48e2cee46232480dc5f6d8d8241b9
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date: Fri Feb 4 09:22:14 2011 +0100
Change snapshot_blkdev hmp to use correct argument type for device
Pointed out by Markus
Signed-off-by: Jes Sorensen <Jes.Sorensen at redhat.com>
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
(cherry picked from commit 982aa95532a3a7b549695d5b3e18442975eecfb5)
commit b03088c32f8a88e4674f6cdab47da79ef4188d88
Author: Stefan Weil <weil at mail.berlios.de>
Date: Mon Jan 17 21:36:06 2011 +0100
linux-user: Fix possible realloc memory leak
Extract from "man realloc":
"If realloc() fails the original block is left untouched;
it is not freed or moved."
Fix a possible memory leak (reported by cppcheck).
Cc: Riku Voipio <riku.voipio at iki.fi>
Signed-off-by: Stefan Weil <weil at mail.berlios.de>
Signed-off-by: Riku Voipio <riku.voipio at nokia.com>
(cherry picked from commit 8d79de6e42947a4a11ad7c7bb87e8f745a4f8321)
commit 7aa8c46b2d3bc3bebbf87cb68e02baee6338b597
Merge: e374f7e06fe82c195be2e62c667ae0b3ffcb27ad bf883ad26873e9e3ae9fec02d136f6ef281f924d
Author: Avi Kivity <avi at redhat.com>
Date: Wed Feb 9 15:22:40 2011 +0200
Merge branch 'upstream-merge' into stable-0.14
* upstream-merge: (34 commits)
x86: Fix MCA broadcast parameters for TCG case
qemu-timer: Fix compilation of new timer code for w32, w64
Update version for 0.14.0-rc1
block: enable in_use flag
Add flag to indicate external users to block device
block-migration: add reference to target DriveInfo
blockdev: add refcount to DriveInfo
block-migration: actually disable dirty tracking on cleanup
ahci: make number of ports runtime determined
ahci: Implement HBA reset
ahci: send init d2h fis on fis enable
ahci: split ICH and AHCI even more
ahci: add license header in ahci.h
ahci: split ICH9 from core
block/vdi: Fix wrong size in conditionally used memset, memcmp
Documentation: add Sheepdog disk images
qcow2: Really use cache=unsafe for image creation
do not pass NULL to strdup.
Set the right overflow bit for neon 32 and 64 bit saturating add/sub.
target-arm: Fix Neon vsra instructions.
...
Signed-off-by: Avi Kivity <avi at redhat.com>
commit bf883ad26873e9e3ae9fec02d136f6ef281f924d
Merge: 3d1b5e5a4ebe8d71f7c3af44335c8f9e4025b1ce 343c1de916b1841cd5fd5f813add9c87590d72e8
Author: Avi Kivity <avi at redhat.com>
Date: Wed Feb 9 15:15:49 2011 +0200
Merge branch 'stable-0.14' of git://git.qemu.org/qemu into upstream-merge
* 'stable-0.14' of git://git.qemu.org/qemu: (21 commits)
x86: Fix MCA broadcast parameters for TCG case
qemu-timer: Fix compilation of new timer code for w32, w64
Update version for 0.14.0-rc1
block: enable in_use flag
Add flag to indicate external users to block device
block-migration: add reference to target DriveInfo
blockdev: add refcount to DriveInfo
block-migration: actually disable dirty tracking on cleanup
ahci: make number of ports runtime determined
ahci: Implement HBA reset
ahci: send init d2h fis on fis enable
ahci: split ICH and AHCI even more
ahci: add license header in ahci.h
ahci: split ICH9 from core
block/vdi: Fix wrong size in conditionally used memset, memcmp
Documentation: add Sheepdog disk images
qcow2: Really use cache=unsafe for image creation
do not pass NULL to strdup.
Set the right overflow bit for neon 32 and 64 bit saturating add/sub.
target-arm: Fix Neon vsra instructions.
...
Signed-off-by: Avi Kivity <avi at redhat.com>
commit 3d1b5e5a4ebe8d71f7c3af44335c8f9e4025b1ce
Merge: 7df17d8264bb00a0f45b0fa93109af62a9d150a3 1299aa0d03226c43538be6a1784c750d5fd6904e
Author: Avi Kivity <avi at redhat.com>
Date: Wed Feb 9 15:12:19 2011 +0200
Merge commit '1299aa0d03226c43538be6a1784c750d5fd6904e' into upstream-merge
* commit '1299aa0d03226c43538be6a1784c750d5fd6904e':
ioapic: Style & magics cleanup
Conflicts:
hw/ioapic.c
Signed-off-by: Avi Kivity <avi at redhat.com>
commit 7df17d8264bb00a0f45b0fa93109af62a9d150a3
Merge: 24e444a23f31ce02b302c0ddcadb25c07eac7458 8faaf42a4c2f8a16cae315abb366d92c6d370684
Author: Avi Kivity <avi at redhat.com>
Date: Wed Feb 9 15:07:33 2011 +0200
Merge commit '8faaf42a4c2f8a16cae315abb366d92c6d370684' into upstream-merge
* commit '8faaf42a4c2f8a16cae315abb366d92c6d370684':
ioapic: Add support for qemu-kvm's vmstate v2
Conflicts:
hw/ioapic.c
Signed-off-by: Avi Kivity <avi at redhat.com>
commit 24e444a23f31ce02b302c0ddcadb25c07eac7458
Merge: 29c907c815167db322f0e12cf1f754872a1d29a2 f05929b182f279e9ab2ae8c9da5b8db80f8c56c4
Author: Avi Kivity <avi at redhat.com>
Date: Wed Feb 9 14:11:24 2011 +0200
Merge commit 'f05929b182f279e9ab2ae8c9da5b8db80f8c56c' into upstream-merge
* commit 'f05929b182f279e9ab2ae8c9da5b8db80f8c56c':
ioapic: Save/restore irr
Conflicts:
hw/ioapic.c
Signed-off-by: Avi Kivity <avi at redhat.com>
commit 29c907c815167db322f0e12cf1f754872a1d29a2
Merge: e374f7e06fe82c195be2e62c667ae0b3ffcb27ad bc3aaac57b85ade96eeefad400ef1aff0ac73151
Author: Avi Kivity <avi at redhat.com>
Date: Wed Feb 9 14:07:35 2011 +0200
Merge commit 'bc3aaac57b85ade96eeefad400ef1aff0ac73151' into upstream-merge
* commit 'bc3aaac57b85ade96eeefad400ef1aff0ac73151':
ioapic: Implement EOI handling for level-triggered IRQs
vnc: qemu can die if the client is disconnected while updating screen
virtio-serial: Make sure virtqueue is ready before discarding data
ui/sdl: Fix handling of caps lock and num lock keys
Unify alarm deadline computation
Correct alarm deadline computation
use nanoseconds everywhere for timeout computation
savevm: fix corruption in vmstate_subsection_load().
Revert "Open up the 0.15 development branch"
Open up the 0.15 development branch
Conflicts:
hw/ioapic.c
Signed-off-by: Avi Kivity <avi at redhat.com>
commit e374f7e06fe82c195be2e62c667ae0b3ffcb27ad
Author: Avi Kivity <avi at redhat.com>
Date: Wed Feb 9 13:46:48 2011 +0200
Close all block drivers on quit
Following 2bc93fed76c89f7adaa0e5bb3, close all block drivers on quit.
Fixes qcow2 data loss after quit due to qcowcache being volatile.
Signed-off-by: Avi Kivity <avi at redhat.com>
(cherry picked from commit 9d9468914ea5e5a09ac93bd262c69a3333232d56)
commit eee37d310c1e53698e317e76db53c63f6bf62af0
Author: Stefan Weil <weil at mail.berlios.de>
Date: Mon Jan 17 21:36:06 2011 +0100
linux-user: Fix possible realloc memory leak
Extract from "man realloc":
"If realloc() fails the original block is left untouched;
it is not freed or moved."
Fix a possible memory leak (reported by cppcheck).
Cc: Riku Voipio <riku.voipio at iki.fi>
Signed-off-by: Stefan Weil <weil at mail.berlios.de>
Signed-off-by: Riku Voipio <riku.voipio at nokia.com>
commit 28637533d655b1427d3ebfc1dc3ac4f1b16dfa86
Author: Martin Mohring <martin.mohring at 5edatasoft.com>
Date: Tue Feb 8 14:48:56 2011 +0200
linux-user: fix for loopmount ioctl
In case a chrooted build uses XEN or KVM, a looped mount needs to be done to setup the chroot.
The ioctl for loop mount works correctly for arm, mips, ppc32 and sh4, so its now activated.
Signed-off-by: Riku Voipio <riku.voipio at nokia.com>
commit 23e4cff984cd22945b43705eed47911f5a02c645
Merge: 0893194783a006380b8b7cf0c0d79041bd4da93f 343c1de916b1841cd5fd5f813add9c87590d72e8
Author: Justin M. Forbes <jforbes at redhat.com>
Date: Tue Feb 8 12:41:18 2011 -0600
Merge branch 'master' of git+ssh://git.qemu.org/pub/git/qemu-stable-0.14
commit 0893194783a006380b8b7cf0c0d79041bd4da93f
Author: Markus Armbruster <armbru at redhat.com>
Date: Tue Feb 8 15:12:39 2011 +0100
blockdev: Plug memory leak in drive_init() error paths
Should have spotted this when doing commit 319ae529.
Signed-off-by: Markus Armbruster <armbru at redhat.com>
commit e5f1c19665b3cf7ff33431c1c8c898177504dcd5
Author: Markus Armbruster <armbru at redhat.com>
Date: Tue Feb 8 15:12:38 2011 +0100
blockdev: Plug memory leak in drive_uninit()
Started leaking in commit 1dae12e6.
Signed-off-by: Markus Armbruster <armbru at redhat.com>
commit 343c1de916b1841cd5fd5f813add9c87590d72e8
Author: Jan Kiszka <jan.kiszka at web.de>
Date: Fri Feb 4 13:47:25 2011 -0200
x86: Fix MCA broadcast parameters for TCG case
When broadcasting MCEs, we need to set MCIP and RIPV in mcg_status like
it is done for KVM. Use the symbolic constants at this chance.
Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Aurelien Jarno <aurelien at aurel32.net>
(cherry picked from commit 29057492871e63caeab8ee7cdf1062c0270f19d8)
commit b75568889fd3eb373a61ad70fb2db7ebd73bf1a7
Author: Stefan Weil <weil at mail.berlios.de>
Date: Fri Feb 4 22:01:32 2011 +0100
qemu-timer: Fix compilation of new timer code for w32, w64
qemu_next_alarm_deadline() is needed by MinGW, too.
Cc: Paolo Bonzini <pbonzini at redhat.com>
Cc: Anthony Liguori <aliguori at us.ibm.com>
Acked-by: Paolo Bonzini <pbonzini at redhat.com>
Signed-off-by: Stefan Weil <weil at mail.berlios.de>
Signed-off-by: Blue Swirl <blauwirbel at gmail.com>
(cherry picked from commit f26e5a54f0554798a2e6f7a074b809b13635d007)
commit a3dfab563e214c00d3d21d0d94a25d37449182d5
Author: Anthony Liguori <aliguori at us.ibm.com>
Date: Mon Feb 7 13:36:28 2011 -0600
Update version for 0.14.0-rc1
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
commit 185fc528a10d61cf17bbe50a198a8f466a732aa0
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Thu Feb 3 06:57:46 2011 -0200
qemu-kvm-x86: initialize has_msr_star/has_msr_hsave_pa
Fixes 64-bit guest migration.
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Avi Kivity <avi at redhat.com>
commit d428135c04be807e2d6619ef73f3ad430dde009e
Merge: 6f32e3d09d990fd50008756fcb446b55e0c0af79 f75fe530260dacac6fb720b3253264e32103dba8
Author: Avi Kivity <avi at redhat.com>
Date: Mon Feb 7 16:29:05 2011 +0200
Merge branch 'upstream-merge' into stable-0.14
* upstream-merge: (176 commits)
Update version for 0.14.0-rc0
Update SeaBIOS to 0.6.1.2
vhost: force vhost off for non-MSI guests
tap: safe sndbuf default
Add boot index documentation.
Add bootindex handling into usb storage device.
fix QemuOpts leak
remove text_console_opts
add set_echo implementation for text consoles
create TextConsole together with the CharDeviceState
add set_echo implementation for qemu_chr_stdio
move atexit(term_exit) and O_NONBLOCK to qemu_chr_open_stdio
add qemu_chr_set_echo
remove broken code for tty
vnc: Fix password expiration through 'change vnc ""' (v2)
linux-user: avoid gcc array overrun warning for sparc
hw/slavio_intctl.c: fix gcc warning about array bounds overrun
SPARC: Fix Leon3 cache control
blockdev: Fix drive_add for drives without media
blockdev: Replace drive_add()'s fmt, ... by optstr parameter
...
Signed-off-by: Avi Kivity <avi at redhat.com>
commit f75fe530260dacac6fb720b3253264e32103dba8
Merge: 2d2339f995d7176dcb2de10d162aed323a1ffbf3 0e192fae3c79e7d2830f8b1fa694cd8e128084cf
Author: Avi Kivity <avi at redhat.com>
Date: Mon Feb 7 16:28:28 2011 +0200
Merge commit 'v0.14.0-rc0' into upstream-merge
* commit 'v0.14.0-rc0':
Update version for 0.14.0-rc0
Signed-off-by: Avi Kivity <avi at redhat.com>
commit c1f1ffff21c47622c91c7a19cc9ace588fb746b1
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Wed Jan 26 12:12:35 2011 -0200
block: enable in_use flag
Set block device in use during block migration, disallow drive_del and
bdrv_truncate for in use devices.
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
(cherry picked from commit 8591675f44929a9e4b5d3a5fd702a4b6d41c7903)
commit 44d631a001edf558d81f4d49c99c5496a949ff3a
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Wed Jan 26 12:12:34 2011 -0200
Add flag to indicate external users to block device
Certain operations such as drive_del or resize cannot be performed
while external users (eg. block migration) reference the block device.
Add a flag to indicate that.
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
(cherry picked from commit db593f2565dc12442d6bac9e8eaefa027dfcada9)
commit 28b0e1cd0e6de3ac4728b3f5d45237d054d2f4a7
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Wed Jan 26 12:12:33 2011 -0200
block-migration: add reference to target DriveInfo
So that ejection of attached device by guest does not free data
in use by block migration instance.
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
CC: Markus Armbruster <armbru at redhat.com>
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
(cherry picked from commit f48905d44f670cd83227b3a8d06ae1406f0c771c)
commit ddebe9d4736d6ebebe601e3691d5378a878df57c
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Wed Jan 26 12:12:32 2011 -0200
blockdev: add refcount to DriveInfo
The host part of a block device can be deleted with in progress
block migration.
To fix this, add a reference count to DriveInfo, freeing resources
on last reference.
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
CC: Markus Armbruster <armbru at redhat.com>
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
(cherry picked from commit 84fb392526479d54602a3830326d50d44657f630)
commit f17f8b687c789b78bb1f4b53afe5354c748047ed
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Wed Jan 26 12:12:31 2011 -0200
block-migration: actually disable dirty tracking on cleanup
Call to set_dirty_tracking() is misplaced.
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
(cherry picked from commit 8f794c557c4b51c7a957d47ef6a2230114bb9e79)
commit d27dd7e1a275010a9c94d8d22a0771168ff8b8e5
Author: Alexander Graf <agraf at suse.de>
Date: Tue Feb 1 15:51:31 2011 +0100
ahci: make number of ports runtime determined
Different AHCI controllers have a different number of ports, so the core
shouldn't care about the amount of ports available.
This patch makes the number of ports available to the AHCI core runtime
configurable, allowing us to have multiple different AHCI implementations
with different amounts of ports.
Signed-off-by: Alexander Graf <agraf at suse.de>
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
(cherry picked from commit 2c4b9d0ea42c27ec2112e437a0fa954afe73bd23)
commit c3a965c943c97ea659b56c8bade53481f4effcf4
Author: Alexander Graf <agraf at suse.de>
Date: Tue Feb 1 15:51:30 2011 +0100
ahci: Implement HBA reset
The ahci code was missing its soft reset functionality. This wasn't really an
issue for Linux guests, but Windows gets confused when the controller doesn't
reset when it tells it so.
Using this patch I can now successfully boot Windows 7 from AHCI using AHCI
enabled SeaBIOS.
Signed-off-by: Alexander Graf <agraf at suse.de>
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
(cherry picked from commit 760c3e44d3a1d8a7e9d22f0429b1805d1c688178)
commit abc99974161813754ecf5fd5f8bbb95d11abd10e
Author: Alexander Graf <agraf at suse.de>
Date: Tue Feb 1 15:51:29 2011 +0100
ahci: send init d2h fis on fis enable
The drive sends a d2h init fis on initialization. Usually, the guest doesn't
receive fises yet at that point though, so the delivery is deferred.
Let's reflect that by sending the init fis on fis receive enablement.
Signed-off-by: Alexander Graf <agraf at suse.de>
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
(cherry picked from commit 87e62065bb5e0e544e45e6935e3ac2b053fe446e)
commit ed97a4f2cf98a353449ea4c5edd5fcf15dffcc49
Author: Alexander Graf <agraf at suse.de>
Date: Tue Feb 1 15:51:28 2011 +0100
ahci: split ICH and AHCI even more
Sebastian's patch already did a pretty good job at splitting up ICH-9
AHCI code and the AHCI core. We need some more though. Copyright was missing,
the lspci dump belongs to ICH-9, we don't need the AHCI core to have its
own qdev device duplicate.
So let's split them a bit more in this patch, making things easier to
read an understand.
Signed-off-by: Alexander Graf <agraf at suse.de>
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
(cherry picked from commit 7fb6577b130c615e42e1ccf8dad69c27c3eef085)
commit 8f7dfd6bdae5a9cd0ec7f2533379350e21fff869
Author: Alexander Graf <agraf at suse.de>
Date: Tue Feb 1 15:51:27 2011 +0100
ahci: add license header in ahci.h
Due to popular request, this patch adds a license header to ahci.h
Signed-off-by: Alexander Graf <agraf at suse.de>
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
(cherry picked from commit f83a40dcd7c38aef8cb4aa93e1f6f0e21c750992)
commit e81c113d28b591b4e5670822df2dfc12295d3e09
Author: Sebastian Herbszt <herbszt at gmx.de>
Date: Tue Feb 1 15:51:26 2011 +0100
ahci: split ICH9 from core
There are multiple ahci devices out there. The currently implemented ich-9
is only one of the many. So let's split that one out into a separate file
to stress the difference.
Signed-off-by: Sebastian Herbszt <herbszt at gmx.de>
Signed-off-by: Alexander Graf <agraf at suse.de>
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
(cherry picked from commit 03c7a6a8e7122b9c12a532577046094a69593116)
commit d4e6590ab8de5b82f03c79e1c91c8feef30b1b2c
Author: Stefan Weil <weil at mail.berlios.de>
Date: Fri Feb 4 21:01:16 2011 +0100
block/vdi: Fix wrong size in conditionally used memset, memcmp
Error report from cppcheck:
block/vdi.c:122: error: Using sizeof for array given as function argument returns the size of pointer.
block/vdi.c:128: error: Using sizeof for array given as function argument returns the size of pointer.
Fix both by setting the correct size.
The buggy code is only used when QEMU is build without uuid support.
The bug is not critical, so there is no urgent need to apply it to
old versions of QEMU.
Cc: Kevin Wolf <kwolf at redhat.com>
Signed-off-by: Stefan Weil <weil at mail.berlios.de>
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
(cherry picked from commit 4f3669ea5bd73ade0dce5f1155cb9ad9788fd54c)
commit f188c02db7c542f8b6d4817a4eb71d9a3d918da3
Author: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>
Date: Mon Feb 7 16:04:04 2011 +0900
Documentation: add Sheepdog disk images
Signed-off-by: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
(cherry picked from commit 42af9c30ea9a963ce604ac96230fde2f987634db)
commit 7edb1c3a51286a5323daee8cac5ca600be01abf9
Author: Kevin Wolf <kwolf at redhat.com>
Date: Thu Jan 27 16:46:01 2011 +0100
qcow2: Really use cache=unsafe for image creation
For cache=unsafe we also need to set BDRV_O_CACHE_WB, otherwise we have some
strange unsafe writethrough mode.
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha at linux.vnet.ibm.com>
(cherry picked from commit e1a7107f2d92af646ec37b74d074dc150e688559)
commit fd08f20c23465c82c62187d463dacc6d00f79508
Author: Gleb Natapov <gleb at redhat.com>
Date: Wed Feb 2 17:34:34 2011 +0200
do not pass NULL to strdup.
Also use qemu_strdup() instead of strdup() in bootindex code.
Signed-off-by: Gleb Natapov <gleb at redhat.com>
Signed-off-by: Aurelien Jarno <aurelien at aurel32.net>
(cherry picked from commit 4fef930af8d7fab4b6c777fa4c6e2b902359262a)
commit 87982401963ff686b0289abaf4455417eadcfdcb
Author: Christophe Lyon <christophe.lyon at st.com>
Date: Fri Feb 4 15:17:51 2011 +0100
Set the right overflow bit for neon 32 and 64 bit saturating add/sub.
Signed-off-by: Christophe Lyon <christophe.lyon at st.com>
Reviewed-by: Peter Maydell <peter.maydell at linaro.org>
Signed-off-by: Aurelien Jarno <aurelien at aurel32.net>
(cherry picked from commit 72902672dc2ed6281cdb205259c1d52ecf01f6b2)
commit ffbda4e6820872284ec5b98295e0b4b0b1c0db25
Author: Christophe Lyon <christophe.lyon at st.com>
Date: Tue Jan 25 18:18:08 2011 +0100
target-arm: Fix Neon vsra instructions.
This patch fixes the errors reported by my tests in VSRA.
Signed-off-by: Christophe Lyon <christophe.lyon at st.com>
Reviewed-by: Peter Maydell <peter.maydell at linaro.org>
Signed-off-by: Aurelien Jarno <aurelien at aurel32.net>
(cherry picked from commit 5371cb81405a35ca4c1f6ab23f93a4f7260ffa53)
commit 81cd8f604711d25086720add5864d4235e889e16
Author: Aurelien Jarno <aurelien at aurel32.net>
Date: Fri Feb 4 20:19:33 2011 +0100
target-sh4: fix negc
Signed-off-by: Aurelien Jarno <aurelien at aurel32.net>
(cherry picked from commit 7026259f79ffc85ceaaaeee32df518ea96863ee4)
commit 1299aa0d03226c43538be6a1784c750d5fd6904e
Author: Jan Kiszka <jan.kiszka at siemens.com>
Date: Thu Feb 3 22:54:14 2011 +0100
ioapic: Style & magics cleanup
Fix a few style issues and convert magic numbers into prober symbolic
constants, also fixing the wrong but unused IOAPIC_DM_SIPI value.
Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
(cherry picked from commit 1f5e71a8e6b24dce74b156472ff9253b9bd33a11)
commit 8faaf42a4c2f8a16cae315abb366d92c6d370684
Author: Jan Kiszka <jan.kiszka at siemens.com>
Date: Thu Feb 3 22:54:13 2011 +0100
ioapic: Add support for qemu-kvm's vmstate v2
qemu-kvm carries the IOAPIC base address in its v2 vmstate. We only
support the default base address so far, and saving even that in the
device state was rejected.
Add a padding field to be able to read qemu-kvm's old state, but
increase our version to 3, indicating that we are not saving a valid
address. This also gives downstream the chance to change to stop
evaluating the base_address and move to v3 as well.
Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
(cherry picked from commit 5dce499948e4a4abe62f010baf4a7ed3d49e53cb)
commit f05929b182f279e9ab2ae8c9da5b8db80f8c56c4
Author: Jan Kiszka <jan.kiszka at siemens.com>
Date: Thu Feb 3 22:54:12 2011 +0100
ioapic: Save/restore irr
This is a guest modifiable state that must be saved/restored properly.
Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
(cherry picked from commit 35a74c5c5941b474d8b985237e1bde0b8cd2a20f)
commit bc3aaac57b85ade96eeefad400ef1aff0ac73151
Author: Jan Kiszka <jan.kiszka at siemens.com>
Date: Thu Feb 3 22:54:11 2011 +0100
ioapic: Implement EOI handling for level-triggered IRQs
Add the missing EOI broadcast from local APIC to the IOAPICs on
completion of level-triggered IRQs. This ensures that a still asserted
IRQ source properly re-triggers an APIC IRQ.
Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
(cherry picked from commit 0280b571c1a153f8926612d8c8d7359242d596f5)
commit 602c075070f113c69c2100776f7a67cee55dd61e
Author: Corentin Chary <corentincj at iksaif.net>
Date: Fri Feb 4 09:05:53 2011 +0100
vnc: qemu can die if the client is disconnected while updating screen
agraf reported that qemu_mutex_destroy(vs->output_mutex) while failing
in vnc_disconnect_finish().
It's because vnc_worker_thread_loop() tries to unlock the mutex while
not locked. The unlocking call doesn't fail (pthread bug ?), but
the destroy call does.
Signed-off-by: Corentin Chary <corentincj at iksaif.net>
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
(cherry picked from commit 73eb4c04e9e8ea7f6eb83694cb0c43e38d882a7c)
commit cb5281b1998c12b8d93d0c6a29aeae13934ceb1a
Author: Amit Shah <amit.shah at redhat.com>
Date: Fri Feb 4 14:24:18 2011 +0530
virtio-serial: Make sure virtqueue is ready before discarding data
This can happen if a port gets unplugged before guest has chance to
initialise vqs.
Reported-by: Juan Quintela <quintela at redhat.com>
Signed-off-by: Amit Shah <amit.shah at redhat.com>
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
(cherry picked from commit 7185f9315bcf90e99b123370cf4d19b8c20afbd5)
commit 9a121a2fbf88dd1bc869b1ac2449dc12c27cccfa
Author: Stefan Weil <weil at mail.berlios.de>
Date: Thu Feb 3 22:35:07 2011 +0100
ui/sdl: Fix handling of caps lock and num lock keys
Starting with SDL version 1.2.14, caps lock and num lock keys
will send a SDL_KEYUP when SDL_DISABLE_LOCK_KEYS=1 is set in
the environment.
The new code sets the environment unconditionally
(it won't harm old versions which do not know it).
The workaround for SDL_KEYUP is only compiled with old SDL versions.
A similar patch without handling of old SDL versions was already
published by Benjamin Drung for Ubuntu.
Cc: Anthony Liguori <aliguori at us.ibm.com>
Cc: Kevin Wolf <kwolf at redhat.com>
Cc: Benjamin Drung <benjamin.drung at gmail.com>
Signed-off-by: Stefan Weil <weil at mail.berlios.de>
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
(cherry picked from commit 4e79bcbb96d3c189e50adbdac7b1e28d834ba43e)
commit 366c2452b111118abcd0dc5f0cd74c16fd63fb96
Author: Paolo Bonzini <pbonzini at redhat.com>
Date: Thu Feb 3 14:49:01 2011 +0100
Unify alarm deadline computation
This patch shows how using the correct formula for
qemu_next_deadline_dyntick can simplify the code of
host_alarm_handler and eliminate useless duplication.
Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
(cherry picked from commit 4c3d45eb694de3e0bda10841a06ba98be4d569b1)
commit bbd9827cc7c83c433bbd1d253b8cd27d56acd071
Author: Paolo Bonzini <pbonzini at redhat.com>
Date: Thu Feb 3 14:49:00 2011 +0100
Correct alarm deadline computation
When the QEMU_CLOCK_HOST clock was added, computation of its
deadline was added to qemu_next_deadline, which is correct but
incomplete.
I noticed this by reading the very convoluted rules whereby
qemu_next_deadline_dyntick is computed, which miss QEMU_CLOCK_HOST
when use_icount is true. This patch inlines qemu_next_deadline
into qemu_next_deadline_dyntick, and then corrects the logic to skip
only QEMU_CLOCK_VIRTUAL when use_icount is true.
Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
Cc: Jan Kiszka <jan.kiszka at siemens.com>
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
(cherry picked from commit 6ad0a1ed21ecd187dbe3239eb45c3598672af6a8)
commit d7f88b4bbdc720554c62e1924441291b8945f083
Author: Paolo Bonzini <pbonzini at redhat.com>
Date: Thu Feb 3 14:48:59 2011 +0100
use nanoseconds everywhere for timeout computation
Suggested by Aurelien Jarno.
Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
(cherry picked from commit 9c13246ac13a87e05b5e6e7158e715dfa65fc7aa)
commit ea01a58014edc23d59d73de338db7fdd8649a67c
Author: Yoshiaki Tamura <tamura.yoshiaki at lab.ntt.co.jp>
Date: Thu Feb 3 13:34:08 2011 +0900
savevm: fix corruption in vmstate_subsection_load().
Although it's rare to happen in live migration, when the head of a
byte stream contains 0x05 which is the marker of subsection, the
loader gets corrupted because vmstate_subsection_load() continues even
the device doesn't require it. This patch adds a checker whether
subsection is needed, and skips following routines if not needed.
Signed-off-by: Yoshiaki Tamura <tamura.yoshiaki at lab.ntt.co.jp>
Acked-by: Paolo Bonzini <pbonzini at redhat.com>
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
(cherry picked from commit eb60260de0b050a5e8ab725e84d377d0b44c43ae)
commit 0833073edf5da9802f85c49d5fd10efb4e4b3422
Author: Aurelien Jarno <aurelien at aurel32.net>
Date: Wed Feb 2 08:39:44 2011 +0100
Revert "Open up the 0.15 development branch"
This reverts commit 0e1272f22bd059c3420b6dfe355b042038cc7806.
commit 0e1272f22bd059c3420b6dfe355b042038cc7806
Author: Anthony Liguori <aliguori at us.ibm.com>
Date: Tue Feb 1 20:15:26 2011 -0600
Open up the 0.15 development branch
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
More information about the Spice-commits
mailing list