qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 80d8b5: target-ppc: Fix "G2leGP3" PVR


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 80d8b5: target-ppc: Fix "G2leGP3" PVR
Date: Mon, 15 Apr 2013 14:30:17 -0700

  Branch: refs/heads/stable-1.4
  Home:   https://github.com/qemu/qemu
  Commit: 80d8b5da48c29bfb086254a6caf87a432f63d130
      
https://github.com/qemu/qemu/commit/80d8b5da48c29bfb086254a6caf87a432f63d130
  Author: Andreas Färber <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M target-ppc/translate_init.c

  Log Message:
  -----------
  target-ppc: Fix "G2leGP3" PVR

Unlike derived PVR constants mapped to CPU_POWERPC_G2LEgp3, the
"G2leGP3" model definition itself used the CPU_POWERPC_G2LEgp1 PVR.

Fixing this will allow to alias CPU_POWERPC_G2LEgp3-using types to
"G2leGP3".

Signed-off-by: Andreas Färber <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
(cherry picked from commit bfe6d5b0daf9fdafeb0dbb7c26774dbb1bbb4507)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 51968b8503a00b5128fb4e3ed14efb8dc69579ce
      
https://github.com/qemu/qemu/commit/51968b8503a00b5128fb4e3ed14efb8dc69579ce
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M tests/test-coroutine.c

  Log Message:
  -----------
  coroutine: trim down nesting level in perf_nesting test

20000 nested coroutines require 20 GB of virtual address space.
Only nest 1000 of them so that the test (only enabled with
"-m perf" on the command line) runs on 32-bit machines too.

Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
(cherry picked from commit 027003152f4cf21952f9282b4487daf3fdd372ba)

Signed-off-by: Michael Roth <address@hidden>


  Commit: e6b795f34e2dfb440340d559c6813ce0febec937
      
https://github.com/qemu/qemu/commit/e6b795f34e2dfb440340d559c6813ce0febec937
  Author: Peter Lieven <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: complete all IOs before .bdrv_truncate

bdrv_truncate() invalidates the bdrv_check_request() result for
in-flight requests, so there should better be none.

Cc: address@hidden
Signed-off-by: Peter Lieven <address@hidden>
Reported-by: Kevin Wolf <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
(cherry picked from commit 9a665b2b8640e464f0a778216fc2dca8d02acf33)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 332e93417a677a2f6845cd7215a2f20a227d3251
      
https://github.com/qemu/qemu/commit/332e93417a677a2f6845cd7215a2f20a227d3251
  Author: Jason Wang <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M net/tap.c

  Log Message:
  -----------
  tap: forbid creating multiqueue tap when hub is used

Obviously, hub does not support multiqueue tap. So this patch forbids creating
multiple queue tap when hub is used to prevent the crash when command line such
as "-net tap,queues=2" is used.

Cc: address@hidden
Signed-off-by: Jason Wang <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
(cherry picked from commit ce675a7579fea498397c5d2da3c5367671e9f02a)

Signed-off-by: Michael Roth <address@hidden>


  Commit: ec9f828341cb5e9cc3ad0bdbbd6989884daf823a
      
https://github.com/qemu/qemu/commit/ec9f828341cb5e9cc3ad0bdbbd6989884daf823a
  Author: Igor Mitsyanko <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M qemu-char.c

  Log Message:
  -----------
  qemu-char.c: fix waiting for telnet connection message

Current colon position in "waiting for telnet connection" message template
produces messages like:
QEMU waiting for connection on: telnet::127.0.0.16666,server

After moving a colon to the right, we will get a correct messages like:
QEMU waiting for connection on: telnet:127.0.0.1:6666,server

Signed-off-by: Igor Mitsyanko <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
(cherry picked from commit e5545854dd1e2e3507b210ac0c1cbfca69ff0fcb)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 3b39a11cde495b42776889031769d730cbfd0993
      
https://github.com/qemu/qemu/commit/3b39a11cde495b42776889031769d730cbfd0993
  Author: Jason Wang <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M hw/virtio-net.c
    M include/net/net.h
    M net/net.c

  Log Message:
  -----------
  net: reduce the unnecessary memory allocation of multiqueue

Edivaldo reports a problem that the array of NetClientState in NICState is too
large - MAX_QUEUE_NUM(1024) which will wastes memory even if multiqueue is not
used.

Instead of static arrays, solving this issue by allocating the queues on demand
for both the NetClientState array in NICState and VirtIONetQueue array in
VirtIONet.

Tested by myself, with single virtio-net-pci device. The memory allocation is
almost the same as when multiqueue is not merged.

Cc: Edivaldo de Araujo Pereira <address@hidden>
Cc: address@hidden
Signed-off-by: Jason Wang <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
(cherry picked from commit f6b26cf257232e5854c0e5c98a8685c625bf986e)

Signed-off-by: Michael Roth <address@hidden>


  Commit: cebb8ebe41001c37aa3d88770209889728da6ea8
      
https://github.com/qemu/qemu/commit/cebb8ebe41001c37aa3d88770209889728da6ea8
  Author: Jason Wang <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M qapi-schema.json
    M qemu-options.hx

  Log Message:
  -----------
  help: add docs for multiqueue tap options

Cc: Markus Armbruster <address@hidden>
Cc: Jason Wang <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>
(cherry picked from commit 2ca81baa0b3363d57de94f8b80c02a003b361161)

Signed-off-by: Michael Roth <address@hidden>


  Commit: d49fed4c55e3f4dd4a8c4a4d68b938b12a36802c
      
https://github.com/qemu/qemu/commit/d49fed4c55e3f4dd4a8c4a4d68b938b12a36802c
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M hw/qxl-render.c
    M hw/vga.c
    M hw/vmware_vga.c
    M hw/xenfb.c
    M include/ui/console.h
    M ui/console.c

  Log Message:
  -----------
  vga: fix byteswapping.

In case host and guest endianness differ the vga code first creates
a shared surface (using qemu_create_displaysurface_from), then goes
patch the surface format to indicate that the bytes must be swapped.

