summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | build: disable Xen on ARMPaolo Bonzini2017-07-111-3/+3
| |/ |/|
* | Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20170710a'...Peter Maydell2017-07-1013-77/+138
|\ \ | |/ |/|
| * migration: Make compression_threads use save/load_setup/cleanup()Juan Quintela2017-07-103-14/+8Star
| * migration: Convert ram to use new load_setup()/load_cleanup()Juan Quintela2017-07-103-17/+36
| * migration: Create load_setup()/cleanup() methodsJuan Quintela2017-07-104-1/+49
| * migration: Rename cleanup() to save_cleanup()Juan Quintela2017-07-105-7/+7
| * migration: Rename save_live_setup() to save_setup()Juan Quintela2017-07-109-14/+14
| * doc: update TYPE_MIGRATION documentsPeter Xu2017-07-101-6/+6
| * doc: add item for "-M enforce-config-section"Peter Xu2017-07-101-0/+6
| * vl: move global property, migrate init earlierPeter Xu2017-07-101-12/+12
| * migration: fix handling for --only-migratablePeter Xu2017-07-103-7/+1Star
|/
* Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-07-10-v2' into...Peter Maydell2017-07-107-260/+323
|\
| * nbd: use generic trace subsystem instead of TRACE macroVladimir Sementsov-Ogievskiy2017-07-105-95/+120
| * nbd: refactor tracingVladimir Sementsov-Ogievskiy2017-07-102-24/+9Star
| * nbd/server: rename clientflags var in nbd_negotiate_optionsVladimir Sementsov-Ogievskiy2017-07-101-19/+19
| * nbd/server: fix TRACE in nbd_negotiate_send_rep_lenVladimir Sementsov-Ogievskiy2017-07-101-1/+1
| * nbd/client: refactor TRACE of NBD_MAGICVladimir Sementsov-Ogievskiy2017-07-101-9/+2Star
| * nbd/common: nbd_tls_handshake: remove extra TRACEVladimir Sementsov-Ogievskiy2017-07-101-3/+1Star
| * nbd/server: add errp to nbd_send_reply()Vladimir Sementsov-Ogievskiy2017-07-101-8/+9
| * nbd/server: use errp instead of LOGVladimir Sementsov-Ogievskiy2017-07-101-106/+160
| * nbd/server: refactor nbd_negotiateVladimir Sementsov-Ogievskiy2017-07-101-9/+3Star
| * nbd/server: nbd_negotiate: return 1 on NBD_OPT_ABORTVladimir Sementsov-Ogievskiy2017-07-101-5/+15
| * MAINTAINERS: Promote NBD to supported, with new maintainerEric Blake2017-07-101-9/+12
|/
* Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into stagingPeter Maydell2017-07-1025-1559/+1675
|\
| * block: Make bdrv_is_allocated_above() byte-basedEric Blake2017-07-107-56/+65
| * block: Minimize raw use of bds->total_sectorsEric Blake2017-07-101-8/+6Star
| * block: Make bdrv_is_allocated() byte-basedEric Blake2017-07-109-105/+126
| * backup: Switch backup_run() to byte-basedEric Blake2017-07-101-17/+15Star
| * backup: Switch backup_do_cow() to byte-basedEric Blake2017-07-101-36/+26Star
| * backup: Switch block_backup.h to byte-basedEric Blake2017-07-103-26/+28
| * backup: Switch BackupBlockJob to byte-basedEric Blake2017-07-101-18/+15Star
| * block: Drop unused bdrv_round_sectors_to_clusters()Eric Blake2017-07-102-25/+0Star
| * mirror: Switch mirror_iteration() to byte-basedEric Blake2017-07-101-59/+46Star
| * mirror: Switch mirror_do_read() to byte-basedEric Blake2017-07-101-41/+33Star
| * mirror: Switch mirror_cow_align() to byte-basedEric Blake2017-07-101-26/+37
| * mirror: Update signature of mirror_clip_sectors()Eric Blake2017-07-101-7/+8
| * mirror: Switch mirror_do_zero_or_discard() to byte-basedEric Blake2017-07-101-9/+11
| * mirror: Switch MirrorBlockJob to byte-basedEric Blake2017-07-101-42/+42
| * commit: Switch commit_run() to byte-basedEric Blake2017-07-101-10/+6Star
| * commit: Switch commit_populate() to byte-basedEric Blake2017-07-101-7/+8
| * stream: Switch stream_run() to byte-basedEric Blake2017-07-101-13/+9Star
| * stream: Drop reached_end for stream_complete()Eric Blake2017-07-101-3/+1Star
| * stream: Switch stream_populate() to byte-basedEric Blake2017-07-101-5/+6
| * trace: Show blockjob actions via bytes, not sectorsEric Blake2017-07-105-24/+38
| * blockjob: Track job ratelimits via bytes, not sectorsEric Blake2017-07-105-13/+18
| * blockdev: Print a warning for legacy drive options that belong to -deviceThomas Huth2017-07-102-2/+21
| * qemu-img: drop -e and -6 options from the 'create' & 'convert' commandsDaniel P. Berrange2017-07-101-18/+2Star
| * vvfat: change OEM name to 'MSWIN4.1'Hervé Poussineau2017-07-101-1/+1
| * vvfat: handle KANJI lead byte 0xe5Hervé Poussineau2017-07-101-2/+7
| * vvfat: limit number of entries in root directory in FAT12/FAT16Hervé Poussineau2017-07-101-9/+17