From: Peter Maydell Date: Thu, 19 Mar 2015 10:07:23 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1f3500976d3d9d77718ba9b0e69cd4e32239ebfc;p=qmiga%2Fqemu.git Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging - kvm: ioeventfd fix for PPC64LE - virtio-scsi: misc fixes - fix for --enable-profiler - nbd: fixes from Max - build: fix for scripts/make_device_config.sh - exec: fix for address_space_translate # gpg: Signature made Wed Mar 18 11:11:08 2015 GMT using RSA key ID 78C7AE83 # gpg: Good signature from "Paolo Bonzini " # gpg: aka "Paolo Bonzini " # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini/tags/for-upstream: exec: Respect as_tranlsate_internal length clamp virtio-scsi-dataplane: fix memory leak in virtio_scsi_vring_init profiler: Reenable built-in profiler kvm: fix ioeventfd endianness on bi-endian architectures virtio-scsi: Fix assert in virtio_scsi_push_event build: pass .d file name to scripts/make_device_config.sh, fix makefile target coroutine-io: Return -errno in case of error nbd: Drop unexpected data for NBD_OPT_LIST nbd: Fix interpretation of the export flags nbd: Fix nbd_receive_options() nbd: Set block size to BDRV_SECTOR_SIZE nbd: Fix potential signed overflow issues qemu-nbd: fork() can fail nbd: Handle blk_getlength() failure nbd: Pass return value from nbd_handle_list() nbd: Fix nbd_establish_connection()'s return value qemu-nbd: Detect unused partitions by system == 0 util/uri: Add overflow check to rfc3986_parse_port nbd: Fix overflow return value Signed-off-by: Peter Maydell --- 1f3500976d3d9d77718ba9b0e69cd4e32239ebfc