summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'b3c83a2265261594d0a24507a17ad2f5c83eea81' into upstream-mergeAvi Kivity2012-05-061-4/+4
|\
| * block: add 'speed' optional parameter to block-streamStefan Hajnoczi2012-04-271-2/+2
| * block: change block-job-set-speed argument from 'value' to 'speed'Stefan Hajnoczi2012-04-271-2/+2
* | Merge commit 'a75bfc5fdda8b87ff969d68e020ffdf1008751b1' into upstream-mergeAvi Kivity2012-05-061-2/+2
|\|
| * fix block_job_set_speed name in documentationPaolo Bonzini2012-04-201-2/+2
* | Merge commit 'b3c09bde4842f1b157bc4431135aad4f2031e312' into upstream-mergeAvi Kivity2012-05-061-2/+1
|\|
| * qapi: convert device_delLuiz Capitulino2012-04-091-2/+1
* | Merge commit 'c7f0f3b1c826901358a0656f80a5fabb88f73c61' into upstream-mergeAvi Kivity2012-05-061-2/+1
|\|
| * qapi: Convert migrateLuiz Capitulino2012-03-151-2/+1
* | Merge commit '9e4dd565b46749d5e6d5cf87bfd84f1917c68319' into queues/qemu-mergeJan Kiszka2012-04-101-3/+6
|\|
| * qmp: convert blockdev-snapshot-sync to a wrapper around transactionsPaolo Bonzini2012-03-121-3/+6
* | Merge commit 'e32605062cd62c2a958ad28a6ad7de4eeab12027' into upstream-mergeMarcelo Tosatti2012-03-071-1/+1
|\|
| * Merge branch 'xtensa' of git://jcmvbkbc.spb.ru/dumb/qemu-xtensaBlue Swirl2012-03-031-1/+1
| |\
| | * target-xtensa: implement info tlb monitor commandMax Filippov2012-02-181-1/+1
* | | Merge commit 'b4bd0b168e9f4898b98308f4a8a089f647a86d16' into upstream-mergeAvi Kivity2012-02-291-0/+14
|\| |
| * | suspend: add system_wakeup monitor commandGerd Hoffmann2012-02-241-0/+14
| |/
* | Merge commit '32fea4025bfb80f2dbc5c3ce415703af28d85f63' into queues/qemu-mergeJan Kiszka2012-01-271-0/+41
|\|
| * qmp: add block_job_cancel commandStefan Hajnoczi2012-01-261-0/+14
| * qmp: add block_job_set_speed commandStefan Hajnoczi2012-01-261-0/+14
| * qmp: add block_stream commandStefan Hajnoczi2012-01-261-0/+13
* | Merge commit '3d402831de14d9e23ed8efcfdf81b01a53472fe2' into upstream-mergeAvi Kivity2012-01-261-10/+5
|\|
| * qapi: Convert block_set_io_throttleLuiz Capitulino2012-01-181-2/+1
| * qapi: Convert changeLuiz Capitulino2012-01-181-2/+1
| * qapi: Convert ejectLuiz Capitulino2012-01-181-2/+1
| * qapi: Convert expire_passwordLuiz Capitulino2012-01-181-2/+1
| * qapi: Convert set_passwordLuiz Capitulino2012-01-181-2/+1
* | Merge commit '2355c16e74ffa4d14e7fc2b4a23b055565ac0221' into upstream-mergeMarcelo Tosatti2012-01-121-2/+0
|\|
| * Expose drive_add on all architecturesAlexander Graf2012-01-041-2/+0
* | Merge commit '85ed303bfe1f67a4c18ffe51916e73cffd7d9e9b' into upstream-mergeAvi Kivity2011-12-251-17/+9
|\|
| * Merge remote-tracking branch 'stefanha/trivial-patches-next' into stagingAnthony Liguori2011-12-141-1/+1
| |\
| | * pcie_aer: adjust do_pcie_aer_inejct_error -> do_pcie_aer_inject_errorZhi Yong Wu2011-12-061-1/+1
| * | qapi: Convert migrate_set_speedLuiz Capitulino2011-12-061-2/+1
| * | qapi: Convert migrate_set_downtimeLuiz Capitulino2011-12-061-2/+1
| * | qapi: Convert migrate_cancelLuiz Capitulino2011-12-061-2/+1
| * | qapi: Convert blockdev_snapshot_syncLuiz Capitulino2011-12-061-1/+1
| * | qapi: Convert block_resizeLuiz Capitulino2011-12-061-2/+1
| * | qapi: Convert balloonLuiz Capitulino2011-12-061-3/+1
| * | qapi: Convert block_passwdLuiz Capitulino2011-12-061-2/+1
| * | qapi: Convert set_linkLuiz Capitulino2011-12-061-2/+1
* | | Merge commit 'ab49ab5c488237f3656689c4a3cab29e29884ca6' into upstream-mergeAvi Kivity2011-12-251-8/+4
|\| |
| * | qapi: Convert inject-nmiLuiz Capitulino2011-12-061-2/+1
| * | qapi: Convert contLuiz Capitulino2011-12-061-2/+1
| * | qapi: Convert pmemsaveLuiz Capitulino2011-12-061-2/+1
| * | qapi: Convert memsaveLuiz Capitulino2011-12-061-2/+1
| |/
* | Merge commit 'fb0490f69feb96b7e92457f176dc834ff0b00b09' into upstream-mergeAvi Kivity2011-12-111-2/+18
|\|
| * block: add -drive copy-on-read=on|offStefan Hajnoczi2011-12-051-2/+3
| * hmp/qmp: add block_set_io_throttleZhi Yong Wu2011-12-051-0/+15
* | Merge commit '25b651bedb917866ef8808f06896fdaed2c189cb' into upstream-mergeAvi Kivity2011-11-021-1/+2
|\|
| * Merge remote-tracking branch 'qmp/queue/qmp' into stagingAnthony Liguori2011-10-311-2/+1
| |\
| * | spice: turn client_migrate_info to asyncYonit Halperin2011-10-251-1/+2