diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-07-28 21:00:34 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-07-28 21:00:34 +0300 |
| commit | a43536a3a65a83dc7ecf1c3737ac96e8cbd35825 (patch) | |
| tree | eb78d6f9bc57cb0189ab632e8296a1c5dcadf861 /qemu-options.hx | |
| parent | Merge commit 'c1d6eed7e85f5cfae9c548e58971db657237050a' into upstream-merge (diff) | |
| parent | qdev: add -device command line option. (diff) | |
| download | qemu-kvm-a43536a3a65a83dc7ecf1c3737ac96e8cbd35825.tar.gz qemu-kvm-a43536a3a65a83dc7ecf1c3737ac96e8cbd35825.tar.bz2 qemu-kvm-a43536a3a65a83dc7ecf1c3737ac96e8cbd35825.zip | |
Merge commit 'bd3c948db739a6c9c5e42ec838ef1220beea8e4e' into upstream-merge
* commit 'bd3c948db739a6c9c5e42ec838ef1220beea8e4e':
qdev: add -device command line option.
qdev: bus walker + qdev_device_add()
qdev: create default bus names.
qdev/pci: use qdev_prop_pci_devfn
qdev/prop: add pci devfn property
Add a pc-0.11 machine type and make the pc type an alias
Add machine type aliases
Conflicts:
vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 3038acddf..9f38360c9 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -382,6 +382,8 @@ Network adapter that supports CDC ethernet and RNDIS protocols. @end table ETEXI +DEF("device", HAS_ARG, QEMU_OPTION_device, + "-device driver[,options] add device\n") DEF("name", HAS_ARG, QEMU_OPTION_name, "-name string1[,process=string2] set the name of the guest\n" " string1 sets the window title and string2 the process name (on Linux)\n") |