diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-08-11 11:39:04 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-08-11 11:39:04 +0300 |
| commit | 5f27bc37dc28283da2b313b69312f1fa792d4b30 (patch) | |
| tree | 028d71a242e58a732e88ac2a3392e553ec5bd9a0 /qemu-config.c | |
| parent | Merge commit 'd058fe03e53699b5a85db1ea36edcf59273775a8' into upstream-merge (diff) | |
| parent | qdev-ify virtio-blk. (diff) | |
| download | qemu-kvm-5f27bc37dc28283da2b313b69312f1fa792d4b30.tar.gz qemu-kvm-5f27bc37dc28283da2b313b69312f1fa792d4b30.tar.bz2 qemu-kvm-5f27bc37dc28283da2b313b69312f1fa792d4b30.zip | |
Merge commit 'd176c495b6664b72dc1e595f6e89dc5648aa248b' into upstream-merge
* commit 'd176c495b6664b72dc1e595f6e89dc5648aa248b':
qdev-ify virtio-blk.
qdev/prop: add drive property.
add -drive if=none
constify drive_get_by_id arg
QemuOpts: switch over -device.
Conflicts:
hw/pc.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-config.c')
| -rw-r--r-- | qemu-config.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/qemu-config.c b/qemu-config.c index f02e85b3d..a1259f9a6 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -75,8 +75,22 @@ QemuOptsList qemu_drive_opts = { }, }; +QemuOptsList qemu_device_opts = { + .name = "device", + .head = TAILQ_HEAD_INITIALIZER(qemu_device_opts.head), + .desc = { + /* + * no elements => accept any + * sanity checking will happen later + * when setting device properties + */ + { /* end if list */ } + }, +}; + static QemuOptsList *lists[] = { &qemu_drive_opts, + &qemu_device_opts, NULL, }; |