The switch to pixman broke that hack as the format patching isn't
propagated into the pixman image, so ui code using the pixman image
directly (such as vnc) uses the wrong format.

Fix that by adding a byteswap parameter to
qemu_create_displaysurface_from, so we'll use the correct format
when creating the surface (and the pixman image) and don't have
to patch the format afterwards.

[ v2: unbreak xen build ]

Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>
(cherry picked from commit b1424e0381a7f1c9969079eca4458d5f20bf1859)

Signed-off-by: Michael Roth <address@hidden>


  Commit: b7ff1a7a00bc91f9e771ca6033be0be19cc5723e
      
https://github.com/qemu/qemu/commit/b7ff1a7a00bc91f9e771ca6033be0be19cc5723e
  Author: Markus Armbruster <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M qmp-commands.hx

  Log Message:
  -----------
  qmp: netdev_add is like -netdev, not -net, fix documentation

Cc: address@hidden
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
(cherry picked from commit af347aa5a521555f5342e67993eb717d4f542ba8)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 4a389443262b62ecfd916aea3efc09a502762cd9
      
https://github.com/qemu/qemu/commit/4a389443262b62ecfd916aea3efc09a502762cd9
  Author: Michael Roth <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M qga/main.c

  Log Message:
  -----------
  qemu-ga: make guest-sync-delimited available during fsfreeze

We currently maintain a whitelist of commands that are safe during
fsfreeze. During fsfreeze, we disable all commands that aren't part of
that whitelist.

guest-sync-delimited meets the criteria for being whitelisted, and is
also required for qemu-ga clients that rely on guest-sync-delimited for
re-syncing the channel after a timeout.

Signed-off-by: Michael Roth <address@hidden>
Cc: address@hidden
Reviewed-by: Eric Blake <address@hidden>
(cherry picked from commit c5dcb6ae23a3ed7a01bae1cd75ce02abea31db5e)

Signed-off-by: Michael Roth <address@hidden>


  Commit: a8b090ef08872dad68acb2afbb0f81c44c4132e6
      
https://github.com/qemu/qemu/commit/a8b090ef08872dad68acb2afbb0f81c44c4132e6
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M hw/scsi-disk.c

  Log Message:
  -----------
  scsi-disk: handle io_canceled uniformly and correctly

Always check it immediately after calling bdrv_acct_done, and
always do a "goto done" in case the "done" label has to free
some memory---as is the case for scsi_unmap_complete in the
previous patch.

This patch could fix problems that happen when a request is
split into multiple parts, and one of them is canceled.  Then
the next part is fired, but the HBA's cancellation callbacks have
fired already.  Whether this happens or not, depends on how the
block/ driver implements AIO cancellation.  It it does a simple
bdrv_drain_all() or similar, then it will not have a problem.
If it only cancels the given AIOCB, this scenario could happen.

Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>
(cherry picked from commit 0c92e0e6b64c9061f7365a2712b9055ea35b52f9)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 0c918dd600fa6b3c7494b3dad743464242948a7a
      
https://github.com/qemu/qemu/commit/0c918dd600fa6b3c7494b3dad743464242948a7a
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M configure

  Log Message:
  -----------
  iscsi: look for pkg-config file too

Due to library conflicts, Fedora will have to put libiscsi in
/usr/lib/iscsi.  Simplify configuration by using a pkg-config
file.  The Fedora package will distribute one, and the patch
to add it has been sent to upstream libiscsi as well.

Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>
(cherry picked from commit 3c33ea9640758bb625e110a77673e5abfd184e54)

Signed-off-by: Michael Roth <address@hidden>


  Commit: f23ab037c7ebd9ffe15526d0d2404194694ebad8
      
https://github.com/qemu/qemu/commit/f23ab037c7ebd9ffe15526d0d2404194694ebad8
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M hw/scsi-bus.c
    M trace-events

  Log Message:
  -----------
  scsi: do not call scsi_read_data/scsi_write_data for a canceled request

Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>
(cherry picked from commit 6f6710aa99ac53b59ff0f14380830cb9ab6bdc14)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 99b1f39bd28be0cf8f0505a55a98fa9beda23fa2
      
https://github.com/qemu/qemu/commit/99b1f39bd28be0cf8f0505a55a98fa9beda23fa2
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M hw/scsi-disk.c

  Log Message:
  -----------
  scsi-disk: do not complete canceled UNMAP requests

Canceled requests should never be completed, and doing that could cause
accesses to a NULL hba_private field.

Cc: address@hidden
Reported-by: Stefan Priebe <address@hidden>
Tested-by: Stefan Priebe <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
(cherry picked from commit d0242eadc5bba4f3abe34bc5d536bbfb81aa9891)

Signed-off-by: Michael Roth <address@hidden>


  Commit: c3b81e01b894f03b03db99804da89068064b3ad8
      
https://github.com/qemu/qemu/commit/c3b81e01b894f03b03db99804da89068064b3ad8
  Author: Cole Robinson <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M tests/rtc-test.c

  Log Message:
  -----------
  rtc-test: Fix test failures with recent glib

As of glib 2.35.4, glib changed its logic for ordering test cases:

https://bugzilla.gnome.org/show_bug.cgi?id=694487

This was causing failures in rtc-test. Group the reordered test
cases into their own suite, which maintains the original ordering.

CC: address@hidden
Signed-off-by: Cole Robinson <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
(cherry picked from commit eeb29fb9aa733f97d85857c210d6580a92a1b532)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 4d1cdb9efd76faf0f6dc0f5aa137842cf16d9ee6
      
https://github.com/qemu/qemu/commit/4d1cdb9efd76faf0f6dc0f5aa137842cf16d9ee6
  Author: Christian Borntraeger <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M hw/s390x/s390-virtio-bus.c

  Log Message:
  -----------
  Allow virtio-net features for legacy s390 virtio bus

Enable all virtio-net features for the legacy s390 virtio bus. This also fixes
kernel BUG at 
/usr/src/packages/BUILD/kernel-default-3.0.58/linux-3.0/drivers/s390/kvm/kvm_virtio.c:121!

