summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20150615' into s...Peter Maydell2015-06-1513-11/+262
|\
| * s390/bios: build with -fdelete-null-pointer-checksAurelien Jarno2015-06-151-1/+1
| * watchdog: Add new Virtual Watchdog action INJECT-NMIMao Chuan Li2015-06-112-1/+15
| * nmi: Implement inject_nmi() for non-monitor context useXu Wang2015-06-112-0/+21
| * s390x/watchdog: diag288 migration supportXu Wang2015-06-111-0/+12
| * s390x/kvm: diag288 instruction interception and handlingXu Wang2015-06-113-0/+48
| * s390x/watchdog: introduce diag288 watchdog deviceXu Wang2015-06-115-0/+151
| * watchdog: change option wording to allow for more watchdogsXu Wang2015-06-111-9/+14
* | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into stagingPeter Maydell2015-06-1525-158/+657
|\ \
| * | block: Fix reopen flag inheritanceKevin Wolf2015-06-122-28/+13Star
| * | block: Add BlockDriverState.inherits_fromKevin Wolf2015-06-122-0/+21
| * | block: Add list of children to BlockDriverStateKevin Wolf2015-06-122-0/+45
| * | queue.h: Add QLIST_FIX_HEAD_PTR()Kevin Wolf2015-06-121-0/+6
| * | block: Drain requests before swapping nodes in bdrv_swap()Kevin Wolf2015-06-121-0/+6
| * | block: Move flag inheritance to bdrv_open_inherit()Kevin Wolf2015-06-127-22/+78
| * | block: Use QemuOpts in bdrv_open_common()Kevin Wolf2015-06-121-5/+33
| * | block: Use macro for cache option namesKevin Wolf2015-06-122-12/+20
| * | vmdk: Use bdrv_open_image()Kevin Wolf2015-06-121-13/+21
| * | quorum: Use bdrv_open_image()Kevin Wolf2015-06-121-40/+11Star
| * | check-qdict: Test cases for new functionsKevin Wolf2015-06-121-0/+67
| * | qdict: Add qdict_{set,copy}_default()Kevin Wolf2015-06-122-0/+36
| * | qdict: Add qdict_array_entries()Kevin Wolf2015-06-122-4/+75
| * | iotests: Add tests for overriding BDRV_O_PROTOCOLMax Reitz2015-06-125-0/+153
| * | block: driver should override flags in bdrv_open()Max Reitz2015-06-123-22/+31
| * | block: Change bitmap truncate conditional to assertionJohn Snow2015-06-121-3/+1Star
| * | block: record new size in bdrv_dirty_bitmap_truncateJohn Snow2015-06-121-0/+1
| * | raw-posix: Fix .bdrv_co_get_block_status() for unaligned image sizeKevin Wolf2015-06-121-2/+3
| * | vmdk: Use vmdk_find_index_in_cluster everywhereFam Zheng2015-06-121-8/+2Star
| * | vmdk: Fix index_in_cluster calculation in vmdk_co_get_block_statusFam Zheng2015-06-121-1/+12
| * | qcow2: Add DEFAULT_L2_CACHE_CLUSTERSMax Reitz2015-06-122-3/+10
| * | iotests: qcow2 COW with minimal L2 cache sizeMax Reitz2015-06-122-0/+15
| * | qcow2: Set MIN_L2_CACHE_SIZE to 2Max Reitz2015-06-121-1/+2
| * | qemu-iotests: Fix 128 if sudo requiredFam Zheng2015-06-121-1/+3
| * | iotests: remove assertIsNotNone callJohn Snow2015-06-121-1/+1
* | | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ...Peter Maydell2015-06-1221-221/+956
|\ \ \
| * | | qemu-iotests: expand test 093 to support group throttlingAlberto Garcia2015-06-121-28/+65
| * | | throttle: Update throttle infrastructure copyrightAlberto Garcia2015-06-122-6/+10
| * | | throttle: add the name of the ThrottleGroup to BlockDeviceInfoAlberto Garcia2015-06-123-3/+10
| * | | throttle: acquire the ThrottleGroup lock in bdrv_swap()Alberto Garcia2015-06-123-1/+49
| * | | throttle: Add throttle group supportAlberto Garcia2015-06-1212-85/+309
| * | | throttle: Add throttle group infrastructure testsAlberto Garcia2015-06-121-10/+71
| * | | throttle: Add throttle group infrastructureAlberto Garcia2015-06-124-0/+302
| * | | throttle: Extract timers from ThrottleState into a separate structureBenoƮt Canet2015-06-126-94/+135
| * | | raw-posix: Fix .bdrv_co_get_block_status() for unaligned image sizeKevin Wolf2015-06-121-2/+3
| * | | Revert "iothread: release iothread around aio_poll"Stefan Hajnoczi2015-06-123-14/+24
* | | | Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into st...Peter Maydell2015-06-1244-277/+1364
|\ \ \ \
| * | | | qmp/hmp: add rocker device supportScott Feldman2015-06-1213-0/+1170
| * | | | rocker: bring link up/down on PHY enable/disableScott Feldman2015-06-121-0/+12
| * | | | rocker: update tests using hw-derived interface namesScott Feldman2015-06-125-76/+56Star
| * | | | rocker: Add support for phys nameDavid Ahern2015-06-125-2/+31