From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58776) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UujHv-0003vu-05 for qemu-devel@nongnu.org; Thu, 04 Jul 2013 09:09:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UujHr-00006d-OP for qemu-devel@nongnu.org; Thu, 04 Jul 2013 09:09:30 -0400 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:36898) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UujHr-00005u-IC for qemu-devel@nongnu.org; Thu, 04 Jul 2013 09:09:27 -0400 From: Markus Armbruster Date: Thu, 4 Jul 2013 15:09:19 +0200 Message-Id: <1372943363-24081-4-git-send-email-armbru@redhat.com> In-Reply-To: <1372943363-24081-1-git-send-email-armbru@redhat.com> References: <1372943363-24081-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 3/7] vl: New qemu_get_machine_opts() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com To be used in the next few commits to fix or clean up queries of "machine" options (-machine and its sugared forms). Signed-off-by: Markus Armbruster --- include/sysemu/sysemu.h | 2 ++ vl.c | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 2fb71af..d85bdc0 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -185,6 +185,8 @@ char *get_boot_devices_list(size_t *size); DeviceState *get_boot_device(uint32_t position); +QemuOpts *qemu_get_machine_opts(void); + bool usb_enabled(bool default_usb); extern QemuOptsList qemu_drive_opts; diff --git a/vl.c b/vl.c index 6d9fd7d..e68d19c 100644 --- a/vl.c +++ b/vl.c @@ -516,6 +516,25 @@ static QemuOptsList qemu_realtime_opts = { }, }; +/** + * Get machine options + * + * Returns: machine options (never null). + */ +QemuOpts *qemu_get_machine_opts(void) +{ + QemuOptsList *list; + QemuOpts *opts; + + list = qemu_find_opts("machine"); + assert(list); + opts = qemu_opts_find(list, NULL); + if (!opts) { + opts = qemu_opts_create_nofail(list); + } + return opts; +} + const char *qemu_get_vm_name(void) { return qemu_name; -- 1.7.11.7