Signed-off-by: Christian Borntraeger <address@hidden>
Cc: address@hidden
Signed-off-by: Alexander Graf <address@hidden>
(cherry picked from commit 35569cea79fd3f5ccb5b23ca024c7d3aa4d24e75)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 51943504d5104474d3ec9983a1175c53762877de
      
https://github.com/qemu/qemu/commit/51943504d5104474d3ec9983a1175c53762877de
  Author: David Gibson <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M hw/spapr.c

  Log Message:
  -----------
  pseries: Add compatible property to root of device tree

Currently, for the pseries machine the device tree supplied by qemu to SLOF
and from there to the guest does not include a 'compatible property' at the
root level.  Usually that works fine, since in this case the compatible
property doesn't really give any information not already found in the
'device_type' or 'model' properties.

However, the lack of 'compatible' confuses the bootloader install in the
SLES11 SP2 and SLES11 SP3 installers.  This patch therefore adds a token
'compatible' property to work around that.

Signed-off-by: David Gibson <address@hidden>
Cc: address@hidden
Signed-off-by: Alexander Graf <address@hidden>
(cherry picked from commit d63919c93e6fb0587632adafba82c21e55ea4396)

Signed-off-by: Michael Roth <address@hidden>


  Commit: d3652a1b286063f02425adc18515804272ebef18
      
https://github.com/qemu/qemu/commit/d3652a1b286063f02425adc18515804272ebef18
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M block/qcow2-cluster.c
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: make is_allocated return true for zero clusters

Otherwise, live migration of the top layer will miss zero clusters and
let the backing file show through.  This also matches what is done in qed.

QCOW2_CLUSTER_ZERO clusters are invalid in v2 image files.  Check this
directly in qcow2_get_cluster_offset instead of replicating the test
everywhere.

Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
(cherry picked from commit 381b487d54ba18c73df9db8452028a330058c505)

Signed-off-by: Michael Roth <address@hidden>


  Commit: f305d504ab1114c578a64c90e17885129eb8d0aa
      
https://github.com/qemu/qemu/commit/f305d504ab1114c578a64c90e17885129eb8d0aa
  Author: Michael Roth <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M qga/commands-posix.c
    M qga/guest-agent-core.h
    M qga/main.c

  Log Message:
  -----------
  qemu-ga: use key-value store to avoid recycling fd handles after restart

Hosts hold on to handles provided by guest-file-open for periods that can
span beyond the life of the qemu-ga process that issued them. Since these
are issued starting from 0 on every restart, we run the risk of issuing
duplicate handles after restarts/reboots.

As a result, users with a stale copy of these handles may end up
reading/writing corrupted data due to their existing handles effectively
being re-assigned to an unexpected file or offset.

We unfortunately do not issue handles as strings, but as integers, so a
solution such as using UUIDs can't be implemented without introducing a
new interface.

As a workaround, we fix this by implementing a persistent key-value store
that will be used to track the value of the last handle that was issued
across restarts/reboots to avoid issuing duplicates.

The store is automatically written to the same directory we currently
set via --statedir to track fsfreeze state, and so should be applicable
for stable releases where this flag is supported.

A follow-up can use this same store for handling fsfreeze state, but
that change is cosmetic and left out for now.

Signed-off-by: Michael Roth <address@hidden>
Cc: address@hidden

* fixed guest_file_handle_add() return value from uint64_t to int64_t
(cherry picked from commit 39097daf15c42243742667607d2cad2c9dc4f764)

Signed-off-by: Michael Roth <address@hidden>


  Commit: d26efd2d39b879fd5ff4cee9676ba03391101d67
      
https://github.com/qemu/qemu/commit/d26efd2d39b879fd5ff4cee9676ba03391101d67
  Author: Peter Crosthwaite <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M qga/main.c

  Log Message:
  -----------
  qga/main.c: Don't use g_key_file_get/set_int64

These functions don't exist until glib version 2.26. QEMU is currently only
mandating glib 2.12.

This patch replaces the functions with g_key_file_get/set_integer.

Unbreaks the build on Ubuntu 10.04 and RHEL 5.6.

Regression was introduced by 39097daf15c42243742667607d2cad2c9dc4f764

Signed-off-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>
(cherry picked from commit 4f306496183d81aed4b43762cf3bfd6e054de767)

Signed-off-by: Michael Roth <address@hidden>


  Commit: b0da310a69a4516dd49597e73b812747d8da05e9
      
https://github.com/qemu/qemu/commit/b0da310a69a4516dd49597e73b812747d8da05e9
  Author: Yeongkyoon Lee <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M translate-all.c

  Log Message:
  -----------
  tcg: Fix occasional TCG broken problem when ldst optimization enabled

is_tcg_gen_code() checks the upper limit of TCG generated code range wrong, so
that TCG could get broken occasionally only when CONFIG_QEMU_LDST_OPTIMIZATION
enabled. The reason is code_gen_buffer_max_size does not cover the upper range
up to (TCG_MAX_OP_SIZE * OPC_BUF_SIZE), thus code_gen_buffer_max_size should be
modified to code_gen_buffer_size.

CC: address@hidden
Signed-off-by: Yeongkyoon Lee <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
(cherry picked from commit 52ae646d4a3ebdcdcc973492c6a56f2c49b6578f)

Conflicts:

        translate-all.c

*modified to use non-tcg-ctx version of code_gen_* variables

Signed-off-by: Michael Roth <address@hidden>


  Commit: 3c3de7c6b4cc78bf312e45402c60ce2a8e8a39ed
      
https://github.com/qemu/qemu/commit/3c3de7c6b4cc78bf312e45402c60ce2a8e8a39ed
  Author: Cornelia Huck <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M hw/s390x/s390-virtio-ccw.c

  Log Message:
  -----------
  virtio-ccw: Queue sanity check for notify hypercall.

Verify that the virtio-ccw notify hypercall passed a reasonable
value for queue.

Cc: address@hidden
Reported-by: Alexander Graf <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
(cherry picked from commit b57ed9bf075e33cdd2f9eb545ff555301dd57221)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 43e00611bcf40cde483b2d44374ae0ff15eed346
      
