Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
aboutsummaryrefslogtreecommitdiff
path: root/monitor.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '299e0bc52a5d56ff89ad8d7d09c82233cd8ccb6a' into stable-0.12-mergeMarcelo Tosatti2010-02-251-4/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '299e0bc52a5d56ff89ad8d7d09c82233cd8ccb6a': cirrus: Properly re-register cirrus_linear_io_addr on vram unmap qcow2: Don't ignore qcow2_alloc_clusters return value qcow2: Don't ignore update_refcount return value qcow2: Allow updating no refcounts qcow2: Improve error handling in update_refcount qcow2: Fix error handling in grow_refcount_table block: Return original error codes in bdrv_pread/write qcow2: Return 0/-errno in qcow2_alloc_cluster_offset qcow2: Return 0/-errno in get_cluster_table qcow2: Fix error handling in qcow_save_vmstate qcow2: Fix error handling in qcow2_grow_l1_table win32/sdl: Fix toggle full screen win32: pair qemu_memalign() with qemu_vfree() vnc_refresh: calling vnc_update_client might free vs Musicpal: Fix descriptor walk in eth_send Musicpal: Fix wm8750 I2C address fix savevm command without id or tag reduce number of reinjects on ACK QMP: Fix asynchronous events delivery Conflicts: hw/cirrus_vga.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * QMP: Fix asynchronous events deliveryLuiz Capitulino2010-01-201-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f039a563f200beee80cc10fd70b21ea396979dab introduces a regression as monitor_protocol_event() will return in the first user Monitor it finds in the QLIST_FOREACH() loop. The right thing to do is to only delivery an asynchronous event if the 'mon' is a QMP Monitor. The aforementioned commit was an early version, if it was applied to stable (it should) this one has to be applied there too. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 23fabed13645fdf66473e458f318baa63be56b22)
* | Merge commit 'c502715a74675b3554cf7bcd684b82c9733ecfae' into stable-0.12-mergeMarcelo Tosatti2010-02-251-5/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c502715a74675b3554cf7bcd684b82c9733ecfae': Documentation: Add missing documentation for qdev related command line options pc: add driver version compat properties scsi: device version property ide: device version property QMP: Emit asynchronous events on all QMP monitors Fix QEMU_WARN_UNUSED_RESULT Conflicts: qemu-options.hx Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * QMP: Emit asynchronous events on all QMP monitorsAdam Litke2010-01-191-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a control/QMP monitor in tandem with a regular monitor, asynchronous messages can get lost depending on the order of the QEMU program arguments. QEMU events issued by monitor_protocol_event() always go to cur_mon. If the user monitor was specified on the command line first (or it has ,default), the message will be directed to the user monitor (not the QMP monitor). Additionally, only one QMP session is currently able to receive async messages. To avoid this confusion, scan through the list of monitors and emit the message on each QMP monitor. Signed-off-by: Adam Litke <agl@us.ibm.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit f039a563f200beee80cc10fd70b21ea396979dab)
* | Merge remote branch 'upstream/stable-0.12' into stable-0.12Avi Kivity2010-01-171-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/stable-0.12: (27 commits) Update version and changelog for release Update SeaBIOS to 0.5.1 Qemu's internal TFTP server breaks lock-step-iness of TFTP osdep.c: Fix accept4 fallback pc: add rombar to compat properties for pc-0.10 and pc-0.11 pci: allow loading roms via fw_cfg. roms: rework rom loading via fw fw_cfg: rom loader tweaks. roms: minor fixes and cleanups. pc: add machine type for 0.12 loader: more ignores for rom intended to be loaded by the bios vnc_refresh: return if vd->timer is NULL QMP: Don't free async event's 'data' Handle TFTP ERROR from client dmg: fix ->open failure virtio-pci: thinko fix pc-bios: Update README (SeaBIOS) vmware_vga: Check cursor dimensions passed from guest to avoid buffer overflow remove pending exception on vcpu reset. Fix CPU topology initialization ... Conflicts: hw/pc.c hw/pci.h qemu-options.hx Signed-off-by: Avi Kivity <avi@redhat.com>
| * QMP: Don't free async event's 'data'Luiz Capitulino2010-01-121-1/+3
| | | | | | | | | | | | | | | | | | | | The monitor_protocol_event() function will free the event's data, this is wrong as 'data' management is up to the caller. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 3d72f9a2be640f368229d579e80ce4ef2a823e49)
| * QMP: Drop wrong assert()Luiz Capitulino2010-01-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Some commands return a QList of QDicts, which is valid, but will trig the assert(). Just drop it. Reported-by: Nathan Baum <nathan@parenthephobia.org.uk> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 810f49b56a5d0cd6848856af51d3093ae9adc7b1)
* | Don't leak kvm_save_mpstate() to main qemu codeAvi Kivity2009-12-221-2/+0
| | | | | | | | | | | | | | It doesn't exist outside x86, and breaks the build. Move it to cpu_synchronize_state() instead (only reading, not writing). Signed-off-by: Avi Kivity <avi@redhat.com>
* | Merge commit 'fe1b69708c72b163d3acdf2bb012e169d2d3dda0' into stable-0.12-mergeAvi Kivity2009-12-201-4/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fe1b69708c72b163d3acdf2bb012e169d2d3dda0': Update version and changelog for 0.12.1 Multiboot support: Fix rom_copy roms: allow roms to be loaded at address 0 Update for 0.12.0 release Update to SeaBIOS 0.5.0 Revert "monitor: Convert do_migrate_set_speed() to QObject" e1000: Don't muck with PCI commmand register monitor: do_balloon(): Use 'M' argument type monitor: Introduce 'M' argument type QMP: Update spec file QMP: Update README file QMP: Assure that returned data is a QDict QMP: Return an empty dict by default QMP: Only handle converted commands Update SeaBIOS to include PCI based option rom loading Signed-off-by: Avi Kivity <avi@redhat.com>
| * monitor: do_balloon(): Use 'M' argument typeLuiz Capitulino2009-12-191-2/+1
| | | | | | | | | | | | | | | | | | This makes do_balloon() accept megabyte values from the user Monitor while accepting byte values for QMP. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 056001ab30b1e596b992e70f9cb2adacef9c0ad0)
| * monitor: Introduce 'M' argument typeLuiz Capitulino2009-12-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | This is a target long value in megabytes which should be converted to bytes. It will be used by handlers which accept a megabyte value when in "user mode". Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 7cfe34fe4e3b518485c15aa9a78b4cf9cbd11a4d)
| * QMP: Assure that returned data is a QDictLuiz Capitulino2009-12-191-0/+1
| | | | | | | | | | | | | | | | This is for debug purposes only. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 19863875a2e18fc868a7b830f16fa76d32518bd1)
| * QMP: Return an empty dict by defaultLuiz Capitulino2009-12-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when a regular command doesn't have any data to output, QMP will emit: { "return": "OK" } Returning an empty dict is better though, because dicts can support some protocol changes in a compatible way. So, with this commit we will return: { "return": {} } Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit e38fb11b5099db8de8d60d536d4a01610ee4c08b)
| * QMP: Only handle converted commandsLuiz Capitulino2009-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Looks like I dropped this check when addressing the 'query-' commands request. QMP should only handle converted commands, obviously. Reported-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 89f5461fc9a3c437e632f6895dc605e8f03b925e)
* | Merge commit '72bb3c7571226af13cfe9eec020a56add3d30a70' into stable-0.12-mergeAvi Kivity2009-12-201-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '72bb3c7571226af13cfe9eec020a56add3d30a70': Support PCI based option rom loading Fix backcompat for hotplug of SCSI controllers fdc: fix migration from 0.11 Revert "fdc: fix vmstate variable passed" monitor: Accept input only byte-wise Revert "kvm: x86: Save/restore exception_index" vmware: increase cursor buffer size. Conflicts: hw/pci.c hw/pci.h Signed-off-by: Avi Kivity <avi@redhat.com>
| * monitor: Accept input only byte-wiseJan Kiszka2009-12-191-1/+1
| | | | | | | | | | | | | | | | | | This allows to suspend command interpretation and execution synchronously, e.g. during migration. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit c62313bbdc48f72e93fa8196f2fff96ba35e4e9d)
* | Merge commit '3c547d7bb7889182d5bcecbb3edea4c71774c6a3' into stable-0.12-mergeAvi Kivity2009-12-201-13/+33
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c547d7bb7889182d5bcecbb3edea4c71774c6a3': (23 commits) Make sure to enable dirty tracking of VBE vram mapping vmware: setup PCI BAR 2 for FIFO as per vmware spec qdev: improve property error reporting. fix vga names in default_list usb-host: check mon before using it. usb-net: use qdev for -usbdevice Check rom_load_all() return value. defaults: update device_list[] defaults: split default_drive monitor: Catch printing to non-existent monitor monitor: Avoid readline functions in QMP monitor: do_balloon(): Check for errors monitor: Use 'device' in eject QDict: Fix size update qdev: Improve uni-north device names Avoid permanently disabled QEMU monitor when UNIX migration fails Fix loading of ELF multiboot kernels Revert "Rename DriveInfo.onerror to on_write_error" (fix mismerge) qemu-io: Fix memory leak Fix thinko in linuxboot.S ... Conflicts: hw/vga.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * monitor: Catch printing to non-existent monitorLuiz Capitulino2009-12-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The monitor_vprintf() function now touches the 'mon' pointer before calling monitor_puts(), this causes block migration to segfault as its functions call monitor_printf() with a NULL 'mon'. To fix the problem this commit moves the 'mon' NULL check from monitor_puts() to monitor_vprintf(). This can potentially hide bugs, but for some reason this has been the behavior for a long time. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 2daa11912699d9412fb4404d646031a74b166aa5)
| * monitor: Avoid readline functions in QMPLuiz Capitulino2009-12-191-0/+3
| | | | | | | | | | | | | | | | | | The monitor_read_command() function is readline specific and should only be used when readline is available. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 183e6e525764d5c4978e37b42dc2cde0b0ffcfec)
| * monitor: do_balloon(): Check for errorsLuiz Capitulino2009-12-191-9/+26
| | | | | | | | | | | | | | | | | | | | | | do_balloon() should check for ballooning availability as do_info_balloon() does. Noted by Daniel P. Berrange <berrange@redhat.com>. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit cfdf2c40577ed99bb19cdc05d0537e2808d77a78)
| * monitor: Use 'device' in ejectLuiz Capitulino2009-12-191-1/+1
| | | | | | | | | | | | | | | | | | Monitor's eject command uses 'filename' for the device name argument, but 'device' is a better name. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 78d714e08f15171adf48e32ba86709f9c64f37cf)
* | Merge commit '0014803d23acaccc15b31180f06784f5d6edfd3a' into stable-0.12-mergeAvi Kivity2009-12-141-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '0014803d23acaccc15b31180f06784f5d6edfd3a': v2: properly save kvm system time msr registers VNC: Convert do_info_vnc() to QObject Conflicts: target-i386/kvm.c target-i386/machine.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * VNC: Convert do_info_vnc() to QObjectLuiz Capitulino2009-12-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a QDict with server information. Connected clients are returned as a QList of QDicts. The new functions (vnc_qdict_remote_addr(), vnc_qdict_local_addr() and put_addr_qdict()) are used to insert 'host' and 'service' information in the returned QDict. This patch is big, but I don't see how to split it. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit d96fd29cca420d1ff3d34cde233cf41a3818c550)
* | Merge commit '1c1d7bda2cd507aec72057a1c16094541add9dd6' into stable-0.12-mergeAvi Kivity2009-12-141-4/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1c1d7bda2cd507aec72057a1c16094541add9dd6': PCI: Convert pci_device_hot_add() to QObject char: Convert qemu_chr_info() to QObject block: Convert bdrv_info_stats() to QObject block: Convert bdrv_info() to QObject migration: Convert do_info_migrate() to QObject Conflicts: hw/pci-hotplug.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * char: Convert qemu_chr_info() to QObjectLuiz Capitulino2009-12-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | Each device is represented by a QDict. The returned QObject is a QList of all devices. This commit should not change user output. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 588b38320134edee4a569f60ed88c9848961d6ee)
| * block: Convert bdrv_info_stats() to QObjectLuiz Capitulino2009-12-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | Each device statistic information is stored in a QDict and the returned QObject is a QList of all devices. This commit should not change user output. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 218a536a7a7c6d3679d5eca0103f32fd11fbfaf0)
| * block: Convert bdrv_info() to QObjectLuiz Capitulino2009-12-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | Each block device information is stored in a QDict and the returned QObject is a QList of all devices. This commit should not change user output. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit d15e546567d75fca36d852c39e30adaab02121a7)
| * migration: Convert do_info_migrate() to QObjectLuiz Capitulino2009-12-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a QDict, which may contain up to more two QDicts, depending on the type of migration we're performing. IMPORTANT: as a QInt stores a int64_t integer, RAM values are going to be stored as int64_t and not as uint64_t as they are today. If this is a problem QInt will have to be changed. This commit should not change user output. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit c86a668390d16d6b3249acd50bfa61ad825c7a80)
* | Merge commit '3be42b28c14e2826eebbced68ad3ceb92507401d' into stable-0.12-mergeAvi Kivity2009-12-141-11/+74
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '3be42b28c14e2826eebbced68ad3ceb92507401d': monitor: Convert do_info_mice() to QObject monitor: Convert do_info_uuid() to QObject monitor: Convert do_info_hpet() to QObject monitor: Convert do_info_name() to QObject Conflicts: vl.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * monitor: Convert do_info_mice() to QObjectLuiz Capitulino2009-12-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | Each mouse is represented by a QDict, the returned QObject is a QList of all mice. This commit should not change user output. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit e78c48ec4e192ef1b1a210bdf5a8d253d7826c25)
| * monitor: Convert do_info_uuid() to QObjectLuiz Capitulino2009-12-121-3/+23
| | | | | | | | | | | | | | | | | | snprintf() is used because the UUID_FMT is too complex for qobject_from_jsonf(). Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 9603ceba2edd1dc7e3823da76d84706d3d1c3d78)
| * monitor: Convert do_info_hpet() to QObjectLuiz Capitulino2009-12-121-3/+21
| | | | | | | | | | | | Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 14f0720df929181eed5424b3f436d84ce05541c3)
| * monitor: Convert do_info_name() to QObjectLuiz Capitulino2009-12-121-4/+28
| | | | | | | | | | | | Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit e05486cba662ccceef6be4b3ce38961876aa8f6e)
* | Merge commit '94f539bdac57daea5f5d853cfee86bd683cf81cf' into stable-0.12-mergeAvi Kivity2009-12-141-37/+90
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '94f539bdac57daea5f5d853cfee86bd683cf81cf': monitor: Convert do_info_kvm() to QObject monitor: Convert do_info_status() to QObject monitor: do_info_version(): Use QDict Conflicts: monitor.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * monitor: Convert do_info_kvm() to QObjectLuiz Capitulino2009-12-121-8/+33
| | | | | | | | | | | | Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 2af5ba712b3e03cf644320f7386bf1dfd2c2b6a8)
| * monitor: Convert do_info_status() to QObjectLuiz Capitulino2009-12-121-9/+35
| | | | | | | | | | | | Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit c0e8520ed5efef2891e2e930a1bb21c1b040410f)
| * monitor: do_info_version(): Use QDictLuiz Capitulino2009-12-121-20/+22
| | | | | | | | | | | | | | | | | | | | All 'info' commands should use QDict, this commit also kills monitor_print_qobject() as do_info_version() doesn't use it anymore (and no handler will). Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 45e914cfe03f9fcf946bdc124f752d8f288eff05)
* | Merge commit 'f883e4f7b8f37b53fc54660d20fd36fbe3383f46' into stable-0.12-mergeAvi Kivity2009-12-141-55/+106
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f883e4f7b8f37b53fc54660d20fd36fbe3383f46': (63 commits) monitor: do_info_cpus(): Use QBool monitor: Fix do_info_commands() output monitor: Fix do_info_balloon() output QDict: Introduce qdict_get_qlist() QDict: Introduce qdict_get_qbool() Makefile: move QObject objs to their own entry Introduce qemu-objects.h header file vnc: fix capslock tracking logic. QemuOpts: allow larger option values. scsi: fix drive hotplug. pci: don't hw_error() when no slot is available. pci: don't abort() when trying to hotplug with acpi off. Set default console to virtio on S390x default devices: virtio consoles. add -qmp convinience switch add new -mon switch rework -monitor handling, switch to QemuOpts un-static qemu_chr_parse_compat() default devices: drives default devices: network ... Conflicts: monitor.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * monitor: do_info_cpus(): Use QBoolLuiz Capitulino2009-12-121-13/+25
| | | | | | | | | | | | | | | | While there update the documentation as well. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 55483ad657dcb62cde09bce3b38a5fc28d08f999)
| * monitor: Fix do_info_commands() outputLuiz Capitulino2009-12-121-3/+27
| | | | | | | | | | | | | | | | | | Should return a QDict and should not print the user protocol bits (eg. "c|cont"). Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 1a728677d4e2f0434caf352c0e88100652fd6711)
| * monitor: Fix do_info_balloon() outputLuiz Capitulino2009-12-121-3/+16
| | | | | | | | | | | | | | | | | | Monitor commands should always return values in bytes and info commands should always return a QDict. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 7f1796713ed2f338bd9abc094aacf10f67aed1e5)
| * Revert "monitor: Command-line flag to enable control mode"Gerd Hoffmann2009-12-121-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit adcb181afe5a951c521411c7a8e9d9b791aa6742. Conflicts: monitor.h Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 4e307fc883b39c89ffc093c79eb9c9735724d227)
| * QMP: add human-readable description to error responseMarkus Armbruster2009-12-071-0/+1
| | | | | | | | | | | | Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 77e595e7c613c495714d04ce63fb9bce263c29ae)
| * monitor: convert do_getfd() to QErrorMarkus Armbruster2009-12-071-4/+6
| | | | | | | | | | | | Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 7cdfcfe18f0a9e8603e4a14770a84eb5649521c5)
| * monitor: convert do_closefd() to QErrorMarkus Armbruster2009-12-071-2/+1
| | | | | | | | | | | | Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 063c1a0918d5a08f7ba89300d022b3421174fbf7)
| * monitor: convert do_change() to QObject, QErrorMarkus Armbruster2009-12-071-8/+11
| | | | | | | | | | | | Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit ec3b82afaa0c4c06689d6a6381d351eefc4ee171)
| * monitor: convert do_eject() to QErrorMarkus Armbruster2009-12-071-3/+4
| | | | | | | | | | | | | | | | Also affects do_change(), because the two share eject_device(). Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 2c2a6bb860c09a80f519cd6297f1c0585a1436ec)
| * monitor: Fix double-prompt after "change vnc passwd BLA"Markus Armbruster2009-12-071-3/+8
| | | | | | | | | | | | Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 2895e075c6dba0e66c72af781b1eed2bff0c3777)
| * monitor: do_cont(): Don't ask for passwordsLuiz Capitulino2009-12-071-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | The do_cont() function will ask the user to enter a password if a device is encrypted. This is invalid under QMP, so we raise a QERR_DEVICE_ENCRYPTED error. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 94171e119cb6f7bab2578896643b0daff1d9b184)
* | Merge commit 'b3dfdb5a3bae5fb3170397440dfebd579a3fcb04' into stable-0.12-mergeAvi Kivity2009-12-141-0/+16
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b3dfdb5a3bae5fb3170397440dfebd579a3fcb04': monitor: Introduce 'block_passwd' command QError: Add class for invalid passwords Conflicts: qemu-monitor.hx Signed-off-by: Avi Kivity <avi@redhat.com>