diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-09-29 12:26:14 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-09-29 12:26:15 +0100 |
| commit | 0ebcc564533454853e66cbe665a0d23bf7199834 (patch) | |
| tree | c33af3c211d96564f2e795dcba86b2ba07f1e5e7 /include/qemu/option.h | |
| parent | e80084d352be64913f28d7b706fec644b85face4 (diff) | |
| parent | c9d17ad0dd3f04cdef44d58db97ea9864fbcdee7 (diff) | |
| download | focaccia-qemu-0ebcc564533454853e66cbe665a0d23bf7199834.tar.gz focaccia-qemu-0ebcc564533454853e66cbe665a0d23bf7199834.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches # gpg: Signature made Fri 26 Sep 2014 19:57:52 BST using RSA key ID C88F2FD6 # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" * remotes/kevin/tags/for-upstream: qemu-iotests: Fail test if explicit test case number is unknown block: Validate node-name vpc: fix beX_to_cpu() and cpu_to_beX() confusion docs: add blkdebug block driver documentation block: Catch simultaneous usage of options and their aliases block: Specify -drive legacy option aliases in array block: Improve message for device name clashing with node name qemu-nbd: Destroy the BlockDriverState properly block: Keep DriveInfo alive until BlockDriverState dies blockdev: Disentangle BlockDriverState and DriveInfo creation blkdebug: show an error for invalid event names Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qemu/option.h')
| -rw-r--r-- | include/qemu/option.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/qemu/option.h b/include/qemu/option.h index 59bea759a2..945347cc8f 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -103,6 +103,7 @@ typedef int (*qemu_opt_loopfunc)(const char *name, const char *value, void *opaq int qemu_opt_foreach(QemuOpts *opts, qemu_opt_loopfunc func, void *opaque, int abort_on_failure); +int qemu_opts_id_wellformed(const char *id); QemuOpts *qemu_opts_find(QemuOptsList *list, const char *id); QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id, int fail_if_exists, Error **errp); |