summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '299e0bc52a5d56ff89ad8d7d09c82233cd8ccb6a' into stable-0.12-mergeMarcelo Tosatti2010-02-251-4/+3
|\
| * QMP: Fix asynchronous events deliveryLuiz Capitulino2010-01-201-4/+3
* | Merge commit 'c502715a74675b3554cf7bcd684b82c9733ecfae' into stable-0.12-mergeMarcelo Tosatti2010-02-251-5/+7
|\ \ | |/
| * QMP: Emit asynchronous events on all QMP monitorsAdam Litke2010-01-191-5/+7
* | Merge remote branch 'upstream/stable-0.12' into stable-0.12Avi Kivity2010-01-171-2/+3
|\ \ | |/
| * QMP: Don't free async event's 'data'Luiz Capitulino2010-01-121-1/+3
| * QMP: Drop wrong assert()Luiz Capitulino2010-01-081-1/+0
* | Don't leak kvm_save_mpstate() to main qemu codeAvi Kivity2009-12-221-2/+0
* | Merge commit 'fe1b69708c72b163d3acdf2bb012e169d2d3dda0' into stable-0.12-mergeAvi Kivity2009-12-201-4/+9
|\ \ | |/
| * monitor: do_balloon(): Use 'M' argument typeLuiz Capitulino2009-12-191-2/+1
| * monitor: Introduce 'M' argument typeLuiz Capitulino2009-12-191-0/+4
| * QMP: Assure that returned data is a QDictLuiz Capitulino2009-12-191-0/+1
| * QMP: Return an empty dict by defaultLuiz Capitulino2009-12-191-1/+2
| * QMP: Only handle converted commandsLuiz Capitulino2009-12-191-1/+1
* | Merge commit '72bb3c7571226af13cfe9eec020a56add3d30a70' into stable-0.12-mergeAvi Kivity2009-12-201-1/+1
|\ \ | |/
| * monitor: Accept input only byte-wiseJan Kiszka2009-12-191-1/+1
* | Merge commit '3c547d7bb7889182d5bcecbb3edea4c71774c6a3' into stable-0.12-mergeAvi Kivity2009-12-201-13/+33
|\ \ | |/
| * monitor: Catch printing to non-existent monitorLuiz Capitulino2009-12-191-3/+3
| * monitor: Avoid readline functions in QMPLuiz Capitulino2009-12-191-0/+3
| * monitor: do_balloon(): Check for errorsLuiz Capitulino2009-12-191-9/+26
| * monitor: Use 'device' in ejectLuiz Capitulino2009-12-191-1/+1
* | Merge commit '0014803d23acaccc15b31180f06784f5d6edfd3a' into stable-0.12-mergeAvi Kivity2009-12-141-1/+2
|\ \ | |/
| * VNC: Convert do_info_vnc() to QObjectLuiz Capitulino2009-12-121-1/+2
* | Merge commit '1c1d7bda2cd507aec72057a1c16094541add9dd6' into stable-0.12-mergeAvi Kivity2009-12-141-4/+8
|\ \ | |/
| * char: Convert qemu_chr_info() to QObjectLuiz Capitulino2009-12-121-1/+2
| * block: Convert bdrv_info_stats() to QObjectLuiz Capitulino2009-12-121-1/+2
| * block: Convert bdrv_info() to QObjectLuiz Capitulino2009-12-121-1/+2
| * migration: Convert do_info_migrate() to QObjectLuiz Capitulino2009-12-121-1/+2
* | Merge commit '3be42b28c14e2826eebbced68ad3ceb92507401d' into stable-0.12-mergeAvi Kivity2009-12-141-11/+74
|\ \ | |/
| * monitor: Convert do_info_mice() to QObjectLuiz Capitulino2009-12-121-1/+2
| * monitor: Convert do_info_uuid() to QObjectLuiz Capitulino2009-12-121-3/+23
| * monitor: Convert do_info_hpet() to QObjectLuiz Capitulino2009-12-121-3/+21
| * monitor: Convert do_info_name() to QObjectLuiz Capitulino2009-12-121-4/+28
* | Merge commit '94f539bdac57daea5f5d853cfee86bd683cf81cf' into stable-0.12-mergeAvi Kivity2009-12-141-37/+90
|\ \ | |/
| * monitor: Convert do_info_kvm() to QObjectLuiz Capitulino2009-12-121-8/+33
| * monitor: Convert do_info_status() to QObjectLuiz Capitulino2009-12-121-9/+35
| * monitor: do_info_version(): Use QDictLuiz Capitulino2009-12-121-20/+22
* | Merge commit 'f883e4f7b8f37b53fc54660d20fd36fbe3383f46' into stable-0.12-mergeAvi Kivity2009-12-141-55/+106
|\ \ | |/
| * monitor: do_info_cpus(): Use QBoolLuiz Capitulino2009-12-121-13/+25
| * monitor: Fix do_info_commands() outputLuiz Capitulino2009-12-121-3/+27
| * monitor: Fix do_info_balloon() outputLuiz Capitulino2009-12-121-3/+16
| * Revert "monitor: Command-line flag to enable control mode"Gerd Hoffmann2009-12-121-18/+0
| * QMP: add human-readable description to error responseMarkus Armbruster2009-12-071-0/+1
| * monitor: convert do_getfd() to QErrorMarkus Armbruster2009-12-071-4/+6
| * monitor: convert do_closefd() to QErrorMarkus Armbruster2009-12-071-2/+1
| * monitor: convert do_change() to QObject, QErrorMarkus Armbruster2009-12-071-8/+11
| * monitor: convert do_eject() to QErrorMarkus Armbruster2009-12-071-3/+4
| * monitor: Fix double-prompt after "change vnc passwd BLA"Markus Armbruster2009-12-071-3/+8
| * monitor: do_cont(): Don't ask for passwordsLuiz Capitulino2009-12-071-1/+9
* | Merge commit 'b3dfdb5a3bae5fb3170397440dfebd579a3fcb04' into stable-0.12-mergeAvi Kivity2009-12-141-0/+16
|\ \ | |/