summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge commit '755f196898e75bf453957609d1dbe02f73e5b12a' into upstream-mergeAvi Kivity2011-11-021-2/+1
|\ \ \ | | |/ | |/|
| * | qapi: Convert the cpu commandLuiz Capitulino2011-10-271-2/+1
| |/
* | Merge commit 'ebffe2afceb1a17b5d134b5debf553955fe5ea1a' into upstream-mergeAvi Kivity2011-10-171-7/+4
|\|
| * Merge remote-tracking branch 'qmp/queue/qmp' into stagingAnthony Liguori2011-10-101-7/+4
| |\
| | * qapi: Convert system_powerdownLuiz Capitulino2011-10-041-2/+1
| | * qapi: Convert system_resetLuiz Capitulino2011-10-041-2/+1
| | * qapi: Convert stopLuiz Capitulino2011-10-041-2/+1
| | * qapi: Convert quitLuiz Capitulino2011-10-041-1/+1
* | | Merge commit '02d6516c8ba00bdd6d96b622f000cb28c3449f43' into upstream-mergeAvi Kivity2011-10-091-1/+1
|\| |
| * | Merge branch 'tracing' of git://repo.or.cz/qemu/stefanhaBlue Swirl2011-10-081-1/+1
| |\ \
| | * | hmp: re-enable trace-file commandMichael Roth2011-10-031-1/+1
| | |/
* | | Merge commit '753d11f2238663990191ba8285bfe9301f7e4020' into upstream-mergeAvi Kivity2011-10-091-1/+1
|\| |
| * | ppc: booke206: add "info tlb" supportScott Wood2011-10-061-1/+1
| |/
* | Merge commit '12d4536f7d911b6d87a766ad7300482ea663cea2' into upstream-mergeAvi Kivity2011-09-041-4/+7
|\|
| * trace: always compile support for controlling and querying trace event statesLluís2011-09-011-2/+5
| * trace: separate trace event control and query routines from the simple backendLluís2011-09-011-1/+1
| * trace: [configure] rename CONFIG_*_TRACE into CONFIG_TRACE_*Lluís2011-09-011-2/+2
* | Merge commit 'b195043003d90ea4027ea01cc7a6c974ac915108' into upstream-mergeAvi Kivity2011-08-101-2/+0
|\|
| * HMP: Remove the duplicated info "info kvm" in hmp-commands.hx.Zhi Yong Wu2011-08-031-2/+0
* | Merge commit 'e18df14185e817ba735bce57ecdef9a55fb3d093' into upstream-mergeAvi Kivity2011-07-271-1/+1
|\|
| * QMP: add snapshot-blkdev-sync commandJes Sorensen2011-07-211-1/+1
* | Merge commit '924f766af9be3ff036a419fc85ed740aa01f8eac' into upstream-mergeAvi Kivity2011-06-091-4/+5
|\|
| * HMP: Use QMP inject nmi implementationLuiz Capitulino2011-06-011-4/+5
* | Merge commit '9257d46d55f1fe4e8209be9a6870e339ac3266fe' into upstream-mergeMarcelo Tosatti2011-03-141-16/+16
|\|
| * hmp-commands.hx: fix badly merged client_migrate_info commandJes Sorensen2011-03-101-16/+16
* | Merge commit '79f2b6fcdb7c06cdce6eccc796f5651f3efb843e' into upstream-mergeMarcelo Tosatti2011-02-161-1/+1
|\|
| * Change snapshot_blkdev hmp to use correct argument type for deviceJes Sorensen2011-02-101-1/+1
* | Merge commit 'f487d6278f75f84378833b8c3a67443346d639dc' into upstream-mergeMarcelo Tosatti2011-02-021-0/+36
|\|
| * Merge remote branch 'qemu-kvm/uq/master' into stagingAnthony Liguori2011-02-011-3/+3
| |\
| * \ Merge remote branch 'spice/spice.v29.pull' into stagingAnthony Liguori2011-02-011-0/+17
| |\ \
| | * | spice/vnc: client migration.Gerd Hoffmann2011-01-241-0/+17
| * | | block: add block_resize monitor commandChristoph Hellwig2011-01-311-0/+19
| |/ /
* | | Merge commit '31ce5e0c49821d92fb30cce2f3055ef33613b287' into upstream-mergeMarcelo Tosatti2011-02-021-3/+3
|\ \ \ | | |/ | |/|
| * | Add "broadcast" option for mce commandJin Dongming2011-01-211-3/+3
| |/
* | Merge commit '377529c009e3fce480d9c233bb3238b14a950816' into upstream-mergeMarcelo Tosatti2011-01-211-0/+25
|\|
| * Merge remote branch 'mst/for_anthony' into stagingAnthony Liguori2011-01-101-0/+25
| |\
| | * pcie/aer: glue aer error injection into qemu monitorIsaku Yamahata2010-12-241-0/+25
* | | Merge commit 'e024e881bb1a8b5085026589360d26ed97acdd64' into upstream-mergeMarcelo Tosatti2011-01-061-1/+20
|\| |
| * | Merge branch 'spice.v23.pull' of git://anongit.freedesktop.org/spice/qemuAurelien Jarno2010-12-271-0/+54
| |\ \
| * | | Sparc: implement monitor command 'info tlb'Blue Swirl2010-12-191-1/+1
| | |/ | |/|
| * | Introduce do_snapshot_blkdev() and monitor command to handle it.Jes Sorensen2010-12-171-0/+19
* | | Merge commit '7572150c189c6553c2448334116ab717680de66d' into upstream-mergeMarcelo Tosatti2011-01-061-0/+54
|\ \ \ | | |/ | |/|
| * | vnc/spice: add set_passwd monitor command.Gerd Hoffmann2010-12-091-0/+54
| |/
* | Merge commit '2507c12ab026b2286b0a47035c629f3d568c96f4' into upstream-mergeMarcelo Tosatti2011-01-061-0/+18
|\|
| * Implement drive_del to decouple block removal from device removalRyan Harper2010-11-241-0/+18
* | Merge remote branch 'upstream' into upstream-mergeAvi Kivity2010-11-141-2/+3
|\|
| * Switch migrate_set_speed() to take an 'o' argument rather than a float.Jes Sorensen2010-11-031-2/+3
* | pci-assign: Remove broken -pcidevice and pci_add hostJan Kiszka2010-11-031-1/+1
* | Merge commit '38cc9b607f85017b095793cab6c129bc9844f441' into upstream-mergeMarcelo Tosatti2010-10-181-1/+14
|/
* Monitor: Rename the qemu-monitor.hx fileLuiz Capitulino2010-10-011-0/+1216