qemu/qemu.git, branch stable-1.5

Update VERSION for 1.5.3 release

2013-08-22T16:21:34+00:00

Signed-off-by: Michael Roth

qemu-char: Fix ringbuf option size

2013-08-14T14:58:36+00:00

Any attempt to use it trips an "opt->desc->type == QEMU_OPT_NUMBER" assertion. Broken in commit 1da48c65. Cc: qemu-stable@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Signed-off-by: Luiz Capitulino (cherry picked from commit 0f953051178f2e3df36efa5158a71f33d35fa812) Signed-off-by: Michael Roth

qemu-char: fix infinite recursion connecting to monitor pty

2013-08-14T14:53:58+00:00

Since commit bd5c51e (qemu-char: don't issue CHR_EVENT_OPEN in a BH), an infinite recursion occurs when putting the monitor on a pty (-monitor pty) and connecting a terminal to the slave port. This is because of the qemu_chr_be_event(s, CHR_EVENT_OPENED) added to qemu_chr_be_generic_open(). This event is captured by monitor_event() which prints a welcome message to the character device. The flush of that welcome message retriggers another open event in pty_chr_state() because it checks s->connected, but only sets it to 1 after calling qemu_chr_be_generic_open(). I've fixed this by setting s->connected = 1 before the call to qemu_chr_be_generic_open() instead of after, so that the recursive pty_chr_state() doesn't call it again. An example snippet of repeating backtrace: ... #107486 0x007aec58 in monitor_flush (mon=0xf418b0) at qemu/monitor.c:288 #107487 0x007aee7c in monitor_puts (mon=0xf418b0, str=0x1176d07 "") at qemu/monitor.c:322 #107488 0x007aef20 in monitor_vprintf (mon=0xf418b0, fmt=0x8d4820 "QEMU %s monitor - type 'help' for more information\n", ap=0x7f432be0) at qemu/monitor.c:339 #107489 0x007aefac in monitor_printf (mon=0xf418b0, fmt=0x8d4820 "QEMU %s monitor - type 'help' for more information\n") at qemu/monitor.c:347 #107490 0x007ba4bc in monitor_event (opaque=0xf418b0, event=2) at qemu/monitor.c:4699 #107491 0x00684c28 in qemu_chr_be_event (s=0xf37788, event=2) at qemu/qemu-char.c:108 #107492 0x00684c70 in qemu_chr_be_generic_open (s=0xf37788) at qemu/qemu-char.c:113 #107493 0x006880a4 in pty_chr_state (chr=0xf37788, connected=1) at qemu/qemu-char.c:1145 #107494 0x00687fa4 in pty_chr_update_read_handler (chr=0xf37788) at qemu/qemu-char.c:1121 #107495 0x00687c9c in pty_chr_write (chr=0xf37788, buf=0x70b3c008

, len=538720) at qemu/qemu-char.c:1063 #107496 0x00684cc4 in qemu_chr_fe_write (s=0xf37788, buf=0x70b3c008

, len=538720) at qemu/qemu-char.c:118 ... Signed-off-by: James Hogan Tested-by: Michael Roth Message-id: 1375960178-10882-1-git-send-email-james.hogan@imgtec.com Cc: Michael Roth Cc: Anthony Liguori Signed-off-by: Anthony Liguori (cherry picked from commit 3a3567d337d3ee6fb2e2fcc1d27cd045ed97ae9b) Signed-off-by: Michael Roth

Merge tag 'qom-cpu-for-1.5' into stable-1.5-staging

2013-08-13T18:10:17+00:00

QOM CPUState and X86CPU for stable-1.5 * Fix X86CPU Westmere CPUID for pc-*-1.4 and older Signed-off-by: Michael Roth

pc: Remove PCLMULQDQ from Westmere on pc-*-1.4 and older

2013-08-13T17:18:02+00:00

Commit 41cb383f42d0cb51d8e3e25e3ecebc954dd4196f made a guest-visible change by adding the PCLMULQDQ bit to Westmere without adding compatibility code to keep the ABI for older machine-types. Fix it by adding the missing compat code. Signed-off-by: Eduardo Habkost Signed-off-by: Andreas Färber (cherry picked from commit 56383703c060777fd01aaf8d63d5f46d660e9fb9) Signed-off-by: Andreas Färber

vhost: clear signalled_used_valid on vhost stop

2013-08-13T15:04:40+00:00

When vhost device stops, its implementation synchronizes kernel state back to virtio.c so we can continue emulating the device in userspace. This patch ensures that virtio.c's signalled_used_valid flag is reset so that userspace does not suppress guest notifications due to stale signalled_used values. Cc: qemu-stable@nongnu.org Signed-off-by: Michael S. Tsirkin (cherry picked from commit 3561ba14188b3c1e54246ed6db97896bbc082d2f) Signed-off-by: Michael Roth

virtio: clear signalled_used_valid when switching from dataplane

2013-08-13T15:04:25+00:00

When the dataplane thread stops, its vring.c implementation synchronizes vring state back to virtio.c so we can continue emulating the virtio device. This patch ensures that virtio.c's signalled_used_valid flag is reset so that we do not suppress guest notifications due to stale signalled_used values. Suggested-by: Kevin Wolf Signed-off-by: Stefan Hajnoczi Signed-off-by: Michael S. Tsirkin (cherry picked from commit 6793dfd1b6a99a79b9f2e3c4d6625ccd6513f240) Signed-off-by: Michael Roth

dataplane: sync virtio.c and vring.c virtqueue state

2013-08-13T15:03:19+00:00

Load the virtio.c state into vring.c when we start dataplane mode and vice versa when stopping dataplane mode. This patch makes it possible to start and stop dataplane any time while the guest is running. This will eventually allow us to go back to QEMU main loop for bdrv_drain_all() and live migration. In the meantime, this patch makes the dataplane lifecycle more robust but should make no visible difference. It may be useful in the virtio-net dataplane effort. Signed-off-by: Stefan Hajnoczi (cherry picked from commit 9154b02c53bb6685797c973fcdbec51c4714777d) Signed-off-by: Michael Roth

i82801b11: Fix i82801b11 PCI host bridge config space

2013-08-13T14:30:50+00:00

pci_bridge_write_config() was not being used. Cc: qemu-stable@nongnu.org Signed-off-by: Gerd Hoffmann Signed-off-by: Andreas Färber Signed-off-by: Michael S. Tsirkin (cherry picked from commit 4965b7f056177ddfb816319e9ff5e766898d0bc5) Conflicts: hw/pci-bridge/i82801b11.c * modified to avoid dependency on 125ee0ed Signed-off-by: Michael Roth

Bugfix for loading multiboot kernels

2013-08-13T14:30:50+00:00

This patch fixes a bug in rom_copy introduced by commit d60fa42e8bae39440f997ebfe8fe328269a57d16. rom_copy failed to load roms with a "datasize" of 0. As a result, multiboot kernels were not loaded correctly when they contain a segment with a "file size" of 0. https://bugs.launchpad.net/qemu/+bug/1208944 Signed-off-by: Martijn van den Broek Reviewed-by: Paolo Bonzini Message-id: CAG1x_oET1u3TMPu3r_zzd3ZXsTWQLiaM0zAc+RkHFCwvJjGOvg@mail.gmail.com Signed-off-by: Anthony Liguori (cherry picked from commit 0dd5ce38fbeb2fb97b01cc8c1c97292211e48ee6) Signed-off-by: Michael Roth