diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-10-06 10:34:05 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-10-06 10:34:05 +0200 |
| commit | ac7e70d61b19ae6971d98424b248b137fbc96272 (patch) | |
| tree | 58f5ea42056064ecde22b561716307dd96b03886 /qemu-monitor.hx | |
| parent | Merge commit 'e3936fa574d9fbe241acdc76b5195b048567537e' into upstream-merge (diff) | |
| parent | pci: windup acpi-based hotplug (diff) | |
| download | qemu-kvm-ac7e70d61b19ae6971d98424b248b137fbc96272.tar.gz qemu-kvm-ac7e70d61b19ae6971d98424b248b137fbc96272.tar.bz2 qemu-kvm-ac7e70d61b19ae6971d98424b248b137fbc96272.zip | |
Merge commit '3f84865ade594a2ec1ef613ab5fd11949f3d49de' into upstream-merge
* 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>
Diffstat (limited to 'qemu-monitor.hx')
| -rw-r--r-- | qemu-monitor.hx | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 7ba8c9b21..797746fae 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -369,8 +369,24 @@ hub. @var{devname} has the syntax @code{bus.addr}. Use the monitor command @code{info usb} to see the devices you can remove. ETEXI - { "cpu", "index:i", do_cpu_set, - "index", "set the default CPU" }, + { "device_add", "config:s", do_device_add, + "device", "add device, like -device on the command line" }, +STEXI +@item device_add @var{config} + +Add device. +ETEXI + + { "device_del", "id:s", do_device_del, + "device", "remove device" }, +STEXI +@item device_del @var{id} + +Remove device @var{id}. +ETEXI + + { "cpu", "index:i", do_cpu_set, "index", "set the default CPU" }, + STEXI Set the default CPU. ETEXI |