summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/awilliam/tags/vfio-updates-20161031.0' ...Peter Maydell2016-10-311-15/+32
|\
| * memory: Don't use memcpy for ram_device regionsAlex Williamson2016-10-311-2/+4
| * memory: Replace skip_dump flag with "ram_device"Alex Williamson2016-10-311-13/+28
* | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into stagingPeter Maydell2016-10-313-0/+18
|\ \
| * | block: Add block_job_add_bdrv()Alberto Garcia2016-10-311-0/+14
| * | block: Add bdrv_drain_all_{begin,end}()Alberto Garcia2016-10-311-0/+2
| * | util/qemu-sockets: Make inet_connect_saddr() publicAshijeet Acharya2016-10-311-0/+2
| |/
* | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream-mttcg' into s...Peter Maydell2016-10-312-5/+28
|\ \ | |/ |/|
| * *_run_on_cpu: introduce run_on_cpu_data typePaolo Bonzini2016-10-311-5/+23
| * tcg: comment on which functions have to be called with tb_lock heldPaolo Bonzini2016-10-312-0/+4
| * translate-all: add DEBUG_LOCKING assertsAlex Bennée2016-10-311-0/+1
* | Merge remote-tracking branch 'remotes/amit-migration/tags/migration-for-2.8' ...Peter Maydell2016-10-313-0/+72
|\ \
| * | COLO: Implement the process of failover for primary VMzhanghailiang2016-10-302-0/+4
| * | COLO: Introduce state to record failover processzhanghailiang2016-10-301-0/+5
| * | COLO: Add 'x-colo-lost-heartbeat' command to trigger failoverzhanghailiang2016-10-302-0/+23
| * | migration: Switch to COLO process after finishing loadvmzhanghailiang2016-10-302-0/+14
| * | migration: Enter into COLO mode after migration if COLO is enabledzhanghailiang2016-10-301-0/+3
| * | COLO: migrate COLO related info to secondary nodezhanghailiang2016-10-301-0/+2
| * | migration: Introduce capability 'x-colo' to migrationzhanghailiang2016-10-302-0/+21
* | | Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20161028-tag' into...Peter Maydell2016-10-312-66/+84
|\ \ \
| * | | xen: Rename xen_be_del_xendevEmil Condrea2016-10-291-1/+1
| * | | xen: Rename xen_be_find_xendevEmil Condrea2016-10-291-1/+1
| * | | xen: Rename xen_be_evtchn_eventEmil Condrea2016-10-291-1/+1
| * | | xen: Rename xen_be_send_notifyEmil Condrea2016-10-291-1/+1
| * | | xen: Rename xen_be_unbind_evtchnEmil Condrea2016-10-291-1/+1
| * | | xen: Rename xen_be_printf to xen_pv_printfEmil Condrea2016-10-291-1/+1
| * | | xen: Prepare xendev qtail to be shared with frontendsEmil Condrea2016-10-292-1/+4
| * | | xen: Move evtchn functions to xen_pvdev.cEmil Condrea2016-10-292-2/+4
| * | | xen: Move xenstore_update to xen_pvdev.cEmil Condrea2016-10-292-0/+4
| * | | xen: Create a new file xen_pvdev.cEmil Condrea2016-10-292-63/+70
| * | | xen: Fix coding style warningsEmil Condrea2016-10-291-3/+5
| |/ /
* | | Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into st...Peter Maydell2016-10-312-2/+1Star
|\ \ \
| * | | clean-up: removed duplicate #includesAnand J2016-10-281-1/+0Star
| * | | monitor: deprecate 'default' optionMarc-André Lureau2016-10-281-1/+1
* | | | Merge remote-tracking branch 'remotes/famz/tags/for-upstream' into stagingPeter Maydell2016-10-318-64/+98
|\ \ \ \ | |_|/ / |/| | |
| * | | aio: convert from RFifoLock to QemuRecMutexPaolo Bonzini2016-10-282-56/+1Star
| * | | qemu-thread: introduce QemuRecMutexPaolo Bonzini2016-10-283-0/+19
| * | | iothread: release AioContext around aio_pollPaolo Bonzini2016-10-281-3/+0Star
| * | | block: only call aio_poll on the current thread's AioContextPaolo Bonzini2016-10-282-3/+40
| * | | block: prepare bdrv_reopen_multiple to release AioContextPaolo Bonzini2016-10-281-1/+1
| * | | aio: introduce qemu_get_current_aio_contextPaolo Bonzini2016-10-281-0/+18
| * | | block: introduce BDRV_POLL_WHILEPaolo Bonzini2016-10-281-0/+9
| * | | block: add BDS field to count in-flight requestsPaolo Bonzini2016-10-281-4/+6
| * | | blockjob: introduce .drain callback for jobsPaolo Bonzini2016-10-281-0/+7
* | | | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.8-20161028' into...Peter Maydell2016-10-2810-58/+478
|\ \ \ \
| * | | | spapr: Add DRC count indexed hotplug identifier typeBharata B Rao2016-10-281-0/+4
| * | | | spapr_events: add support for dedicated hotplug event sourceMichael Roth2016-10-282-2/+5
| * | | | spapr: improve ibm,architecture-vec-5 property handlingMichael Roth2016-10-281-0/+1
| * | | | spapr: add option vector handling in CAS-generated resetsMichael Roth2016-10-281-1/+3
| * | | | spapr_hcall: use spapr_ovec_* interfaces for CAS optionsMichael Roth2016-10-282-1/+7