Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
aboutsummaryrefslogtreecommitdiff
path: root/qemu-monitor.hx
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'fe1b69708c72b163d3acdf2bb012e169d2d3dda0' into stable-0.12-mergeAvi Kivity2009-12-201-3/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Revert "monitor: Convert do_migrate_set_speed() to QObject"Anthony Liguori2009-12-191-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3a4921047d514c336531c304bec362c4d138ebcc. From Luiz: do_migrate_set_speed() accepts a suffix for the 'value' argument and this is not good for QMP. We will have to add a new argument type to handle that and this will have to wait for 0.13. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 46ee2295678af629a2869e4e331e4e002bcc31fd)
| * monitor: do_balloon(): Use 'M' argument typeLuiz Capitulino2009-12-191-1/+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)
* | Merge commit '3c547d7bb7889182d5bcecbb3edea4c71774c6a3' into stable-0.12-mergeAvi Kivity2009-12-201-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: 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 '1c1d7bda2cd507aec72057a1c16094541add9dd6' into stable-0.12-mergeAvi Kivity2009-12-141-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * PCI: Convert pci_device_hot_add() to QObjectLuiz Capitulino2009-12-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a QDict with information about the just added device. This commit should not change user output. Please, note that this patch does not do error handling conversion. In error conditions the handler still calls monitor_printf(). Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 7a344f7ac7bb651d0556a933ed8060d3a9e5d949)
* | Merge commit 'f883e4f7b8f37b53fc54660d20fd36fbe3383f46' into stable-0.12-mergeAvi Kivity2009-12-141-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: convert do_change() to QObject, QErrorMarkus Armbruster2009-12-071-1/+2
| | | | | | | | | | | | Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit ec3b82afaa0c4c06689d6a6381d351eefc4ee171)
* | Merge commit 'b3dfdb5a3bae5fb3170397440dfebd579a3fcb04' into stable-0.12-mergeAvi Kivity2009-12-141-0/+14
|\| | | | | | | | | | | | | | | | | | | | | * 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>
| * monitor: Introduce 'block_passwd' commandLuiz Capitulino2009-12-071-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using encrypted disk images, QEMU will prompt the user for passwords when started. This makes sense for the user protocol, but doesn't for QMP. The solution is to have Monitor command which allows the user or a Client to set passwords in advance, so that we avoid the prompt completely. This is what block_passwd does, for example: (QEMU) block_passwd ide0-hd0 foobar Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit a3a55a2edb7c0fd72bc62a8a4c719a1e1983e6ac)
* | Merge commit '0e607a80d323ba9f46dee71cd07380c4eb5c2b0a' into upstream-mergeAvi Kivity2009-11-221-6/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e607a80d323ba9f46dee71cd07380c4eb5c2b0a': (22 commits) kvm: x86: Refactor use of interrupt_bitmap kvm: Add arch reset handler Enable migration without shared storage from the monitor Block live migration Expose a mechanism to trace block writes char: rename qemu_chr_reset to qemu_chr_generic_open char: Remove special init_reset handling char: don't limit data sent to backends to 1k per buffer ARM PB-A8 support LAN9118 emulation mips_r4k: fix reset PPC64: map Uni-North AGP bus aka fix Linux boot PPC64: Partial fix to Linux crash: revert to old devfn PCI: make duplicate devfn allocation fatal Do not execute shell scripts directly mips malta: fix indentation target-mips: fix indentation mips-malta: fix reset mips: fix cpu_reset memory leak fix make clean targets ... Carry changes to qemu-kvm-x86.c. Signed-off-by: Avi Kivity <avi@redhat.com>
| * Enable migration without shared storage from the monitorlirans@il.ibm.com2009-11-171-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the option to activate non-shared storage migration from the monitor. The migration command is as follows: (qemu) migrate -d tcp:0:4444 # for ordinary live migration (qemu) migrate -d -b tcp:0:4444 # for live migration with complete storage copy (qemu) migrate -d -i tcp:0:4444 # for live migration with incremental storage copy, storage is cow based. Changes from v4: - Minor coding style issues. Signed-off-by: Liran Schour <lirans@il.ibm.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '59c7b155aa6e1cbfe8a92e2322ea59ab31965c10' into upstream-mergeMark McLoughlin2009-10-281-9/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '59c7b155aa6e1cbfe8a92e2322ea59ab31965c10': (81 commits) posix-aio-compat: Split out posix_aio_process_queue monitor: Convert do_closefd() to QObject monitor: Convert do_getfd() to QObject monitor: Convert do_eject() to QObject monitor: Convert do_pci_device_hot_remove() to QObject monitor: Convert do_migrate_cancel() to QObject monitor: Convert do_migrate_set_speed() to QObject monitor: Convert do_migrate() to QObject monitor: Convert do_physical_memory_save() to QObject monitor: Convert do_memory_save() to QObject lsi_scsi: port to vmstate vmstate: Add VMSTATE_BUFFER_UNSAFE vmware_vga: port to vmstate vmware_vga: the support to change dinamically depth is not there vmware_vga: scratch is really an array of uint32_t vmware_vga: remove !EMBED_STDVGA code vmware_vga: qemu_malloc() returns void * vmware_vga: Remove uselss casts from void * vmware_vga: Pass pci_vmsga_state_t arg no VGACommonState vga: remove unused vga_common_save/load ... Conflicts: posix-aio-compat.c Signed-off-by: Mark McLoughlin <markmc@redhat.com>
| * monitor: Convert do_closefd() to QObjectLuiz Capitulino2009-10-271-1/+2
| | | | | | | | | | | | | | Note that errors are not being converted yet. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * monitor: Convert do_getfd() to QObjectLuiz Capitulino2009-10-271-1/+2
| | | | | | | | | | | | | | Note that errors are not being converted yet. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * monitor: Convert do_eject() to QObjectLuiz Capitulino2009-10-271-1/+2
| | | | | | | | | | | | | | Note that errors are not being converted yet. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * monitor: Convert do_pci_device_hot_remove() to QObjectLuiz Capitulino2009-10-271-1/+2
| | | | | | | | | | | | | | | | Errors are still directly printed, as we are only converting regular output. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * monitor: Convert do_migrate_cancel() to QObjectLuiz Capitulino2009-10-271-1/+2
| | | | | | | | | | Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * monitor: Convert do_migrate_set_speed() to QObjectLuiz Capitulino2009-10-271-1/+2
| | | | | | | | | | Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * monitor: Convert do_migrate() to QObjectLuiz Capitulino2009-10-271-1/+2
| | | | | | | | | | | | | | | | Error is still directly printed, as we are only converting regular output. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * monitor: Convert do_physical_memory_save() to QObjectLuiz Capitulino2009-10-271-1/+2
| | | | | | | | | | | | | | Note that errors are not being converted yet. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * monitor: Convert do_memory_save() to QObjectLuiz Capitulino2009-10-271-1/+2
| | | | | | | | | | | | | | Note that errors are not being converted yet. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '8f3cec0be8ed3f7c3bfaf8521e6316bdb76a56fe' into upstream-mergeMarcelo Tosatti2009-10-141-7/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8f3cec0be8ed3f7c3bfaf8521e6316bdb76a56fe': monitor: Convert do_info_cpus() to QObject monitor: Convert do_info_balloon() to QObject monitor: Convert do_info_version() to QObject monitor: Convert do_balloon() to QObject monitor: Convert do_cont() to QObject monitor: Convert do_system_powerdown() to QObject monitor: Convert do_system_reset() to QObject monitor: Convert do_stop() to QObject monitor: Convert do_quit() do QObject monitor: do_info(): handle new and old info handlers monitor: Handle new and old style handlers monitor: Add user_print() to mon_cmd_t Conflicts: monitor.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * monitor: Convert do_balloon() to QObjectLuiz Capitulino2009-10-081-1/+2
| | | | | | | | | | | | | | | | | | It is important to note that it never fails, as big refactoring of the virtio code would be needed to get the proper error code. Patchworks-ID: 35349 Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * monitor: Convert do_cont() to QObjectLuiz Capitulino2009-10-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | Appropriate error handling support will be needed to have encrypted images working under the future machine protocol, but this initial conversion will work with the current user protocol. Patchworks-ID: 35348 Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * monitor: Convert do_system_powerdown() to QObjectLuiz Capitulino2009-10-081-1/+2
| | | | | | | | | | | | Patchworks-ID: 35346 Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * monitor: Convert do_system_reset() to QObjectLuiz Capitulino2009-10-081-1/+2
| | | | | | | | | | | | Patchworks-ID: 35347 Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * monitor: Convert do_stop() to QObjectLuiz Capitulino2009-10-081-1/+2
| | | | | | | | | | | | Patchworks-ID: 35343 Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * monitor: Convert do_quit() do QObjectLuiz Capitulino2009-10-081-1/+2
| | | | | | | | | | | | Patchworks-ID: 35345 Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * monitor: do_info(): handle new and old info handlersLuiz Capitulino2009-10-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do_info() is special, its job is to call 'info handlers'. This is similar to what monitor_handle_command() does, therefore do_info() also has to distinguish among new and old style info handlers. This commit converts do_info() to the new QObject style and makes the appropriate changes so that it can handle both info handlers styles. In the future, when all handlers are converted to QObject's style, it will be possible to share more code with monitor_handle_command(). This commit also introduces a new function called monitor_user_noop(), it should be used by handlers which do not have data to print. This is the case of do_info(). Patchworks-ID: 35341 Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit 'af4ce882d530d4aa9ed26de3423a36e4a156d0a5' into upstream-mergeMarcelo Tosatti2009-10-141-63/+69
|\| | | | | | | | | | | | | | | | | | | | | * commit 'af4ce882d530d4aa9ed26de3423a36e4a156d0a5': monitor: union for command handlers monitor: union for info handlers Conflicts: qemu-monitor.hx Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * monitor: union for command handlersLuiz Capitulino2009-10-081-61/+61
| | | | | | | | | | | | | | | | | | | | | | | | This commits adds a new union member to mon_cmd_t for command handlers and convert monitor_handle_command() and qemu-monitor.hx to use it. This improves type safety. Patchworks-ID: 35337 Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit 'd7f9b68971d5f9111afeae03c61199346b868c13' into upstream-mergeMarcelo Tosatti2009-10-141-125/+488
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd7f9b68971d5f9111afeae03c61199346b868c13': (25 commits) monitor: Convert mon_cmd_t initializations to C99 style Introduce QList unit-tests Introduce QList QObject: Accept NULL Only compile ssi when one target uses it Only compile ssi-sd when one target uses it Only compile max111x when one target uses it Only compile ads7846 when one target uses it Only compile sd0323 when one target uses it Only compile sd0303 when one target uses it Only compile stellaris_input when one target uses it Only compile tmp105 when one target uses it Only compile lm832x when one target uses it Only compile tsc2005 when one target uses it Only compile twl92230 when one target uses it Only compile wm8750 when one target uses it Only compile max7310 when one target uses it Only compile sd when one target uses it Only compile ptimer when one target uses it Only compile m48t59 when one target uses it ... Conflicts: qemu-monitor.hx Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * monitor: Convert mon_cmd_t initializations to C99 styleLuiz Capitulino2009-10-081-125/+488
| | | | | | | | | | | | Patchworks-ID: 35335 Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '3f84865ade594a2ec1ef613ab5fd11949f3d49de' into upstream-mergeAvi Kivity2009-10-061-2/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f84865ade594a2ec1ef613ab5fd11949f3d49de': pci: windup acpi-based hotplug pci: hotplug windup scsi: hotplug windup usb: hotplug windup qdev hotplug: infrastructure and monitor commands. switch qemu-config to qemu_error usb: hook unplug into qdev, cleanups + fixes. Conflicts: hw/acpi.c hw/pc.c hw/pc.h hw/pci-hotplug.c sysemu.h Signed-off-by: Avi Kivity <avi@redhat.com>
| * qdev hotplug: infrastructure and monitor commands.Gerd Hoffmann2009-10-051-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds device_add and device_del commands. device_add accepts accepts the same syntax like the -device command line switch. device_del expects a device id. So you should tag your devices with ids if you want to remove them later on, like this: device_add pci-ohci,id=ohci device_del ohci Unplugging via pci_del or usb_del works too. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit 'ee3993069ff55fa6f1c64daf1e09963e340db8e4' into upstream-mergeMarcelo Tosatti2009-09-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ee3993069ff55fa6f1c64daf1e09963e340db8e4': posix-aio-compat: avoid signal race when spawning a thread target-i386: kill a tmp register target-i386: use subfi instead of sub with a non-freed constant eepro100: Fix format strings in debug messages eepro100: Replace sprintf by snprintf eepro100: Remove unused code eepro100: Enhanced logging and comments fix -daemonize with kvm Set SDL icon_title when using `-name XXX` for proper gnome-panel window list integration qemu-option: rename bool -> boolean ARM back-end: Use sxt[bh] instructions for ext{8, 6}s Fix and improve qint_from_int64_test monitor: Fix do_wav_capture() argument type Conflicts: vl.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * monitor: Fix do_wav_capture() argument typeLuiz Capitulino2009-09-261-1/+1
| | | | | | | | | | | | | | | | | | Currently do_wav_capture() path's argument type is 's' (string), but it should be 'F' (filename), this way 'wavcapture' gets command completion. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* | Merge commit '075e36b8ede5409b491abdf69fe2ffcf1bfe6bca' into upstream-mergeMarcelo Tosatti2009-09-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '075e36b8ede5409b491abdf69fe2ffcf1bfe6bca': (27 commits) monitor: Fix do_commit() argument type Don't redefine NULL, please Fix coding style issue Remove PARAMS() macro __thread should be before real type gcc wants 1st static and then const Bring two last users of K&R definitions to ANSI c89 static and inline should came before the type of the functions Use proper typedef syntax Revert "This files are compiled in libqemu.a now" fix use after free unbreak usb pass-through on linux. clean: remove ide/*.o files on clean ARM host: fix generated blocks linking Fix spelling in comment Suppress some variants of English in comments sparc64-8bit-asi target-mips: remove MAX_OP_PER_INSTR workaround exec-all.h: increase OPC_BUF_SIZE exec-all.h: increase MAX_OP_PER_INSTR to 96 from 64 ... Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * monitor: Fix do_commit() argument typeLuiz Capitulino2009-09-261-1/+1
| | | | | | | | | | | | | | | | Currently do_commit() argument type is 's' (string), but it should be 'B' (block), this way 'commit' gets command completion. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* | Merge commit '4d76d2ba9d313a827012d72d8352459d3b7b8833' into upstream-mergeAvi Kivity2009-09-091-54/+55
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4d76d2ba9d313a827012d72d8352459d3b7b8833': monitor: New format for handlers argument types Add wrappers to functions used by the Monitor Introduce QDict Introduce QString Introduce QInt Introduce QObject ide: move cmd+irq from IDEState to IDEBus. ide: pass down DriveInfo instead of BlockDriverState Conflicts: qemu-monitor.hx Signed-off-by: Avi Kivity <avi@redhat.com>
| * monitor: New format for handlers argument typesLuiz Capitulino2009-09-041-54/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current handlers argument types, as defined in qemu-monitor.hx file, are a sequence of chars where each one represents one argument type of the command handler. The number of chars is also used to know how many arguments a given handler accepts. This commit defines a new format, which makes mandatory the use of a name for each argument. For example, do_eject() command handler is currently defined as: { "eject", "-fB", do_eject, ... } With the new format it becomes: { "eject", "force:-f,filename:B", do_eject, ... } This way the Monitor will be capable of setting up a dictionary, using each argument's name as the key and the argument itself as the value. This commit also adds two new functions: key_get_info() and next_arg_type(), both are used to parse the new format. Currently key_get_info() consumes the 'key' part of the new format and discards it, this way the current parsing code is not affected by this change. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * Add wrappers to functions used by the MonitorLuiz Capitulino2009-09-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some functions exported to be used by the Monitor as command handlers are also called in other places as regular functions. When those functions got ported to use the Monitor dictionary to pass argments, the callers will have to setup a dictionary to be able to call them. To avoid this problem, this commit add wrappers to those functions, so that we change the wrapper to accept the dictionary, letting the current functions as is. The following wrappers are being added: - do_help_cmd() - do_pci_device_hot_remove() Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '4a1418e07bdcfaa3177739e04707ecaec75d89e1' into upstream-mergeAvi Kivity2009-08-241-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4a1418e07bdcfaa3177739e04707ecaec75d89e1': Unbreak large mem support by removing kqemu Add a configure switch to enable / disable all user targets. I felt compelled to do it for symmetry, mostly it is useful to disable user targets when you don't want to build them. Migration via unix sockets. Conflicts: Makefile.target exec.c osdep.c vl.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * Unbreak large mem support by removing kqemuAnthony Liguori2009-08-241-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kqemu introduces a number of restrictions on the i386 target. The worst is that it prevents large memory from working in the default build. Furthermore, kqemu is fundamentally flawed in a number of ways. It relies on the TSC as a time source which will not be reliable on a multiple processor system in userspace. Since most modern processors are multicore, this severely limits the utility of kqemu. kvm is a viable alternative for people looking to accelerate qemu and has the benefit of being supported by the upstream Linux kernel. If someone can implement work arounds to remove the restrictions introduced by kqemu, I'm happy to avoid and/or revert this patch. N.B. kqemu will still function in the 0.11 series but this patch removes it from the 0.12 series. Paul, please Ack or Nack this patch. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit 'f07918fdff76ace82b1ca3e53bbcddef069eb314' into upstream-mergeAvi Kivity2009-07-281-0/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f07918fdff76ace82b1ca3e53bbcddef069eb314': Add getfd and closefd monitor commands Add SCM_RIGHTS support to unix socket character devices Make tcp_chr_read() use recvmsg() sparc64 really implement itlb/dtlb automatic replacement writes sparc64 name mmu registers and general cleanup Give the kernel more room PPC: Round VGA BIOS size to page boundary Fix period initialization provide tests for pit in kernel and irqchip in kernel qemu-thread: use pthread_equal Link bios files when building out of tree signrom.sh: portability fix notify io_thread at the end of rx handling Conflicts: qemu-monitor.hx Signed-off-by: Avi Kivity <avi@redhat.com>
| * Add getfd and closefd monitor commandsMark McLoughlin2009-07-271-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add monitor commands to support passing file descriptors via SCM_RIGHTS. getfd assigns the passed file descriptor a name for use with other monitor commands. closefd allows passed file descriptors to be closed. If a monitor command actually uses a named file descriptor, closefd will not be required. Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '0ba99fc6a188988f11361cb41eba7c1afce346d4' into upstream-mergeAvi Kivity2009-07-281-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ba99fc6a188988f11361cb41eba7c1afce346d4': (46 commits) configure already knows what TARGET_BASE_ARCH we need, no need to put the logic in Makefile.target already defined several lines before in block-obj-y Remove unused Makefile variable use nwfpe-obj-y for consistence use block-nested-y for files inside block/ Remove duplicated definition fix sparc not solaris build fix XEN Build fix for bad macaddr of e1000 in Windows 2003 server with original MS driver qdev: es1370+ac97 description qdev/compat: virtio-net-pci 0.10 compatibility. qdev: print device id in "info pci". qdev/compat: virtio-console-pci 0.10 compatibility. qdev: add id= support for pci nics. qdev/compat: virtio-blk-pci 0.10 compatibility. qdev: add user-specified identifier to devices. qdev/compat: add pc-0.10 machine type. qdev: add no_user, alias and desc qdev/compat: compat property infrastructure. qdev: factor out driver search to qdev_find_info() ... Conflicts: Makefile.target Signed-off-by: Avi Kivity <avi@redhat.com>
| * monitor: Add port write commandJan Kiszka2009-07-161-0/+5
| | | | | | | | | | | | | | | | Useful for testing hardware emulations or manipulating its state to stress guest drivers. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>