https://github.com/qemu/qemu/commit/43e00611bcf40cde483b2d44374ae0ff15eed346
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M qemu-bridge-helper.c

  Log Message:
  -----------
  qemu-bridge-helper: force usage of a very high MAC address for the bridge

Linux uses the lowest enslaved MAC address as the MAC address of
the bridge.  Set MAC address to a high value so that it does not
affect the MAC address of the bridge.

Changing the MAC address of the bridge could cause a few seconds
of network downtime.

Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>
(cherry picked from commit 226ecabfbd410c7b2041385ea4b6f083a09ce8a2)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 4e4566ce78e8d0668a0b66c90b4bc01b5c88d050
      
https://github.com/qemu/qemu/commit/4e4566ce78e8d0668a0b66c90b4bc01b5c88d050
  Author: Michal Privoznik <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: Require at least spice-protocol-0.12.3

As of 5a49d3e9 we assume SPICE_PORT_EVENT_BREAK to be defined.
However, it is defined not in 0.12.2 what we require now, but in
0.12.3.  Therefore in order to prevent build failure we must
adjust our minimal requirements.

Signed-off-by: Stefan Hajnoczi <address@hidden>
(cherry picked from commit 358689fe299c306f1d81bea57a5067d0abb56699)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 611c7f2c3aba7885fd94a4b267e419f351d37a0f
      
https://github.com/qemu/qemu/commit/611c7f2c3aba7885fd94a4b267e419f351d37a0f
  Author: David Gibson <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M hw/spapr_llan.c

  Log Message:
  -----------
  pseries: Add cleanup hook for PAPR virtual LAN device

Currently the spapr-vlan device does not supply a cleanup call for its
NetClientInfo structure.  With current qemu versions, that leads to a SEGV
on exit, when net_cleanup() attempts to call the cleanup handlers on all
net clients.

Signed-off-by: David Gibson <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
(cherry picked from commit 156dfaded87d718a9ea798083e1c3e5ea7526713)

Signed-off-by: Michael Roth <address@hidden>


  Commit: e09b99b54f1c2dac52e16d2666388c5813bb9a73
      
https://github.com/qemu/qemu/commit/e09b99b54f1c2dac52e16d2666388c5813bb9a73
  Author: Andreas Färber <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M target-ppc/translate_init.c

  Log Message:
  -----------
  target-ppc: Fix CPU_POWERPC_MPC8547E

It was defined to ..._MPC8545E_v21 rather than ..._MPC8547E_v21.
Due to both resolving to CPU_POWERPC_e500v2_v21 this did not show.

Fixing this nontheless helps with QOM'ifying CPU aliases.

Signed-off-by: Andreas Färber <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
(cherry picked from commit 0136d715ad985fccb8fed4bb5081d5bd20bfe88c)

Signed-off-by: Michael Roth <address@hidden>


  Commit: b91aee581090f9066a09111a220cf5c300fa56cc
      
https://github.com/qemu/qemu/commit/b91aee581090f9066a09111a220cf5c300fa56cc
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M hw/macio.c

  Log Message:
  -----------
  ide/macio: Fix macio DMA initialisation.

Commit 07a7484e5d713f1eb7c1c37b18a8ab0d56d88875 accidentally introduced a bug
in the initialisation of the second macio DMA device which could cause some
DMA operations to segfault QEMU.

CC: Andreas Färber <address@hidden>
Signed-off-by: Mark Cave-Ayland <address@hidden>
Acked-by: Andreas Färber <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
(cherry picked from commit 02d583c7232d65920634f7553700eb348f84e472)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 7a687aed28c216e7779661124c066b80e1e54fb1
      
https://github.com/qemu/qemu/commit/7a687aed28c216e7779661124c066b80e1e54fb1
  Author: Christian Borntraeger <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M hw/virtio-blk.c

  Log Message:
  -----------
  virtio-blk: fix unplug + virsh reboot

virtio-blk registers a vmstate change handler. Unfortunately this
handler is not unregistered on unplug, leading to some random
crashes if the system is restarted, e.g. via virsh reboot.
Lets unregister the vmstate change handler if the device is removed.

Signed-off-by: Christian Borntraeger <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
(cherry picked from commit 69b302b2044a9a0f6d157d25b39a91ff7124c61f)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 5610ef5863a7834f0680f520beb8c48b2dc107e4
      
https://github.com/qemu/qemu/commit/5610ef5863a7834f0680f520beb8c48b2dc107e4
  Author: Orit Wasserman <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M page_cache.c

  Log Message:
  -----------
  Fix page_cache leak in cache_resize

Signed-off-by: Orit Wasserman <address@hidden>

Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
(cherry picked from commit 0db65d624e0211a43c011579d6607a50d8f06082)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 0fcf00b55c6a5fb8af1f62a9eb4cbfa3171709e6
      
https://github.com/qemu/qemu/commit/0fcf00b55c6a5fb8af1f62a9eb4cbfa3171709e6
  Author: Peter Lieven <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M page_cache.c

  Log Message:
  -----------
  page_cache: fix memory leak

XBZRLE encoded migration introduced a MRU page cache
meachnism. Unfortunately, cached items where never freed in
case of a collision in the page cache on cache_insert().

This lead to out of memory conditions during XBZRLE migration
if the page cache was small and there where a lot of collisions
in the cache.

Signed-off-by: Peter Lieven <address@hidden>
Signed-off-by: Orit Wasserman <address@hidden>

Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
(cherry picked from commit 32a1c08b60a8ac0e63b54a5793a26b5e32b36618)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 02ea844746e072fccd30b046a383265434d3dde8
      
https://github.com/qemu/qemu/commit/02ea844746e072fccd30b046a383265434d3dde8
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M block/qcow2-refcount.c

  Log Message:
  -----------
  qcow2: flush refcount cache correctly in alloc_refcount_block()

update_refcount() affects the refcount cache, it does not write to disk.
Therefore bdrv_flush(bs->file) does nothing.  We need to flush the
refcount cache in order to write out the refcount updates!

While we're here also add error returns when qcow2_cache_flush() fails.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
(cherry picked from commit 9991923b262dc35f6dd8393ab4853edd7fc3724f)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 7d47b243d6dff50906bbdba1acb1090ee0c4937f
      
https://github.com/qemu/qemu/commit/7d47b243d6dff50906bbdba1acb1090ee0c4937f
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M block/qcow2-snapshot.c

  Log Message:
  -----------
  qcow2: flush refcount cache correctly in qcow2_write_snapshots()

Since qcow2 metadata is cached we need to flush the caches, not just the
underlying file.  Use bdrv_flush(bs) instead of bdrv_flush(bs->file).

Also add the error return path when bdrv_flush() fails and move the
flush after checking for qcow2_alloc_clusters() failure so that the
qcow2_alloc_clusters() error return value takes precedence.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
(cherry picked from commit f6977f15561973d4a67b6aa46da88aa678c505dd)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 02493ee4906715e73bb98f6778a19b37924347e0
      
https://github.com/qemu/qemu/commit/02493ee4906715e73bb98f6778a19b37924347e0
  Author: John Rigby <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M linux-user/syscall.c

  Log Message:
  -----------
  linux-user/syscall.c: handle FUTEX_WAIT_BITSET in do_futex

Upstream libc has recently changed to start using
FUTEX_WAIT_BITSET instead of FUTEX_WAIT and this
is causing do_futex to return -TARGET_ENOSYS.

Pass bitset in val3 to sys_futex which will be
ignored by kernel for the FUTEX_WAIT case.

Signed-off-by: John Rigby <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
(cherry picked from commit cce246e0a21577bb2372ab3a7d6789371e087de9)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 7a238b9fbdd0f4d21e8b1d5825067f92c394449c
      
https://github.com/qemu/qemu/commit/7a238b9fbdd0f4d21e8b1d5825067f92c394449c
  Author: John Rigby <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M linux-user/strace.c

  Log Message:
  -----------
  linux-user: fix futex strace of FUTEX_CLOCK_REALTIME

Handle same as existing FUTEX_PRIVATE_FLAG.

Signed-off-by: John Rigby <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
(cherry picked from commit bfb669f39f2ecd854992924ced20b00163509043)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 8378910554a03d54c22ab46cfaec491ee95b8315
      
https://github.com/qemu/qemu/commit/8378910554a03d54c22ab46cfaec491ee95b8315
  Author: Peter Maydell <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M linux-user/syscall.c

  Log Message:
  -----------
  linux-user: make bogus negative iovec lengths fail EINVAL

If the guest passes us a bogus negative length for an iovec, fail
EINVAL rather than proceeding blindly forward. This fixes some of
the error cases tests for readv and writev in the LTP.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
(cherry picked from commit dfae8e00f8ddeedcda24bd28f71d4fd2a9f988b8)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 799a34a48ba609f1157bf9a7ec1170e7d67faab0
      
https://github.com/qemu/qemu/commit/799a34a48ba609f1157bf9a7ec1170e7d67faab0
  Author: Peter Maydell <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M linux-user/syscall.c

  Log Message:
  -----------
  linux-user/syscall.c: Don't warn about unimplemented get_robust_list

The nature of the kernel ABI for the get_robust_list and set_robust_list
syscalls means we cannot implement them in QEMU. Make get_robust_list
silently return ENOSYS rather than using the default "print message and
then fail ENOSYS" code path, in the same way we already do for
set_robust_list, and add a comment documenting why we do this.

This silences warnings which were being produced for emulating
even trivial programs like 'ls' in x86-64-on-x86-64.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
(cherry picked from commit e9a970a8316f9f86a6c800a9a90175bd593f862c)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 01357962718faee20d558dc5ee8ae248427af9e5
      
https://github.com/qemu/qemu/commit/01357962718faee20d558dc5ee8ae248427af9e5
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M pc-bios/bios.bin
    M roms/seabios

  Log Message:
  -----------
  update seabios to 1.7.2.1

Alex Williamson (3):
      seabios q35: Enable all PIRQn IRQs at startup
      seabios q35: Add new PCI slot to irq routing function
      seabios: Add a dummy PCI slot to irq mapping function

Avik Sil (1):
      USB-EHCI: Fix null pointer assignment

Kevin O'Connor (4):
      Update tools/acpi_extract.py to handle iasl 20130117 release.
      Fix Makefile - don't reference "out/" directly, instead use "$(OUT)".
      build: Don't require $(OUT) to be a sub-directory of the main
directory.
      Verify CC is valid during build tests.

Signed-off-by: Gerd Hoffmann <address@hidden>
(cherry picked from commit 5c75fb10029c5fd1e705a6ef5d698fbea06c7a33)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 68f9df599042482e54cd92193d3a8679c2b35bc7
      
https://github.com/qemu/qemu/commit/68f9df599042482e54cd92193d3a8679c2b35bc7
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M block/nbd.c
    M block/sheepdog.c
    M include/qemu/sockets.h
    M migration-tcp.c
    M migration-unix.c
    M migration.c
    M nbd.c
    M net/socket.c
    M qemu-char.c
    M slirp/misc.c
    M slirp/tcp_subr.c
    M ui/vnc.c
    M util/oslib-posix.c
    M util/oslib-win32.c
    M util/qemu-sockets.c

  Log Message:
  -----------
  oslib-posix: rename socket_set_nonblock() to qemu_set_nonblock()

The fcntl(fd, F_SETFL, O_NONBLOCK) flag is not specific to sockets.
Rename to qemu_set_nonblock() just like qemu_set_cloexec().

Signed-off-by: Stefan Hajnoczi <address@hidden>
(cherry picked from commit 399f1c8f8af1f6f8b18ef4e37169c6301264e467)

Signed-off-by: Stefan Hajnoczi <address@hidden>

Conflicts:
        block/sheepdog.c

socket_set_block()/socket_set_nonblock() calls in different locations

        include/qemu/sockets.h

socket_set_nodelay() does not exist in v1.4.0, messes up diff context

        qemu-char.c

glib G_IO_IN events are not used in v1.4.0, messes up diff context

        savevm.c

qemu_fopen_socket() only has read mode in v1.4.0, qemu_set_block() not
necessary.

        slirp/misc.c

unportable setsockopt() calls in v1.4.0 mess up diff context

        slirp/tcp_subr.c

file was reformatted, diff context is messed up

        ui/vnc.c

old dcl->idle instead of vd->dcl.idle messes up diff context

Added:
        migration-tcp.c, migration-unix.c

qemu_fopen_socket() write mode does not exist yet, qemu_set_block() call
is needed here.
Signed-off-by: Michael Roth <address@hidden>


  Commit: a1cb89f3fedd6206bc1d99744f303afad2fa6dee
      
https://github.com/qemu/qemu/commit/a1cb89f3fedd6206bc1d99744f303afad2fa6dee
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M net/socket.c

  Log Message:
  -----------
  net: ensure "socket" backend uses non-blocking fds

There are several code paths in net_init_socket() depending on how the
socket is created: file descriptor passing, UDP multicast, TCP, or UDP.
Some of these support both listen and connect.

Not all code paths set the socket to non-blocking.  This patch addresses
the file descriptor passing and UDP cases which were missing
socket_set_nonblock(fd) calls.

I considered moving socket_set_nonblock(fd) to a central location but it
turns out the code paths are different enough to require non-blocking at
different places.

Signed-off-by: Stefan Hajnoczi <address@hidden>
(cherry picked from commit f05b707279dc7c29ab10d9d13dbf413df6ec22f1)

Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 283b7de6a57ff96db89d46874cfdb6fc590760dc
      
https://github.com/qemu/qemu/commit/283b7de6a57ff96db89d46874cfdb6fc590760dc
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M util/qemu-sockets.c

  Log Message:
  -----------
  qemu-socket: set passed fd non-blocking in socket_connect()

socket_connect() sets non-blocking on TCP or UNIX domain sockets if a
callback function is passed.  Do the same for file descriptor passing,
otherwise we could unexpectedly be using a blocking file descriptor.

Signed-off-by: Stefan Hajnoczi <address@hidden>
(cherry picked from commit 35fb94fa292173a3e1df0768433e06912a2a88e4)

Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 27c71355fbf7f999f3fbb8ec42ec88210211b6f4
      
https://github.com/qemu/qemu/commit/27c71355fbf7f999f3fbb8ec42ec88210211b6f4
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M qemu-char.c

  Log Message:
  -----------
  chardev: clear O_NONBLOCK on SCM_RIGHTS file descriptors

When we receive a file descriptor over a UNIX domain socket the
O_NONBLOCK flag is preserved.  Clear the O_NONBLOCK flag and rely on
QEMU file descriptor users like migration, SPICE, VNC, block layer, and
others to set non-blocking only when necessary.

This change ensures we don't accidentally expose O_NONBLOCK in the QMP
API.  QMP clients should not need to get the non-blocking state
"correct".

A recent real-world example was when libvirt passed a non-blocking TCP
socket for migration where we expected a blocking socket.  The source
QEMU produced a corrupted migration stream since its code did not cope
with non-blocking sockets.

Signed-off-by: Stefan Hajnoczi <address@hidden>
(cherry picked from commit e374f7f816171f9783c1d9d00a041f26379f1ac6)

Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 57e929c19c5aec8cbb572ec218ff6cbe250f5fc1
      
https://github.com/qemu/qemu/commit/57e929c19c5aec8cbb572ec218ff6cbe250f5fc1
  Author: Hans de Goede <address@hidden>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M hw/usb/dev-hid.c

  Log Message:
  -----------
  usb-tablet: Don't claim wakeup capability for USB-2 version

Our ehci code does not implement wakeup support, so claiming support for
it with usb-tablet in USB-2 mode causes all tablet events to get lost.

http://bugzilla.redhat.com/show_bug.cgi?id=929068

Signed-off-by: Hans de Goede <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
(cherry picked from commit aa1c9e971e80d25b92908dce3dec7c38b49480ea)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 79a4dd4085fceaaf23b619e1e269478306226f16
      
https://github.com/qemu/qemu/commit/79a4dd4085fceaaf23b619e1e269478306226f16
  Author: Petar Jovanovic <address@hidden>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M target-mips/dsp_helper.c
    M tests/tcg/mips/mips32-dspr2/mulq_s_ph.c

  Log Message:
  -----------
  target-mips: fix for incorrect multiplication with MULQ_S.PH

The change corrects sign-related issue with MULQ_S.PH. It also includes
extension to the already existing test which will trigger the issue.

Signed-off-by: Petar Jovanovic <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
(cherry picked from commit 9c19eb1e205b29018f6f61c5f43db6abbe7dc0e5)

Signed-off-by: Michael Roth <address@hidden>


  Commit: b09a67316484af24427a7174b65531e9c0b6e6b4
      
https://github.com/qemu/qemu/commit/b09a67316484af24427a7174b65531e9c0b6e6b4
  Author: Petar Jovanovic <address@hidden>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M target-mips/dsp_helper.c
    M tests/tcg/mips/mips32-dspr2/mulq_rs_w.c
    M tests/tcg/mips/mips32-dspr2/mulq_s_w.c

  Log Message:
  -----------
  target-mips: fix for sign-issue in MULQ_W helper

Correct sign-propagation before multiplication in MULQ_W helper.
The change also fixes previously incorrect expected values in the
tests for MULQ_RS.W and MULQ_S.W.

Signed-off-by: Petar Jovanovic <address@hidden>
Richard Henderson <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
(cherry picked from commit a345481baa2b2fb3d54f8c9ddb58dfcaf75786df)

Signed-off-by: Michael Roth <address@hidden>


  Commit: dac077f0e6f02791d4206aa05e034b6ebbce0ba7
      
https://github.com/qemu/qemu/commit/dac077f0e6f02791d4206aa05e034b6ebbce0ba7
  Author: Petar Jovanovic <address@hidden>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M target-mips/dsp_helper.c
    M tests/tcg/mips/mips32-dsp/subq_s_ph.c
    M tests/tcg/mips/mips32-dsp/subq_s_w.c

  Log Message:
  -----------
  target-mips: fix DSP overflow macro and affected routines

The previous implementation incorrectly used same macro to detect overflow
for addition and subtraction. This patch makes distinction between these
two, and creates separate macros. The affected routines are changed
accordingly.

This change also includes additions to the existing tests for SUBQ_S_PH and
SUBQ_S_W that would trigger the fixed issue, and it removes dead code from
the test file. The last test case in subq_s_w.c is a bug found/reported/
isolated by Klaus Peichl from Dolby.

Signed-off-by: Petar Jovanovic <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
(cherry picked from commit 20c334a797bf46a4ee59a6e42be6d5e7c3cda585)

Signed-off-by: Michael Roth <address@hidden>


  Commit: d019dd928c68038c539fa0a5ba92f046fed12a6c
      
https://github.com/qemu/qemu/commit/d019dd928c68038c539fa0a5ba92f046fed12a6c
  Author: Petar Jovanovic <address@hidden>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M target-mips/dsp_helper.c
    M tests/tcg/mips/mips32-dsp/extr_r_w.c
    M tests/tcg/mips/mips32-dsp/extr_rs_w.c
    M tests/tcg/mips/mips32-dsp/extr_w.c

  Log Message:
  -----------
  target-mips: fix rndrashift_short_acc and code for EXTR_ instructions

Fix for rndrashift_short_acc to set correct value to higher 64 bits.
This change also corrects conditions when bit 23 of the DSPControl register
is set.

The existing test files have been extended with several examples that
trigger the issues. One bug/example in the test file for EXTR_RS_W has been
found and reported by Klaus Peichl.

Signed-off-by: Petar Jovanovic <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
(cherry picked from commit 8b758d0568a986d58c254b3c209691c82e0f82a1)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 888e036eb4f03ec266be05cec3d047488dcaa165
      
https://github.com/qemu/qemu/commit/888e036eb4f03ec266be05cec3d047488dcaa165
  Author: Bruce Rogers <address@hidden>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M hw/acpi.c
    M hw/acpi.h
    M hw/acpi_ich9.c
    M hw/acpi_piix4.c
    M hw/vt82c686.c

  Log Message:
  -----------
  acpi: initialize s4_val used in s4 shutdown

While investigating why a 32 bit Windows 2003 guest wasn't able to
successfully perform a shutdown /h, it was discovered that commit
afafe4bbe0cf7d3318e1ac7b40925561f86a6bd4 inadvertently dropped the
initialization of the s4_val used to handle s4 shutdown.
Initialize the value as before.

Signed-off-by: Bruce Rogers <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>
(cherry picked from commit 560e63965232e37d1916a447125cf91c18a96930)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 65fe29ec000bd3d5b8fd4d15c2379fe6c24dae94
      
https://github.com/qemu/qemu/commit/65fe29ec000bd3d5b8fd4d15c2379fe6c24dae94
  Author: Markus Armbruster <address@hidden>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  doc: Fix texinfo @table markup in qemu-options.hx

End tables before headings, start new ones afterwards.  Fixes
incorrect indentation of headings "File system options" and "Virtual
File system pass-through options" in manual page and qemu-doc.

Normalize markup some to increase chances it survives future edits.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>
(cherry picked from commit c70a01e449536c616c85ab820c6fbad7d7e9cf39)

Signed-off-by: Michael Roth <address@hidden>


  Commit: d15b1aa30c8b57e89beb41d67cd87cd4fbaacd8c
      
https://github.com/qemu/qemu/commit/d15b1aa30c8b57e89beb41d67cd87cd4fbaacd8c
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M hw/qxl.c

  Log Message:
  -----------
  qxl: better vga init in enter_vga_mode

Ask the vga core to update the display.  Will trigger dpy_gfx_resize
if needed.  More complete than just calling dpy_gfx_resize.

Signed-off-by: Gerd Hoffmann <address@hidden>
(cherry picked from commit c099e7aa0295678859d58e9e60b7619f6ae3bac8)

Signed-off-by: Michael Roth <address@hidden>


  Commit: e4cce2d3e9dbdb1c82994f024c0c7e2d2661547e
      
https://github.com/qemu/qemu/commit/e4cce2d3e9dbdb1c82994f024c0c7e2d2661547e
  Author: Peter Lieven <address@hidden>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M block.c

  Log Message:
  -----------
  Revert "block: complete all IOs before .bdrv_truncate"

brdv_truncate() is also called from readv/writev commands on self-
growing file based storage. this will result in requests waiting
for theirselves to complete.

This reverts commit 9a665b2b8640e464f0a778216fc2dca8d02acf33.

Signed-off-by: Kevin Wolf <address@hidden>
(cherry picked from commit 5c916681ae2383f0425bb8a3680ade9d055f5dfe)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 2b92aa36d112780674d5686ad9c98e8cfe68d207
      
https://github.com/qemu/qemu/commit/2b92aa36d112780674d5686ad9c98e8cfe68d207
  Author: Peter Lieven <address@hidden>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M blockdev.c

  Log Message:
  -----------
  block: complete all IOs before resizing a device

this patch ensures that all pending IOs are completed
before a device is resized. this is especially important
if a device is shrinked as it the bdrv_check_request()
result is invalidated.

Signed-off-by: Peter Lieven <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
(cherry picked from commit 92b7a08d64e5e3129fa885f9d180e5bddcb76b42)

Signed-off-by: Michael Roth <address@hidden>


  Commit: da78a1bc7a6ad2c0653c265a19032540921c15d0
      
https://github.com/qemu/qemu/commit/da78a1bc7a6ad2c0653c265a19032540921c15d0
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M include/qemu/compiler.h

  Log Message:
  -----------
  compiler: fix warning with GCC 4.8.0

GCC 4.8.0 introduces a new warning:

    block/qcow2-snapshot.c: In function 'qcow2_write_snapshots’:
    block/qcow2-snapshot.c:252:18: error: typedef 'qemu_build_bug_on__253'
        locally defined but not used [-Werror=unused-local-typedefs]
   QEMU_BUILD_BUG_ON(offsetof(QCowHeader, snapshots_offset) !=
            ^
    cc1: all warnings being treated as errors

(Caret diagnostics aren't perfect yet with macros... :)) Work around it
with __attribute__((unused)).

Signed-off-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>
(cherry picked from commit 99835e00849369bab726a4dc4ceed1f6f9ed967c)

Signed-off-by: Michael Roth <address@hidden>


  Commit: f85e082a3668dea5ca74759a314e284432f2d46b
      
https://github.com/qemu/qemu/commit/f85e082a3668dea5ca74759a314e284432f2d46b
  Author: Jason Wang <address@hidden>
  Date:   2013-04-05 (Fri, 05 Apr 2013)

  Changed paths:
    M qapi-schema.json
    M qemu-options.hx

  Log Message:
  -----------
  help: add docs for missing 'queues' option of tap

Cc: Markus Armbruster <address@hidden>
Cc: address@hidden
Signed-off-by: Jason Wang <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>
(cherry picked from commit ec3960148f95dd90e94511a6a64838bc3f474bcc)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 46f9071a23385933e7318a7c1f540852689ee0ca
      
https://github.com/qemu/qemu/commit/46f9071a23385933e7318a7c1f540852689ee0ca
  Author: Eduardo Habkost <address@hidden>
  Date:   2013-04-05 (Fri, 05 Apr 2013)

  Changed paths:
    M target-i386/cpu.c

  Log Message:
  -----------
  target-i386: Check for host features before filter_features_for_kvm()

commit 5ec01c2e96910e1588d1a0de8609b9dda7618c7f broke "-cpu ..,enforce",
as it has moved kvm_check_features_against_host() after the
filter_features_for_kvm() call. filter_features_for_kvm() removes all
features not supported by the host, so this effectively made
kvm_check_features_against_host() impossible to fail.

This patch changes the call so we check for host feature support before
filtering the feature bits.

Signed-off-by: Eduardo Habkost <address@hidden>
Message-id: address@hidden
Cc: Igor Mammedov <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
(cherry picked from commit a509d632c877f7b5fa07368879b8ae5919a6d345)

Signed-off-by: Michael Roth <address@hidden>


  Commit: d89f9ba43b5999ee7873523ea2708aff92ebf858
      
https://github.com/qemu/qemu/commit/d89f9ba43b5999ee7873523ea2708aff92ebf858
  Author: Brad Smith <address@hidden>
  Date:   2013-04-06 (Sat, 06 Apr 2013)

  Changed paths:
    M include/qemu/timer.h
    M util/qemu-timer-common.c

  Log Message:
  -----------
  Allow clock_gettime() monotonic clock to be utilized on more OS's

Allow the clock_gettime() code using monotonic clock to be utilized on
more POSIX compliannt OS's. This started as a fix for OpenBSD which was
listed in one function as part of the previous hard coded list of OS's
for the functions to support but not in the other.

Signed-off-by: Brad Smith <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>
(cherry picked from commit d05ef160453e98546a4197496dc8a3cb2defac53)

Signed-off-by: Michael Roth <address@hidden>


  Commit: 6d0b135a981f052d50a5f151b4c0dde61e4db001
      
https://github.com/qemu/qemu/commit/6d0b135a981f052d50a5f151b4c0dde61e4db001
  Author: Richard Sandiford <address@hidden>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    M target-mips/helper.h
    M target-mips/op_helper.c
    M target-mips/translate.c

  Log Message:
  -----------
  target-mips: Fix accumulator selection for MIPS16 and microMIPS

Add accumulator arguments to gen_HILO and gen_muldiv, rather than
extracting the accumulator directly from ctx->opcode.  The extraction
was only right for the standard encoding: MIPS16 doesn't have access
to the DSP registers, while microMIPS encodes the accumulator register
in a different field (bits 14 and 15).

Passing the accumulator register is probably an over-generalisation
for division and 64-bit multiplication, which never access anything
other than HI and LO, and which always pass 0 as the new argument.
Separating them felt a bit fussy though.

Signed-off-by: Richard Sandiford <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
(cherry picked from commit 26135ead80fa1fd13e95c162dacfd06f2ba82981)

Conflicts:
        target-mips/translate.c

Signed-off-by: Michael Roth <address@hidden>


  Commit: 6e8865313f56f54f5a3d3ad54f7b0b7c3587c4a9
      
https://github.com/qemu/qemu/commit/6e8865313f56f54f5a3d3ad54f7b0b7c3587c4a9
  Author: Daniel P. Berrange <address@hidden>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    M qemu-nbd.c
    M qemu-nbd.texi

  Log Message:
  -----------
  Add -f FMT / --format FMT arg to qemu-nbd

Currently the qemu-nbd program will auto-detect the format of
any disk it is given. This behaviour is known to be insecure.
For example, if qemu-nbd initially exposes a 'raw' file to an
unprivileged app, and that app runs

   'qemu-img create -f qcow2 -o backing_file=/etc/shadow /dev/nbd0'

then the next time the app is started, the qemu-nbd will now
detect it as a 'qcow2' file and expose /etc/shadow to the
unprivileged app.

The only way to avoid this is to explicitly tell qemu-nbd what
disk format to use on the command line, completely disabling
auto-detection. This patch adds a '-f' / '--format' arg for
this purpose, mirroring what is already available via qemu-img
and qemu commands.

  qemu-nbd --format raw -p 9000 evil.img

will now always use raw, regardless of what format 'evil.img'
looks like it contains

Signed-off-by: Daniel P. Berrange <address@hidden>
[Use errx, not err. - Paolo]
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

*fixed conflict due to bdrv_open() not supporting "options" param
in v1.4.1

Signed-off-by: Michael Roth <address@hidden>


  Commit: 57105f7480f7e2645dee2806e8152868bde60acb
      
https://github.com/qemu/qemu/commit/57105f7480f7e2645dee2806e8152868bde60acb
  Author: Michael Roth <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M VERSION

  Log Message:
  -----------
  update VERSION for 1.4.1

Signed-off-by: Michael Roth <address@hidden>


Compare: https://github.com/qemu/qemu/compare/80d8b5da48c2^...57105f7480f7

reply via email to

[Prev in Thread] Current Thread [Next in Thread]