From 16894fdb6c560953c644929a600eb61041663d09 Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Mon, 9 Jan 2017 15:48:21 +0800 Subject: [PATCH] cleanup some qemu/util code --- qemu/aarch64.h | 25 - qemu/arm.h | 25 - qemu/header_gen.py | 25 - qemu/include/qemu/option.h | 99 --- qemu/include/qemu/option_int.h | 52 -- qemu/m68k.h | 25 - qemu/mips.h | 25 - qemu/mips64.h | 25 - qemu/mips64el.h | 25 - qemu/mipsel.h | 25 - qemu/powerpc.h | 25 - qemu/sparc.h | 25 - qemu/sparc64.h | 25 - qemu/util/oslib-posix.c | 44 -- qemu/util/oslib-win32.c | 34 - qemu/util/qemu-option.c | 1060 +------------------------------- qemu/x86_64.h | 25 - 17 files changed, 1 insertion(+), 1588 deletions(-) delete mode 100644 qemu/include/qemu/option_int.h diff --git a/qemu/aarch64.h b/qemu/aarch64.h index 5c30dcb7..ff42e482 100644 --- a/qemu/aarch64.h +++ b/qemu/aarch64.h @@ -2434,32 +2434,11 @@ #define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_aarch64 #define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_aarch64 #define qemu_oom_check qemu_oom_check_aarch64 -#define qemu_opt_del qemu_opt_del_aarch64 -#define qemu_opt_del_all qemu_opt_del_all_aarch64 -#define qemu_opt_find qemu_opt_find_aarch64 -#define qemu_opt_foreach qemu_opt_foreach_aarch64 -#define qemu_opt_get qemu_opt_get_aarch64 -#define qemu_opt_get_bool qemu_opt_get_bool_aarch64 -#define qemu_opt_get_bool_del qemu_opt_get_bool_del_aarch64 -#define qemu_opt_get_bool_helper qemu_opt_get_bool_helper_aarch64 -#define qemu_opt_get_del qemu_opt_get_del_aarch64 -#define qemu_opt_get_number qemu_opt_get_number_aarch64 -#define qemu_opt_get_number_del qemu_opt_get_number_del_aarch64 -#define qemu_opt_get_number_helper qemu_opt_get_number_helper_aarch64 -#define qemu_opt_get_size qemu_opt_get_size_aarch64 -#define qemu_opt_get_size_del qemu_opt_get_size_del_aarch64 -#define qemu_opt_get_size_helper qemu_opt_get_size_helper_aarch64 -#define qemu_opt_has_help_opt qemu_opt_has_help_opt_aarch64 -#define qemu_opt_parse qemu_opt_parse_aarch64 #define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_aarch64 #define qemu_opts_append qemu_opts_append_aarch64 #define qemu_opts_create qemu_opts_create_aarch64 #define qemu_opts_del qemu_opts_del_aarch64 #define qemu_opts_do_parse qemu_opts_do_parse_aarch64 -#define qemu_opt_set qemu_opt_set_aarch64 -#define qemu_opt_set_bool qemu_opt_set_bool_aarch64 -#define qemu_opt_set_err qemu_opt_set_err_aarch64 -#define qemu_opt_set_number qemu_opt_set_number_aarch64 #define qemu_opts_find qemu_opts_find_aarch64 #define qemu_opts_foreach qemu_opts_foreach_aarch64 #define qemu_opts_free qemu_opts_free_aarch64 @@ -2475,9 +2454,7 @@ #define qemu_opts_set_id qemu_opts_set_id_aarch64 #define qemu_opts_to_qdict qemu_opts_to_qdict_aarch64 #define qemu_opts_validate qemu_opts_validate_aarch64 -#define qemu_opt_unset qemu_opt_unset_aarch64 #define qemu_parse_fd qemu_parse_fd_aarch64 -#define qemu_pipe qemu_pipe_aarch64 #define qemu_ram_addr_from_host qemu_ram_addr_from_host_aarch64 #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_aarch64 #define qemu_ram_alloc qemu_ram_alloc_aarch64 @@ -2490,8 +2467,6 @@ #define qemu_ram_setup_dump qemu_ram_setup_dump_aarch64 #define qemu_ram_unset_idstr qemu_ram_unset_idstr_aarch64 #define qemu_real_host_page_size qemu_real_host_page_size_aarch64 -#define qemu_set_cloexec qemu_set_cloexec_aarch64 -#define qemu_set_tty_echo qemu_set_tty_echo_aarch64 #define qemu_st_helpers qemu_st_helpers_aarch64 #define qemu_strnlen qemu_strnlen_aarch64 #define qemu_strsep qemu_strsep_aarch64 diff --git a/qemu/arm.h b/qemu/arm.h index c63f2e6a..a714f217 100644 --- a/qemu/arm.h +++ b/qemu/arm.h @@ -2434,32 +2434,11 @@ #define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_arm #define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_arm #define qemu_oom_check qemu_oom_check_arm -#define qemu_opt_del qemu_opt_del_arm -#define qemu_opt_del_all qemu_opt_del_all_arm -#define qemu_opt_find qemu_opt_find_arm -#define qemu_opt_foreach qemu_opt_foreach_arm -#define qemu_opt_get qemu_opt_get_arm -#define qemu_opt_get_bool qemu_opt_get_bool_arm -#define qemu_opt_get_bool_del qemu_opt_get_bool_del_arm -#define qemu_opt_get_bool_helper qemu_opt_get_bool_helper_arm -#define qemu_opt_get_del qemu_opt_get_del_arm -#define qemu_opt_get_number qemu_opt_get_number_arm -#define qemu_opt_get_number_del qemu_opt_get_number_del_arm -#define qemu_opt_get_number_helper qemu_opt_get_number_helper_arm -#define qemu_opt_get_size qemu_opt_get_size_arm -#define qemu_opt_get_size_del qemu_opt_get_size_del_arm -#define qemu_opt_get_size_helper qemu_opt_get_size_helper_arm -#define qemu_opt_has_help_opt qemu_opt_has_help_opt_arm -#define qemu_opt_parse qemu_opt_parse_arm #define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_arm #define qemu_opts_append qemu_opts_append_arm #define qemu_opts_create qemu_opts_create_arm #define qemu_opts_del qemu_opts_del_arm #define qemu_opts_do_parse qemu_opts_do_parse_arm -#define qemu_opt_set qemu_opt_set_arm -#define qemu_opt_set_bool qemu_opt_set_bool_arm -#define qemu_opt_set_err qemu_opt_set_err_arm -#define qemu_opt_set_number qemu_opt_set_number_arm #define qemu_opts_find qemu_opts_find_arm #define qemu_opts_foreach qemu_opts_foreach_arm #define qemu_opts_free qemu_opts_free_arm @@ -2475,9 +2454,7 @@ #define qemu_opts_set_id qemu_opts_set_id_arm #define qemu_opts_to_qdict qemu_opts_to_qdict_arm #define qemu_opts_validate qemu_opts_validate_arm -#define qemu_opt_unset qemu_opt_unset_arm #define qemu_parse_fd qemu_parse_fd_arm -#define qemu_pipe qemu_pipe_arm #define qemu_ram_addr_from_host qemu_ram_addr_from_host_arm #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_arm #define qemu_ram_alloc qemu_ram_alloc_arm @@ -2490,8 +2467,6 @@ #define qemu_ram_setup_dump qemu_ram_setup_dump_arm #define qemu_ram_unset_idstr qemu_ram_unset_idstr_arm #define qemu_real_host_page_size qemu_real_host_page_size_arm -#define qemu_set_cloexec qemu_set_cloexec_arm -#define qemu_set_tty_echo qemu_set_tty_echo_arm #define qemu_st_helpers qemu_st_helpers_arm #define qemu_strnlen qemu_strnlen_arm #define qemu_strsep qemu_strsep_arm diff --git a/qemu/header_gen.py b/qemu/header_gen.py index 99dfde23..1476fa7e 100644 --- a/qemu/header_gen.py +++ b/qemu/header_gen.py @@ -2440,32 +2440,11 @@ symbols = ( 'qemu_mutex_lock_ramlist', 'qemu_mutex_unlock_ramlist', 'qemu_oom_check', - 'qemu_opt_del', - 'qemu_opt_del_all', - 'qemu_opt_find', - 'qemu_opt_foreach', - 'qemu_opt_get', - 'qemu_opt_get_bool', - 'qemu_opt_get_bool_del', - 'qemu_opt_get_bool_helper', - 'qemu_opt_get_del', - 'qemu_opt_get_number', - 'qemu_opt_get_number_del', - 'qemu_opt_get_number_helper', - 'qemu_opt_get_size', - 'qemu_opt_get_size_del', - 'qemu_opt_get_size_helper', - 'qemu_opt_has_help_opt', - 'qemu_opt_parse', 'qemu_opts_absorb_qdict', 'qemu_opts_append', 'qemu_opts_create', 'qemu_opts_del', 'qemu_opts_do_parse', - 'qemu_opt_set', - 'qemu_opt_set_bool', - 'qemu_opt_set_err', - 'qemu_opt_set_number', 'qemu_opts_find', 'qemu_opts_foreach', 'qemu_opts_free', @@ -2481,9 +2460,7 @@ symbols = ( 'qemu_opts_set_id', 'qemu_opts_to_qdict', 'qemu_opts_validate', - 'qemu_opt_unset', 'qemu_parse_fd', - 'qemu_pipe', 'qemu_ram_addr_from_host', 'qemu_ram_addr_from_host_nofail', 'qemu_ram_alloc', @@ -2496,8 +2473,6 @@ symbols = ( 'qemu_ram_setup_dump', 'qemu_ram_unset_idstr', 'qemu_real_host_page_size', - 'qemu_set_cloexec', - 'qemu_set_tty_echo', 'qemu_st_helpers', 'qemu_strnlen', 'qemu_strsep', diff --git a/qemu/include/qemu/option.h b/qemu/include/qemu/option.h index 59bea759..df3278f2 100644 --- a/qemu/include/qemu/option.h +++ b/qemu/include/qemu/option.h @@ -27,108 +27,9 @@ #define QEMU_OPTIONS_H #include -#include "qemu/queue.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" - -const char *get_opt_name(char *buf, int buf_size, const char *p, char delim); -const char *get_opt_value(char *buf, int buf_size, const char *p); -int get_next_param_value(char *buf, int buf_size, - const char *tag, const char **pstr); -int get_param_value(char *buf, int buf_size, - const char *tag, const char *str); - void parse_option_size(const char *name, const char *value, uint64_t *ret, Error **errp); -bool has_help_option(const char *param); -bool is_valid_option_list(const char *param); - -typedef struct QemuOpt QemuOpt; -typedef struct QemuOpts QemuOpts; -typedef struct QemuOptsList QemuOptsList; - -enum QemuOptType { - QEMU_OPT_STRING = 0, /* no parsing (use string as-is) */ - QEMU_OPT_BOOL, /* on/off */ - QEMU_OPT_NUMBER, /* simple number */ - QEMU_OPT_SIZE, /* size, accepts (K)ilo, (M)ega, (G)iga, (T)era postfix */ -}; - -typedef struct QemuOptDesc { - const char *name; - enum QemuOptType type; - const char *help; - const char *def_value_str; -} QemuOptDesc; - -struct QemuOptsList { - const char *name; - const char *implied_opt_name; - bool merge_lists; /* Merge multiple uses of option into a single list? */ - QTAILQ_HEAD(, QemuOpts) head; - QemuOptDesc desc[]; -}; - -const char *qemu_opt_get(QemuOpts *opts, const char *name); -char *qemu_opt_get_del(QemuOpts *opts, const char *name); -/** - * qemu_opt_has_help_opt: - * @opts: options to search for a help request - * - * Check whether the options specified by @opts include one of the - * standard strings which indicate that the user is asking for a - * list of the valid values for a command line option (as defined - * by is_help_option()). - * - * Returns: true if @opts includes 'help' or equivalent. - */ -bool qemu_opt_has_help_opt(QemuOpts *opts); -QemuOpt *qemu_opt_find(QemuOpts *opts, const char *name); -bool qemu_opt_get_bool(QemuOpts *opts, const char *name, bool defval); -uint64_t qemu_opt_get_number(QemuOpts *opts, const char *name, uint64_t defval); -uint64_t qemu_opt_get_size(QemuOpts *opts, const char *name, uint64_t defval); -bool qemu_opt_get_bool_del(QemuOpts *opts, const char *name, bool defval); -uint64_t qemu_opt_get_number_del(QemuOpts *opts, const char *name, - uint64_t defval); -uint64_t qemu_opt_get_size_del(QemuOpts *opts, const char *name, - uint64_t defval); -int qemu_opt_unset(QemuOpts *opts, const char *name); -int qemu_opt_set(QemuOpts *opts, const char *name, const char *value); -void qemu_opt_set_err(QemuOpts *opts, const char *name, const char *value, - Error **errp); -int qemu_opt_set_bool(QemuOpts *opts, const char *name, bool val); -int qemu_opt_set_number(QemuOpts *opts, const char *name, int64_t val); -typedef int (*qemu_opt_loopfunc)(const char *name, const char *value, void *opaque); -int qemu_opt_foreach(QemuOpts *opts, qemu_opt_loopfunc func, void *opaque, - int abort_on_failure); - -QemuOpts *qemu_opts_find(QemuOptsList *list, const char *id); -QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id, - int fail_if_exists, Error **errp); -void qemu_opts_reset(QemuOptsList *list); -void qemu_opts_loc_restore(QemuOpts *opts); -int qemu_opts_set(QemuOptsList *list, const char *id, - const char *name, const char *value); -const char *qemu_opts_id(QemuOpts *opts); -void qemu_opts_set_id(QemuOpts *opts, char *id); -void qemu_opts_del(QemuOpts *opts); -void qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc, Error **errp); -int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char *firstname); -QemuOpts *qemu_opts_parse(QemuOptsList *list, const char *params, int permit_abbrev); -void qemu_opts_set_defaults(QemuOptsList *list, const char *params, - int permit_abbrev); -QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, const QDict *qdict, - Error **errp); -QDict *qemu_opts_to_qdict(QemuOpts *opts, QDict *qdict); -void qemu_opts_absorb_qdict(QemuOpts *opts, QDict *qdict, Error **errp); - -typedef int (*qemu_opts_loopfunc)(QemuOpts *opts, void *opaque); -void qemu_opts_print(QemuOpts *opts); -int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func, void *opaque, - int abort_on_failure); -void qemu_opts_print_help(QemuOptsList *list); -void qemu_opts_free(QemuOptsList *list); -QemuOptsList *qemu_opts_append(QemuOptsList *dst, QemuOptsList *list); #endif diff --git a/qemu/include/qemu/option_int.h b/qemu/include/qemu/option_int.h deleted file mode 100644 index 3803fd0e..00000000 --- a/qemu/include/qemu/option_int.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Commandline option parsing functions - * - * Copyright (c) 2003-2008 Fabrice Bellard - * Copyright (c) 2009 Kevin Wolf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#ifndef QEMU_OPTIONS_INTERNAL_H -#define QEMU_OPTIONS_INTERNAL_H - -#include "qemu/option.h" - -struct QemuOpt { - char *name; - char *str; - - const QemuOptDesc *desc; - union { - bool boolean; - uint64_t uint; - } value; - - QemuOpts *opts; - QTAILQ_ENTRY(QemuOpt) next; -}; - -struct QemuOpts { - char *id; - QemuOptsList *list; - QTAILQ_HEAD(QemuOptHead, QemuOpt) head; - QTAILQ_ENTRY(QemuOpts) next; -}; - -#endif diff --git a/qemu/m68k.h b/qemu/m68k.h index 61094793..c0b104d5 100644 --- a/qemu/m68k.h +++ b/qemu/m68k.h @@ -2434,32 +2434,11 @@ #define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_m68k #define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_m68k #define qemu_oom_check qemu_oom_check_m68k -#define qemu_opt_del qemu_opt_del_m68k -#define qemu_opt_del_all qemu_opt_del_all_m68k -#define qemu_opt_find qemu_opt_find_m68k -#define qemu_opt_foreach qemu_opt_foreach_m68k -#define qemu_opt_get qemu_opt_get_m68k -#define qemu_opt_get_bool qemu_opt_get_bool_m68k -#define qemu_opt_get_bool_del qemu_opt_get_bool_del_m68k -#define qemu_opt_get_bool_helper qemu_opt_get_bool_helper_m68k -#define qemu_opt_get_del qemu_opt_get_del_m68k -#define qemu_opt_get_number qemu_opt_get_number_m68k -#define qemu_opt_get_number_del qemu_opt_get_number_del_m68k -#define qemu_opt_get_number_helper qemu_opt_get_number_helper_m68k -#define qemu_opt_get_size qemu_opt_get_size_m68k -#define qemu_opt_get_size_del qemu_opt_get_size_del_m68k -#define qemu_opt_get_size_helper qemu_opt_get_size_helper_m68k -#define qemu_opt_has_help_opt qemu_opt_has_help_opt_m68k -#define qemu_opt_parse qemu_opt_parse_m68k #define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_m68k #define qemu_opts_append qemu_opts_append_m68k #define qemu_opts_create qemu_opts_create_m68k #define qemu_opts_del qemu_opts_del_m68k #define qemu_opts_do_parse qemu_opts_do_parse_m68k -#define qemu_opt_set qemu_opt_set_m68k -#define qemu_opt_set_bool qemu_opt_set_bool_m68k -#define qemu_opt_set_err qemu_opt_set_err_m68k -#define qemu_opt_set_number qemu_opt_set_number_m68k #define qemu_opts_find qemu_opts_find_m68k #define qemu_opts_foreach qemu_opts_foreach_m68k #define qemu_opts_free qemu_opts_free_m68k @@ -2475,9 +2454,7 @@ #define qemu_opts_set_id qemu_opts_set_id_m68k #define qemu_opts_to_qdict qemu_opts_to_qdict_m68k #define qemu_opts_validate qemu_opts_validate_m68k -#define qemu_opt_unset qemu_opt_unset_m68k #define qemu_parse_fd qemu_parse_fd_m68k -#define qemu_pipe qemu_pipe_m68k #define qemu_ram_addr_from_host qemu_ram_addr_from_host_m68k #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_m68k #define qemu_ram_alloc qemu_ram_alloc_m68k @@ -2490,8 +2467,6 @@ #define qemu_ram_setup_dump qemu_ram_setup_dump_m68k #define qemu_ram_unset_idstr qemu_ram_unset_idstr_m68k #define qemu_real_host_page_size qemu_real_host_page_size_m68k -#define qemu_set_cloexec qemu_set_cloexec_m68k -#define qemu_set_tty_echo qemu_set_tty_echo_m68k #define qemu_st_helpers qemu_st_helpers_m68k #define qemu_strnlen qemu_strnlen_m68k #define qemu_strsep qemu_strsep_m68k diff --git a/qemu/mips.h b/qemu/mips.h index 367efada..006e43ba 100644 --- a/qemu/mips.h +++ b/qemu/mips.h @@ -2434,32 +2434,11 @@ #define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_mips #define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_mips #define qemu_oom_check qemu_oom_check_mips -#define qemu_opt_del qemu_opt_del_mips -#define qemu_opt_del_all qemu_opt_del_all_mips -#define qemu_opt_find qemu_opt_find_mips -#define qemu_opt_foreach qemu_opt_foreach_mips -#define qemu_opt_get qemu_opt_get_mips -#define qemu_opt_get_bool qemu_opt_get_bool_mips -#define qemu_opt_get_bool_del qemu_opt_get_bool_del_mips -#define qemu_opt_get_bool_helper qemu_opt_get_bool_helper_mips -#define qemu_opt_get_del qemu_opt_get_del_mips -#define qemu_opt_get_number qemu_opt_get_number_mips -#define qemu_opt_get_number_del qemu_opt_get_number_del_mips -#define qemu_opt_get_number_helper qemu_opt_get_number_helper_mips -#define qemu_opt_get_size qemu_opt_get_size_mips -#define qemu_opt_get_size_del qemu_opt_get_size_del_mips -#define qemu_opt_get_size_helper qemu_opt_get_size_helper_mips -#define qemu_opt_has_help_opt qemu_opt_has_help_opt_mips -#define qemu_opt_parse qemu_opt_parse_mips #define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_mips #define qemu_opts_append qemu_opts_append_mips #define qemu_opts_create qemu_opts_create_mips #define qemu_opts_del qemu_opts_del_mips #define qemu_opts_do_parse qemu_opts_do_parse_mips -#define qemu_opt_set qemu_opt_set_mips -#define qemu_opt_set_bool qemu_opt_set_bool_mips -#define qemu_opt_set_err qemu_opt_set_err_mips -#define qemu_opt_set_number qemu_opt_set_number_mips #define qemu_opts_find qemu_opts_find_mips #define qemu_opts_foreach qemu_opts_foreach_mips #define qemu_opts_free qemu_opts_free_mips @@ -2475,9 +2454,7 @@ #define qemu_opts_set_id qemu_opts_set_id_mips #define qemu_opts_to_qdict qemu_opts_to_qdict_mips #define qemu_opts_validate qemu_opts_validate_mips -#define qemu_opt_unset qemu_opt_unset_mips #define qemu_parse_fd qemu_parse_fd_mips -#define qemu_pipe qemu_pipe_mips #define qemu_ram_addr_from_host qemu_ram_addr_from_host_mips #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_mips #define qemu_ram_alloc qemu_ram_alloc_mips @@ -2490,8 +2467,6 @@ #define qemu_ram_setup_dump qemu_ram_setup_dump_mips #define qemu_ram_unset_idstr qemu_ram_unset_idstr_mips #define qemu_real_host_page_size qemu_real_host_page_size_mips -#define qemu_set_cloexec qemu_set_cloexec_mips -#define qemu_set_tty_echo qemu_set_tty_echo_mips #define qemu_st_helpers qemu_st_helpers_mips #define qemu_strnlen qemu_strnlen_mips #define qemu_strsep qemu_strsep_mips diff --git a/qemu/mips64.h b/qemu/mips64.h index 68c3bbd3..64c0a10e 100644 --- a/qemu/mips64.h +++ b/qemu/mips64.h @@ -2434,32 +2434,11 @@ #define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_mips64 #define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_mips64 #define qemu_oom_check qemu_oom_check_mips64 -#define qemu_opt_del qemu_opt_del_mips64 -#define qemu_opt_del_all qemu_opt_del_all_mips64 -#define qemu_opt_find qemu_opt_find_mips64 -#define qemu_opt_foreach qemu_opt_foreach_mips64 -#define qemu_opt_get qemu_opt_get_mips64 -#define qemu_opt_get_bool qemu_opt_get_bool_mips64 -#define qemu_opt_get_bool_del qemu_opt_get_bool_del_mips64 -#define qemu_opt_get_bool_helper qemu_opt_get_bool_helper_mips64 -#define qemu_opt_get_del qemu_opt_get_del_mips64 -#define qemu_opt_get_number qemu_opt_get_number_mips64 -#define qemu_opt_get_number_del qemu_opt_get_number_del_mips64 -#define qemu_opt_get_number_helper qemu_opt_get_number_helper_mips64 -#define qemu_opt_get_size qemu_opt_get_size_mips64 -#define qemu_opt_get_size_del qemu_opt_get_size_del_mips64 -#define qemu_opt_get_size_helper qemu_opt_get_size_helper_mips64 -#define qemu_opt_has_help_opt qemu_opt_has_help_opt_mips64 -#define qemu_opt_parse qemu_opt_parse_mips64 #define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_mips64 #define qemu_opts_append qemu_opts_append_mips64 #define qemu_opts_create qemu_opts_create_mips64 #define qemu_opts_del qemu_opts_del_mips64 #define qemu_opts_do_parse qemu_opts_do_parse_mips64 -#define qemu_opt_set qemu_opt_set_mips64 -#define qemu_opt_set_bool qemu_opt_set_bool_mips64 -#define qemu_opt_set_err qemu_opt_set_err_mips64 -#define qemu_opt_set_number qemu_opt_set_number_mips64 #define qemu_opts_find qemu_opts_find_mips64 #define qemu_opts_foreach qemu_opts_foreach_mips64 #define qemu_opts_free qemu_opts_free_mips64 @@ -2475,9 +2454,7 @@ #define qemu_opts_set_id qemu_opts_set_id_mips64 #define qemu_opts_to_qdict qemu_opts_to_qdict_mips64 #define qemu_opts_validate qemu_opts_validate_mips64 -#define qemu_opt_unset qemu_opt_unset_mips64 #define qemu_parse_fd qemu_parse_fd_mips64 -#define qemu_pipe qemu_pipe_mips64 #define qemu_ram_addr_from_host qemu_ram_addr_from_host_mips64 #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_mips64 #define qemu_ram_alloc qemu_ram_alloc_mips64 @@ -2490,8 +2467,6 @@ #define qemu_ram_setup_dump qemu_ram_setup_dump_mips64 #define qemu_ram_unset_idstr qemu_ram_unset_idstr_mips64 #define qemu_real_host_page_size qemu_real_host_page_size_mips64 -#define qemu_set_cloexec qemu_set_cloexec_mips64 -#define qemu_set_tty_echo qemu_set_tty_echo_mips64 #define qemu_st_helpers qemu_st_helpers_mips64 #define qemu_strnlen qemu_strnlen_mips64 #define qemu_strsep qemu_strsep_mips64 diff --git a/qemu/mips64el.h b/qemu/mips64el.h index df264f69..f5361965 100644 --- a/qemu/mips64el.h +++ b/qemu/mips64el.h @@ -2434,32 +2434,11 @@ #define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_mips64el #define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_mips64el #define qemu_oom_check qemu_oom_check_mips64el -#define qemu_opt_del qemu_opt_del_mips64el -#define qemu_opt_del_all qemu_opt_del_all_mips64el -#define qemu_opt_find qemu_opt_find_mips64el -#define qemu_opt_foreach qemu_opt_foreach_mips64el -#define qemu_opt_get qemu_opt_get_mips64el -#define qemu_opt_get_bool qemu_opt_get_bool_mips64el -#define qemu_opt_get_bool_del qemu_opt_get_bool_del_mips64el -#define qemu_opt_get_bool_helper qemu_opt_get_bool_helper_mips64el -#define qemu_opt_get_del qemu_opt_get_del_mips64el -#define qemu_opt_get_number qemu_opt_get_number_mips64el -#define qemu_opt_get_number_del qemu_opt_get_number_del_mips64el -#define qemu_opt_get_number_helper qemu_opt_get_number_helper_mips64el -#define qemu_opt_get_size qemu_opt_get_size_mips64el -#define qemu_opt_get_size_del qemu_opt_get_size_del_mips64el -#define qemu_opt_get_size_helper qemu_opt_get_size_helper_mips64el -#define qemu_opt_has_help_opt qemu_opt_has_help_opt_mips64el -#define qemu_opt_parse qemu_opt_parse_mips64el #define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_mips64el #define qemu_opts_append qemu_opts_append_mips64el #define qemu_opts_create qemu_opts_create_mips64el #define qemu_opts_del qemu_opts_del_mips64el #define qemu_opts_do_parse qemu_opts_do_parse_mips64el -#define qemu_opt_set qemu_opt_set_mips64el -#define qemu_opt_set_bool qemu_opt_set_bool_mips64el -#define qemu_opt_set_err qemu_opt_set_err_mips64el -#define qemu_opt_set_number qemu_opt_set_number_mips64el #define qemu_opts_find qemu_opts_find_mips64el #define qemu_opts_foreach qemu_opts_foreach_mips64el #define qemu_opts_free qemu_opts_free_mips64el @@ -2475,9 +2454,7 @@ #define qemu_opts_set_id qemu_opts_set_id_mips64el #define qemu_opts_to_qdict qemu_opts_to_qdict_mips64el #define qemu_opts_validate qemu_opts_validate_mips64el -#define qemu_opt_unset qemu_opt_unset_mips64el #define qemu_parse_fd qemu_parse_fd_mips64el -#define qemu_pipe qemu_pipe_mips64el #define qemu_ram_addr_from_host qemu_ram_addr_from_host_mips64el #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_mips64el #define qemu_ram_alloc qemu_ram_alloc_mips64el @@ -2490,8 +2467,6 @@ #define qemu_ram_setup_dump qemu_ram_setup_dump_mips64el #define qemu_ram_unset_idstr qemu_ram_unset_idstr_mips64el #define qemu_real_host_page_size qemu_real_host_page_size_mips64el -#define qemu_set_cloexec qemu_set_cloexec_mips64el -#define qemu_set_tty_echo qemu_set_tty_echo_mips64el #define qemu_st_helpers qemu_st_helpers_mips64el #define qemu_strnlen qemu_strnlen_mips64el #define qemu_strsep qemu_strsep_mips64el diff --git a/qemu/mipsel.h b/qemu/mipsel.h index 5f7fb03b..669c86e6 100644 --- a/qemu/mipsel.h +++ b/qemu/mipsel.h @@ -2434,32 +2434,11 @@ #define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_mipsel #define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_mipsel #define qemu_oom_check qemu_oom_check_mipsel -#define qemu_opt_del qemu_opt_del_mipsel -#define qemu_opt_del_all qemu_opt_del_all_mipsel -#define qemu_opt_find qemu_opt_find_mipsel -#define qemu_opt_foreach qemu_opt_foreach_mipsel -#define qemu_opt_get qemu_opt_get_mipsel -#define qemu_opt_get_bool qemu_opt_get_bool_mipsel -#define qemu_opt_get_bool_del qemu_opt_get_bool_del_mipsel -#define qemu_opt_get_bool_helper qemu_opt_get_bool_helper_mipsel -#define qemu_opt_get_del qemu_opt_get_del_mipsel -#define qemu_opt_get_number qemu_opt_get_number_mipsel -#define qemu_opt_get_number_del qemu_opt_get_number_del_mipsel -#define qemu_opt_get_number_helper qemu_opt_get_number_helper_mipsel -#define qemu_opt_get_size qemu_opt_get_size_mipsel -#define qemu_opt_get_size_del qemu_opt_get_size_del_mipsel -#define qemu_opt_get_size_helper qemu_opt_get_size_helper_mipsel -#define qemu_opt_has_help_opt qemu_opt_has_help_opt_mipsel -#define qemu_opt_parse qemu_opt_parse_mipsel #define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_mipsel #define qemu_opts_append qemu_opts_append_mipsel #define qemu_opts_create qemu_opts_create_mipsel #define qemu_opts_del qemu_opts_del_mipsel #define qemu_opts_do_parse qemu_opts_do_parse_mipsel -#define qemu_opt_set qemu_opt_set_mipsel -#define qemu_opt_set_bool qemu_opt_set_bool_mipsel -#define qemu_opt_set_err qemu_opt_set_err_mipsel -#define qemu_opt_set_number qemu_opt_set_number_mipsel #define qemu_opts_find qemu_opts_find_mipsel #define qemu_opts_foreach qemu_opts_foreach_mipsel #define qemu_opts_free qemu_opts_free_mipsel @@ -2475,9 +2454,7 @@ #define qemu_opts_set_id qemu_opts_set_id_mipsel #define qemu_opts_to_qdict qemu_opts_to_qdict_mipsel #define qemu_opts_validate qemu_opts_validate_mipsel -#define qemu_opt_unset qemu_opt_unset_mipsel #define qemu_parse_fd qemu_parse_fd_mipsel -#define qemu_pipe qemu_pipe_mipsel #define qemu_ram_addr_from_host qemu_ram_addr_from_host_mipsel #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_mipsel #define qemu_ram_alloc qemu_ram_alloc_mipsel @@ -2490,8 +2467,6 @@ #define qemu_ram_setup_dump qemu_ram_setup_dump_mipsel #define qemu_ram_unset_idstr qemu_ram_unset_idstr_mipsel #define qemu_real_host_page_size qemu_real_host_page_size_mipsel -#define qemu_set_cloexec qemu_set_cloexec_mipsel -#define qemu_set_tty_echo qemu_set_tty_echo_mipsel #define qemu_st_helpers qemu_st_helpers_mipsel #define qemu_strnlen qemu_strnlen_mipsel #define qemu_strsep qemu_strsep_mipsel diff --git a/qemu/powerpc.h b/qemu/powerpc.h index 5eaf6565..25017a93 100644 --- a/qemu/powerpc.h +++ b/qemu/powerpc.h @@ -2434,32 +2434,11 @@ #define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_powerpc #define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_powerpc #define qemu_oom_check qemu_oom_check_powerpc -#define qemu_opt_del qemu_opt_del_powerpc -#define qemu_opt_del_all qemu_opt_del_all_powerpc -#define qemu_opt_find qemu_opt_find_powerpc -#define qemu_opt_foreach qemu_opt_foreach_powerpc -#define qemu_opt_get qemu_opt_get_powerpc -#define qemu_opt_get_bool qemu_opt_get_bool_powerpc -#define qemu_opt_get_bool_del qemu_opt_get_bool_del_powerpc -#define qemu_opt_get_bool_helper qemu_opt_get_bool_helper_powerpc -#define qemu_opt_get_del qemu_opt_get_del_powerpc -#define qemu_opt_get_number qemu_opt_get_number_powerpc -#define qemu_opt_get_number_del qemu_opt_get_number_del_powerpc -#define qemu_opt_get_number_helper qemu_opt_get_number_helper_powerpc -#define qemu_opt_get_size qemu_opt_get_size_powerpc -#define qemu_opt_get_size_del qemu_opt_get_size_del_powerpc -#define qemu_opt_get_size_helper qemu_opt_get_size_helper_powerpc -#define qemu_opt_has_help_opt qemu_opt_has_help_opt_powerpc -#define qemu_opt_parse qemu_opt_parse_powerpc #define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_powerpc #define qemu_opts_append qemu_opts_append_powerpc #define qemu_opts_create qemu_opts_create_powerpc #define qemu_opts_del qemu_opts_del_powerpc #define qemu_opts_do_parse qemu_opts_do_parse_powerpc -#define qemu_opt_set qemu_opt_set_powerpc -#define qemu_opt_set_bool qemu_opt_set_bool_powerpc -#define qemu_opt_set_err qemu_opt_set_err_powerpc -#define qemu_opt_set_number qemu_opt_set_number_powerpc #define qemu_opts_find qemu_opts_find_powerpc #define qemu_opts_foreach qemu_opts_foreach_powerpc #define qemu_opts_free qemu_opts_free_powerpc @@ -2475,9 +2454,7 @@ #define qemu_opts_set_id qemu_opts_set_id_powerpc #define qemu_opts_to_qdict qemu_opts_to_qdict_powerpc #define qemu_opts_validate qemu_opts_validate_powerpc -#define qemu_opt_unset qemu_opt_unset_powerpc #define qemu_parse_fd qemu_parse_fd_powerpc -#define qemu_pipe qemu_pipe_powerpc #define qemu_ram_addr_from_host qemu_ram_addr_from_host_powerpc #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_powerpc #define qemu_ram_alloc qemu_ram_alloc_powerpc @@ -2490,8 +2467,6 @@ #define qemu_ram_setup_dump qemu_ram_setup_dump_powerpc #define qemu_ram_unset_idstr qemu_ram_unset_idstr_powerpc #define qemu_real_host_page_size qemu_real_host_page_size_powerpc -#define qemu_set_cloexec qemu_set_cloexec_powerpc -#define qemu_set_tty_echo qemu_set_tty_echo_powerpc #define qemu_st_helpers qemu_st_helpers_powerpc #define qemu_strnlen qemu_strnlen_powerpc #define qemu_strsep qemu_strsep_powerpc diff --git a/qemu/sparc.h b/qemu/sparc.h index 0b3fceed..f08902ef 100644 --- a/qemu/sparc.h +++ b/qemu/sparc.h @@ -2434,32 +2434,11 @@ #define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_sparc #define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_sparc #define qemu_oom_check qemu_oom_check_sparc -#define qemu_opt_del qemu_opt_del_sparc -#define qemu_opt_del_all qemu_opt_del_all_sparc -#define qemu_opt_find qemu_opt_find_sparc -#define qemu_opt_foreach qemu_opt_foreach_sparc -#define qemu_opt_get qemu_opt_get_sparc -#define qemu_opt_get_bool qemu_opt_get_bool_sparc -#define qemu_opt_get_bool_del qemu_opt_get_bool_del_sparc -#define qemu_opt_get_bool_helper qemu_opt_get_bool_helper_sparc -#define qemu_opt_get_del qemu_opt_get_del_sparc -#define qemu_opt_get_number qemu_opt_get_number_sparc -#define qemu_opt_get_number_del qemu_opt_get_number_del_sparc -#define qemu_opt_get_number_helper qemu_opt_get_number_helper_sparc -#define qemu_opt_get_size qemu_opt_get_size_sparc -#define qemu_opt_get_size_del qemu_opt_get_size_del_sparc -#define qemu_opt_get_size_helper qemu_opt_get_size_helper_sparc -#define qemu_opt_has_help_opt qemu_opt_has_help_opt_sparc -#define qemu_opt_parse qemu_opt_parse_sparc #define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_sparc #define qemu_opts_append qemu_opts_append_sparc #define qemu_opts_create qemu_opts_create_sparc #define qemu_opts_del qemu_opts_del_sparc #define qemu_opts_do_parse qemu_opts_do_parse_sparc -#define qemu_opt_set qemu_opt_set_sparc -#define qemu_opt_set_bool qemu_opt_set_bool_sparc -#define qemu_opt_set_err qemu_opt_set_err_sparc -#define qemu_opt_set_number qemu_opt_set_number_sparc #define qemu_opts_find qemu_opts_find_sparc #define qemu_opts_foreach qemu_opts_foreach_sparc #define qemu_opts_free qemu_opts_free_sparc @@ -2475,9 +2454,7 @@ #define qemu_opts_set_id qemu_opts_set_id_sparc #define qemu_opts_to_qdict qemu_opts_to_qdict_sparc #define qemu_opts_validate qemu_opts_validate_sparc -#define qemu_opt_unset qemu_opt_unset_sparc #define qemu_parse_fd qemu_parse_fd_sparc -#define qemu_pipe qemu_pipe_sparc #define qemu_ram_addr_from_host qemu_ram_addr_from_host_sparc #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_sparc #define qemu_ram_alloc qemu_ram_alloc_sparc @@ -2490,8 +2467,6 @@ #define qemu_ram_setup_dump qemu_ram_setup_dump_sparc #define qemu_ram_unset_idstr qemu_ram_unset_idstr_sparc #define qemu_real_host_page_size qemu_real_host_page_size_sparc -#define qemu_set_cloexec qemu_set_cloexec_sparc -#define qemu_set_tty_echo qemu_set_tty_echo_sparc #define qemu_st_helpers qemu_st_helpers_sparc #define qemu_strnlen qemu_strnlen_sparc #define qemu_strsep qemu_strsep_sparc diff --git a/qemu/sparc64.h b/qemu/sparc64.h index a601c6c0..d1fe272f 100644 --- a/qemu/sparc64.h +++ b/qemu/sparc64.h @@ -2434,32 +2434,11 @@ #define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_sparc64 #define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_sparc64 #define qemu_oom_check qemu_oom_check_sparc64 -#define qemu_opt_del qemu_opt_del_sparc64 -#define qemu_opt_del_all qemu_opt_del_all_sparc64 -#define qemu_opt_find qemu_opt_find_sparc64 -#define qemu_opt_foreach qemu_opt_foreach_sparc64 -#define qemu_opt_get qemu_opt_get_sparc64 -#define qemu_opt_get_bool qemu_opt_get_bool_sparc64 -#define qemu_opt_get_bool_del qemu_opt_get_bool_del_sparc64 -#define qemu_opt_get_bool_helper qemu_opt_get_bool_helper_sparc64 -#define qemu_opt_get_del qemu_opt_get_del_sparc64 -#define qemu_opt_get_number qemu_opt_get_number_sparc64 -#define qemu_opt_get_number_del qemu_opt_get_number_del_sparc64 -#define qemu_opt_get_number_helper qemu_opt_get_number_helper_sparc64 -#define qemu_opt_get_size qemu_opt_get_size_sparc64 -#define qemu_opt_get_size_del qemu_opt_get_size_del_sparc64 -#define qemu_opt_get_size_helper qemu_opt_get_size_helper_sparc64 -#define qemu_opt_has_help_opt qemu_opt_has_help_opt_sparc64 -#define qemu_opt_parse qemu_opt_parse_sparc64 #define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_sparc64 #define qemu_opts_append qemu_opts_append_sparc64 #define qemu_opts_create qemu_opts_create_sparc64 #define qemu_opts_del qemu_opts_del_sparc64 #define qemu_opts_do_parse qemu_opts_do_parse_sparc64 -#define qemu_opt_set qemu_opt_set_sparc64 -#define qemu_opt_set_bool qemu_opt_set_bool_sparc64 -#define qemu_opt_set_err qemu_opt_set_err_sparc64 -#define qemu_opt_set_number qemu_opt_set_number_sparc64 #define qemu_opts_find qemu_opts_find_sparc64 #define qemu_opts_foreach qemu_opts_foreach_sparc64 #define qemu_opts_free qemu_opts_free_sparc64 @@ -2475,9 +2454,7 @@ #define qemu_opts_set_id qemu_opts_set_id_sparc64 #define qemu_opts_to_qdict qemu_opts_to_qdict_sparc64 #define qemu_opts_validate qemu_opts_validate_sparc64 -#define qemu_opt_unset qemu_opt_unset_sparc64 #define qemu_parse_fd qemu_parse_fd_sparc64 -#define qemu_pipe qemu_pipe_sparc64 #define qemu_ram_addr_from_host qemu_ram_addr_from_host_sparc64 #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_sparc64 #define qemu_ram_alloc qemu_ram_alloc_sparc64 @@ -2490,8 +2467,6 @@ #define qemu_ram_setup_dump qemu_ram_setup_dump_sparc64 #define qemu_ram_unset_idstr qemu_ram_unset_idstr_sparc64 #define qemu_real_host_page_size qemu_real_host_page_size_sparc64 -#define qemu_set_cloexec qemu_set_cloexec_sparc64 -#define qemu_set_tty_echo qemu_set_tty_echo_sparc64 #define qemu_st_helpers qemu_st_helpers_sparc64 #define qemu_strnlen qemu_strnlen_sparc64 #define qemu_strsep qemu_strsep_sparc64 diff --git a/qemu/util/oslib-posix.c b/qemu/util/oslib-posix.c index 14dfb358..47b73495 100644 --- a/qemu/util/oslib-posix.c +++ b/qemu/util/oslib-posix.c @@ -137,47 +137,3 @@ void qemu_anon_ram_free(void *ptr, size_t size) munmap(ptr, size); } } - -void qemu_set_cloexec(int fd) -{ - int f; - f = fcntl(fd, F_GETFD); - fcntl(fd, F_SETFD, f | FD_CLOEXEC); -} - -/* - * Creates a pipe with FD_CLOEXEC set on both file descriptors - */ -int qemu_pipe(int pipefd[2]) -{ - int ret; - -#ifdef CONFIG_PIPE2 - ret = pipe2(pipefd, O_CLOEXEC); - if (ret != -1 || errno != ENOSYS) { - return ret; - } -#endif - ret = pipe(pipefd); - if (ret == 0) { - qemu_set_cloexec(pipefd[0]); - qemu_set_cloexec(pipefd[1]); - } - - return ret; -} - -void qemu_set_tty_echo(int fd, bool echo) -{ - struct termios tty; - - tcgetattr(fd, &tty); - - if (echo) { - tty.c_lflag |= ECHO | ECHONL | ICANON | IEXTEN; - } else { - tty.c_lflag &= ~(ECHO | ECHONL | ICANON | IEXTEN); - } - - tcsetattr(fd, TCSANOW, &tty); -} diff --git a/qemu/util/oslib-win32.c b/qemu/util/oslib-win32.c index eb7a9fe1..b875fad0 100644 --- a/qemu/util/oslib-win32.c +++ b/qemu/util/oslib-win32.c @@ -115,21 +115,6 @@ struct tm *localtime_r(const time_t *timep, struct tm *result) return p; } -/* -int inet_aton(const char *cp, struct in_addr *ia) -{ - uint32_t addr = inet_addr(cp); - if (addr == 0xffffffff) { - return 0; - } - ia->s_addr = addr; - return 1; -}*/ - -void qemu_set_cloexec(int fd) -{ -} - /* Offset between 1/1/1601 and 1/1/1970 in 100 nanosec units */ #define _W32_FT_OFFSET (116444736000000000ULL) @@ -150,25 +135,6 @@ int qemu_gettimeofday(qemu_timeval *tp) return 0; } -void qemu_set_tty_echo(int fd, bool echo) -{ - HANDLE handle = (HANDLE)_get_osfhandle(fd); - DWORD dwMode = 0; - - if (handle == INVALID_HANDLE_VALUE) { - return; - } - - GetConsoleMode(handle, &dwMode); - - if (echo) { - SetConsoleMode(handle, dwMode | ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT); - } else { - SetConsoleMode(handle, - dwMode & ~(ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT)); - } -} - size_t getpagesize(void) { SYSTEM_INFO system_info; diff --git a/qemu/util/qemu-option.c b/qemu/util/qemu-option.c index 28d6b364..ec89f69e 100644 --- a/qemu/util/qemu-option.c +++ b/qemu/util/qemu-option.c @@ -27,148 +27,8 @@ #include #include "qemu-common.h" -#include "qapi/qmp/types.h" -#include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qemu/option_int.h" - -/* - * Extracts the name of an option from the parameter string (p points at the - * first byte of the option name) - * - * The option name is delimited by delim (usually , or =) or the string end - * and is copied into buf. If the option name is longer than buf_size, it is - * truncated. buf is always zero terminated. - * - * The return value is the position of the delimiter/zero byte after the option - * name in p. - */ -const char *get_opt_name(char *buf, int buf_size, const char *p, char delim) -{ - char *q; - - q = buf; - while (*p != '\0' && *p != delim) { - if (q && (q - buf) < buf_size - 1) - *q++ = *p; - p++; - } - if (q) - *q = '\0'; - - return p; -} - -/* - * Extracts the value of an option from the parameter string p (p points at the - * first byte of the option value) - * - * This function is comparable to get_opt_name with the difference that the - * delimiter is fixed to be comma which starts a new option. To specify an - * option value that contains commas, double each comma. - */ -const char *get_opt_value(char *buf, int buf_size, const char *p) -{ - char *q; - - q = buf; - while (*p != '\0') { - if (*p == ',') { - if (*(p + 1) != ',') - break; - p++; - } - if (q && (q - buf) < buf_size - 1) - *q++ = *p; - p++; - } - if (q) - *q = '\0'; - - return p; -} - -int get_next_param_value(char *buf, int buf_size, - const char *tag, const char **pstr) -{ - const char *p; - char option[128]; - - p = *pstr; - for(;;) { - p = get_opt_name(option, sizeof(option), p, '='); - if (*p != '=') - break; - p++; - if (!strcmp(tag, option)) { - *pstr = get_opt_value(buf, buf_size, p); - if (**pstr == ',') { - (*pstr)++; - } - return strlen(buf); - } else { - p = get_opt_value(NULL, 0, p); - } - if (*p != ',') - break; - p++; - } - return 0; -} - -int get_param_value(char *buf, int buf_size, - const char *tag, const char *str) -{ - return get_next_param_value(buf, buf_size, tag, &str); -} - -static void parse_option_bool(const char *name, const char *value, bool *ret, - Error **errp) -{ - if (value != NULL) { - if (!strcmp(value, "on")) { - *ret = 1; - } else if (!strcmp(value, "off")) { - *ret = 0; - } else { - error_set(errp,QERR_INVALID_PARAMETER_VALUE, name, "'on' or 'off'"); - } - } else { - *ret = 1; - } -} - -static void parse_option_number(const char *name, const char *value, - uint64_t *ret, Error **errp) -{ - char *postfix; - uint64_t number; - - if (value != NULL) { - number = strtoull(value, &postfix, 0); - if (*postfix != '\0') { - error_set(errp, QERR_INVALID_PARAMETER_VALUE, name, "a number"); - return; - } - *ret = number; - } else { - error_set(errp, QERR_INVALID_PARAMETER_VALUE, name, "a number"); - } -} - -static const QemuOptDesc *find_desc_by_name(const QemuOptDesc *desc, - const char *name) -{ - int i; - - for (i = 0; desc[i].name != NULL; i++) { - if (strcmp(desc[i].name, name) == 0) { - return &desc[i]; - } - } - - return NULL; -} +#include "qemu/option.h" void parse_option_size(const char *name, const char *value, uint64_t *ret, Error **errp) @@ -208,921 +68,3 @@ void parse_option_size(const char *name, const char *value, error_set(errp, QERR_INVALID_PARAMETER_VALUE, name, "a size"); } } - -bool has_help_option(const char *param) -{ - size_t buflen = strlen(param) + 1; - char *buf = g_malloc0(buflen); - const char *p = param; - bool result = false; - - while (*p) { - p = get_opt_value(buf, buflen, p); - if (*p) { - p++; - } - - if (is_help_option(buf)) { - result = true; - goto out; - } - } - -out: - free(buf); - return result; -} - -bool is_valid_option_list(const char *param) -{ - size_t buflen = strlen(param) + 1; - char *buf = g_malloc0(buflen); - const char *p = param; - bool result = true; - - while (*p) { - p = get_opt_value(buf, buflen, p); - if (*p && !*++p) { - result = false; - goto out; - } - - if (!*buf || *buf == ',') { - result = false; - goto out; - } - } - -out: - free(buf); - return result; -} - -void qemu_opts_print_help(QemuOptsList *list) -{ - QemuOptDesc *desc; - - assert(list); - desc = list->desc; - printf("Supported options:\n"); - while (desc && desc->name) { - printf("%-16s %s\n", desc->name, - desc->help ? desc->help : "No description available"); - desc++; - } -} -/* ------------------------------------------------------------------ */ - -QemuOpt *qemu_opt_find(QemuOpts *opts, const char *name) -{ - QemuOpt *opt; - - QTAILQ_FOREACH_REVERSE(opt, &opts->head, QemuOptHead, next) { - if (strcmp(opt->name, name) != 0) - continue; - return opt; - } - return NULL; -} - -static void qemu_opt_del(QemuOpt *opt) -{ - QTAILQ_REMOVE(&opt->opts->head, opt, next); - g_free(opt->name); - g_free(opt->str); - g_free(opt); -} - -/* qemu_opt_set allows many settings for the same option. - * This function deletes all settings for an option. - */ -static void qemu_opt_del_all(QemuOpts *opts, const char *name) -{ - QemuOpt *opt, *next_opt; - - QTAILQ_FOREACH_SAFE(opt, &opts->head, next, next_opt) { - if (!strcmp(opt->name, name)) { - qemu_opt_del(opt); - } - } -} - -const char *qemu_opt_get(QemuOpts *opts, const char *name) -{ - QemuOpt *opt; - - if (opts == NULL) { - return NULL; - } - - opt = qemu_opt_find(opts, name); - if (!opt) { - const QemuOptDesc *desc = find_desc_by_name(opts->list->desc, name); - if (desc && desc->def_value_str) { - return desc->def_value_str; - } - } - return opt ? opt->str : NULL; -} - -/* Get a known option (or its default) and remove it from the list - * all in one action. Return a malloced string of the option value. - * Result must be freed by caller with g_free(). - */ -char *qemu_opt_get_del(QemuOpts *opts, const char *name) -{ - QemuOpt *opt; - const QemuOptDesc *desc; - char *str = NULL; - - if (opts == NULL) { - return NULL; - } - - opt = qemu_opt_find(opts, name); - if (!opt) { - desc = find_desc_by_name(opts->list->desc, name); - if (desc && desc->def_value_str) { - str = g_strdup(desc->def_value_str); - } - return str; - } - str = opt->str; - opt->str = NULL; - qemu_opt_del_all(opts, name); - return str; -} - -bool qemu_opt_has_help_opt(QemuOpts *opts) -{ - QemuOpt *opt; - - QTAILQ_FOREACH_REVERSE(opt, &opts->head, QemuOptHead, next) { - if (is_help_option(opt->name)) { - return true; - } - } - return false; -} - -static bool qemu_opt_get_bool_helper(QemuOpts *opts, const char *name, - bool defval, bool del) -{ - QemuOpt *opt; - bool ret = defval; - - if (opts == NULL) { - return ret; - } - - opt = qemu_opt_find(opts, name); - if (opt == NULL) { - const QemuOptDesc *desc = find_desc_by_name(opts->list->desc, name); - if (desc && desc->def_value_str) { - parse_option_bool(name, desc->def_value_str, &ret, &error_abort); - } - return ret; - } - assert(opt->desc && opt->desc->type == QEMU_OPT_BOOL); - ret = opt->value.boolean; - if (del) { - qemu_opt_del_all(opts, name); - } - return ret; -} - -bool qemu_opt_get_bool(QemuOpts *opts, const char *name, bool defval) -{ - return qemu_opt_get_bool_helper(opts, name, defval, false); -} - -bool qemu_opt_get_bool_del(QemuOpts *opts, const char *name, bool defval) -{ - return qemu_opt_get_bool_helper(opts, name, defval, true); -} - -static uint64_t qemu_opt_get_number_helper(QemuOpts *opts, const char *name, - uint64_t defval, bool del) -{ - QemuOpt *opt; - uint64_t ret = defval; - - if (opts == NULL) { - return ret; - } - - opt = qemu_opt_find(opts, name); - if (opt == NULL) { - const QemuOptDesc *desc = find_desc_by_name(opts->list->desc, name); - if (desc && desc->def_value_str) { - parse_option_number(name, desc->def_value_str, &ret, &error_abort); - } - return ret; - } - assert(opt->desc && opt->desc->type == QEMU_OPT_NUMBER); - ret = opt->value.uint; - if (del) { - qemu_opt_del_all(opts, name); - } - return ret; -} - -uint64_t qemu_opt_get_number(QemuOpts *opts, const char *name, uint64_t defval) -{ - return qemu_opt_get_number_helper(opts, name, defval, false); -} - -uint64_t qemu_opt_get_number_del(QemuOpts *opts, const char *name, - uint64_t defval) -{ - return qemu_opt_get_number_helper(opts, name, defval, true); -} - -static uint64_t qemu_opt_get_size_helper(QemuOpts *opts, const char *name, - uint64_t defval, bool del) -{ - QemuOpt *opt; - uint64_t ret = defval; - - if (opts == NULL) { - return ret; - } - - opt = qemu_opt_find(opts, name); - if (opt == NULL) { - const QemuOptDesc *desc = find_desc_by_name(opts->list->desc, name); - if (desc && desc->def_value_str) { - parse_option_size(name, desc->def_value_str, &ret, &error_abort); - } - return ret; - } - assert(opt->desc && opt->desc->type == QEMU_OPT_SIZE); - ret = opt->value.uint; - if (del) { - qemu_opt_del_all(opts, name); - } - return ret; -} - -uint64_t qemu_opt_get_size(QemuOpts *opts, const char *name, uint64_t defval) -{ - return qemu_opt_get_size_helper(opts, name, defval, false); -} - -uint64_t qemu_opt_get_size_del(QemuOpts *opts, const char *name, - uint64_t defval) -{ - return qemu_opt_get_size_helper(opts, name, defval, true); -} - -static void qemu_opt_parse(QemuOpt *opt, Error **errp) -{ - if (opt->desc == NULL) - return; - - switch (opt->desc->type) { - case QEMU_OPT_STRING: - /* nothing */ - return; - case QEMU_OPT_BOOL: - parse_option_bool(opt->name, opt->str, &opt->value.boolean, errp); - break; - case QEMU_OPT_NUMBER: - parse_option_number(opt->name, opt->str, &opt->value.uint, errp); - break; - case QEMU_OPT_SIZE: - parse_option_size(opt->name, opt->str, &opt->value.uint, errp); - break; - default: - abort(); - } -} - -static bool opts_accepts_any(const QemuOpts *opts) -{ - return opts->list->desc[0].name == NULL; -} - -int qemu_opt_unset(QemuOpts *opts, const char *name) -{ - QemuOpt *opt = qemu_opt_find(opts, name); - - assert(opts_accepts_any(opts)); - - if (opt == NULL) { - return -1; - } else { - qemu_opt_del(opt); - return 0; - } -} - -static void opt_set(QemuOpts *opts, const char *name, const char *value, - bool prepend, Error **errp) -{ - QemuOpt *opt; - const QemuOptDesc *desc; - Error *local_err = NULL; - - desc = find_desc_by_name(opts->list->desc, name); - if (!desc && !opts_accepts_any(opts)) { - error_set(errp, QERR_INVALID_PARAMETER, name); - return; - } - - opt = g_malloc0(sizeof(*opt)); - opt->name = g_strdup(name); - opt->opts = opts; - if (prepend) { - QTAILQ_INSERT_HEAD(&opts->head, opt, next); - } else { - QTAILQ_INSERT_TAIL(&opts->head, opt, next); - } - opt->desc = desc; - opt->str = g_strdup(value); - qemu_opt_parse(opt, &local_err); - if (local_err) { - error_propagate(errp, local_err); - qemu_opt_del(opt); - } -} - -int qemu_opt_set(QemuOpts *opts, const char *name, const char *value) -{ - Error *local_err = NULL; - - opt_set(opts, name, value, false, &local_err); - if (local_err) { - qerror_report_err(local_err); - error_free(local_err); - return -1; - } - - return 0; -} - -void qemu_opt_set_err(QemuOpts *opts, const char *name, const char *value, - Error **errp) -{ - opt_set(opts, name, value, false, errp); -} - -int qemu_opt_set_bool(QemuOpts *opts, const char *name, bool val) -{ - QemuOpt *opt; - const QemuOptDesc *desc = opts->list->desc; - - opt = g_malloc0(sizeof(*opt)); - opt->desc = find_desc_by_name(desc, name); - if (!opt->desc && !opts_accepts_any(opts)) { - qerror_report(QERR_INVALID_PARAMETER, name); - g_free(opt); - return -1; - } - - opt->name = g_strdup(name); - opt->opts = opts; - opt->value.boolean = !!val; - opt->str = g_strdup(val ? "on" : "off"); - QTAILQ_INSERT_TAIL(&opts->head, opt, next); - - return 0; -} - -int qemu_opt_set_number(QemuOpts *opts, const char *name, int64_t val) -{ - QemuOpt *opt; - const QemuOptDesc *desc = opts->list->desc; - - opt = g_malloc0(sizeof(*opt)); - opt->desc = find_desc_by_name(desc, name); - if (!opt->desc && !opts_accepts_any(opts)) { - qerror_report(QERR_INVALID_PARAMETER, name); - g_free(opt); - return -1; - } - - opt->name = g_strdup(name); - opt->opts = opts; - opt->value.uint = val; - opt->str = g_strdup_printf("%" PRId64, val); - QTAILQ_INSERT_TAIL(&opts->head, opt, next); - - return 0; -} - -int qemu_opt_foreach(QemuOpts *opts, qemu_opt_loopfunc func, void *opaque, - int abort_on_failure) -{ - QemuOpt *opt; - int rc = 0; - - QTAILQ_FOREACH(opt, &opts->head, next) { - rc = func(opt->name, opt->str, opaque); - if (abort_on_failure && rc != 0) - break; - } - return rc; -} - -QemuOpts *qemu_opts_find(QemuOptsList *list, const char *id) -{ - QemuOpts *opts; - - QTAILQ_FOREACH(opts, &list->head, next) { - if (!opts->id && !id) { - return opts; - } - if (opts->id && id && !strcmp(opts->id, id)) { - return opts; - } - } - return NULL; -} - -QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id, - int fail_if_exists, Error **errp) -{ - QemuOpts *opts = NULL; - - if (id) { - opts = qemu_opts_find(list, id); - if (opts != NULL) { - if (fail_if_exists && !list->merge_lists) { - error_setg(errp, "Duplicate ID '%s' for %s", id, list->name); - return NULL; - } else { - return opts; - } - } - } else if (list->merge_lists) { - opts = qemu_opts_find(list, NULL); - if (opts) { - return opts; - } - } - opts = g_malloc0(sizeof(*opts)); - opts->id = g_strdup(id); - opts->list = list; - QTAILQ_INIT(&opts->head); - QTAILQ_INSERT_TAIL(&list->head, opts, next); - return opts; -} - -void qemu_opts_reset(QemuOptsList *list) -{ - QemuOpts *opts, *next_opts; - - QTAILQ_FOREACH_SAFE(opts, &list->head, next, next_opts) { - qemu_opts_del(opts); - } -} - -int qemu_opts_set(QemuOptsList *list, const char *id, - const char *name, const char *value) -{ - QemuOpts *opts; - Error *local_err = NULL; - - opts = qemu_opts_create(list, id, 1, &local_err); - if (local_err) { - qerror_report_err(local_err); - error_free(local_err); - return -1; - } - return qemu_opt_set(opts, name, value); -} - -const char *qemu_opts_id(QemuOpts *opts) -{ - return opts->id; -} - -/* The id string will be g_free()d by qemu_opts_del */ -void qemu_opts_set_id(QemuOpts *opts, char *id) -{ - opts->id = id; -} - -void qemu_opts_del(QemuOpts *opts) -{ - QemuOpt *opt; - - if (opts == NULL) { - return; - } - - for (;;) { - opt = QTAILQ_FIRST(&opts->head); - if (opt == NULL) - break; - qemu_opt_del(opt); - } - QTAILQ_REMOVE(&opts->list->head, opts, next); - g_free(opts->id); - g_free(opts); -} - -void qemu_opts_print(QemuOpts *opts) -{ - QemuOpt *opt; - QemuOptDesc *desc = opts->list->desc; - - if (desc[0].name == NULL) { - QTAILQ_FOREACH(opt, &opts->head, next) { - printf("%s=\"%s\" ", opt->name, opt->str); - } - return; - } - for (; desc && desc->name; desc++) { - const char *value; - QemuOpt *opt = qemu_opt_find(opts, desc->name); - - value = opt ? opt->str : desc->def_value_str; - if (!value) { - continue; - } - if (desc->type == QEMU_OPT_STRING) { - printf("%s='%s' ", desc->name, value); - } else if ((desc->type == QEMU_OPT_SIZE || - desc->type == QEMU_OPT_NUMBER) && opt) { - printf("%s=%" PRId64 " ", desc->name, opt->value.uint); - } else { - printf("%s=%s ", desc->name, value); - } - } -} - -static int opts_do_parse(QemuOpts *opts, const char *params, - const char *firstname, bool prepend) -{ - char option[128], value[1024]; - const char *p,*pe,*pc; - Error *local_err = NULL; - - for (p = params; *p != '\0'; p++) { - pe = strchr(p, '='); - pc = strchr(p, ','); - if (!pe || (pc && pc < pe)) { - /* found "foo,more" */ - if (p == params && firstname) { - /* implicitly named first option */ - pstrcpy(option, sizeof(option), firstname); - p = get_opt_value(value, sizeof(value), p); - } else { - /* option without value, probably a flag */ - p = get_opt_name(option, sizeof(option), p, ','); - if (strncmp(option, "no", 2) == 0) { - memmove(option, option+2, strlen(option+2)+1); - pstrcpy(value, sizeof(value), "off"); - } else { - pstrcpy(value, sizeof(value), "on"); - } - } - } else { - /* found "foo=bar,more" */ - p = get_opt_name(option, sizeof(option), p, '='); - if (*p != '=') { - break; - } - p++; - p = get_opt_value(value, sizeof(value), p); - } - if (strcmp(option, "id") != 0) { - /* store and parse */ - opt_set(opts, option, value, prepend, &local_err); - if (local_err) { - qerror_report_err(local_err); - error_free(local_err); - return -1; - } - } - if (*p != ',') { - break; - } - } - return 0; -} - -int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char *firstname) -{ - return opts_do_parse(opts, params, firstname, false); -} - -static QemuOpts *opts_parse(QemuOptsList *list, const char *params, - int permit_abbrev, bool defaults) -{ - const char *firstname; - char value[1024], *id = NULL; - const char *p; - QemuOpts *opts; - Error *local_err = NULL; - - assert(!permit_abbrev || list->implied_opt_name); - firstname = permit_abbrev ? list->implied_opt_name : NULL; - - if (strncmp(params, "id=", 3) == 0) { - get_opt_value(value, sizeof(value), params+3); - id = value; - } else if ((p = strstr(params, ",id=")) != NULL) { - get_opt_value(value, sizeof(value), p+4); - id = value; - } - - /* - * This code doesn't work for defaults && !list->merge_lists: when - * params has no id=, and list has an element with !opts->id, it - * appends a new element instead of returning the existing opts. - * However, we got no use for this case. Guard against possible - * (if unlikely) future misuse: - */ - assert(!defaults || list->merge_lists); - opts = qemu_opts_create(list, id, !defaults, &local_err); - if (opts == NULL) { - if (local_err) { - qerror_report_err(local_err); - error_free(local_err); - } - return NULL; - } - - if (opts_do_parse(opts, params, firstname, defaults) != 0) { - qemu_opts_del(opts); - return NULL; - } - - return opts; -} - -QemuOpts *qemu_opts_parse(QemuOptsList *list, const char *params, - int permit_abbrev) -{ - return opts_parse(list, params, permit_abbrev, false); -} - -void qemu_opts_set_defaults(QemuOptsList *list, const char *params, - int permit_abbrev) -{ - QemuOpts *opts; - - opts = opts_parse(list, params, permit_abbrev, true); - assert(opts); -} - -typedef struct OptsFromQDictState { - QemuOpts *opts; - Error **errp; -} OptsFromQDictState; - -static void qemu_opts_from_qdict_1(const char *key, QObject *obj, void *opaque) -{ - OptsFromQDictState *state = opaque; - char buf[32]; - const char *value; - int n; - - if (!strcmp(key, "id") || *state->errp) { - return; - } - - switch (qobject_type(obj)) { - case QTYPE_QSTRING: - value = qstring_get_str(qobject_to_qstring(obj)); - break; - case QTYPE_QINT: - n = snprintf(buf, sizeof(buf), "%" PRId64, - qint_get_int(qobject_to_qint(obj))); - assert(n < sizeof(buf)); - value = buf; - break; - case QTYPE_QFLOAT: - n = snprintf(buf, sizeof(buf), "%.17g", - qfloat_get_double(qobject_to_qfloat(obj))); - assert(n < sizeof(buf)); - value = buf; - break; - case QTYPE_QBOOL: - pstrcpy(buf, sizeof(buf), - qbool_get_int(qobject_to_qbool(obj)) ? "on" : "off"); - value = buf; - break; - default: - return; - } - - qemu_opt_set_err(state->opts, key, value, state->errp); -} - -/* - * Create QemuOpts from a QDict. - * Use value of key "id" as ID if it exists and is a QString. - * Only QStrings, QInts, QFloats and QBools are copied. Entries with - * other types are silently ignored. - */ -QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, const QDict *qdict, - Error **errp) -{ - OptsFromQDictState state; - Error *local_err = NULL; - QemuOpts *opts; - - opts = qemu_opts_create(list, qdict_get_try_str(qdict, "id"), 1, - &local_err); - if (local_err) { - error_propagate(errp, local_err); - return NULL; - } - - assert(opts != NULL); - - state.errp = &local_err; - state.opts = opts; - qdict_iter(qdict, qemu_opts_from_qdict_1, &state); - if (local_err) { - error_propagate(errp, local_err); - qemu_opts_del(opts); - return NULL; - } - - return opts; -} - -/* - * Adds all QDict entries to the QemuOpts that can be added and removes them - * from the QDict. When this function returns, the QDict contains only those - * entries that couldn't be added to the QemuOpts. - */ -void qemu_opts_absorb_qdict(QemuOpts *opts, QDict *qdict, Error **errp) -{ - const QDictEntry *entry, *next; - - entry = qdict_first(qdict); - - while (entry != NULL) { - Error *local_err = NULL; - OptsFromQDictState state = { - .errp = &local_err, - .opts = opts, - }; - - next = qdict_next(qdict, entry); - - if (find_desc_by_name(opts->list->desc, entry->key)) { - qemu_opts_from_qdict_1(entry->key, entry->value, &state); - if (local_err) { - error_propagate(errp, local_err); - return; - } else { - qdict_del(qdict, entry->key); - } - } - - entry = next; - } -} - -/* - * Convert from QemuOpts to QDict. - * The QDict values are of type QString. - * TODO We'll want to use types appropriate for opt->desc->type, but - * this is enough for now. - */ -QDict *qemu_opts_to_qdict(QemuOpts *opts, QDict *qdict) -{ - QemuOpt *opt; - QObject *val; - - if (!qdict) { - qdict = qdict_new(); - } - if (opts->id) { - qdict_put(qdict, "id", qstring_from_str(opts->id)); - } - QTAILQ_FOREACH(opt, &opts->head, next) { - val = QOBJECT(qstring_from_str(opt->str)); - qdict_put_obj(qdict, opt->name, val); - } - return qdict; -} - -/* Validate parsed opts against descriptions where no - * descriptions were provided in the QemuOptsList. - */ -void qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc, Error **errp) -{ - QemuOpt *opt; - Error *local_err = NULL; - - assert(opts_accepts_any(opts)); - - QTAILQ_FOREACH(opt, &opts->head, next) { - opt->desc = find_desc_by_name(desc, opt->name); - if (!opt->desc) { - error_set(errp, QERR_INVALID_PARAMETER, opt->name); - return; - } - - qemu_opt_parse(opt, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } - } -} - -int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func, void *opaque, - int abort_on_failure) -{ - QemuOpts *opts; - int rc = 0; - - QTAILQ_FOREACH(opts, &list->head, next) { - rc |= func(opts, opaque); - if (abort_on_failure && rc != 0) - break; - } - return rc; -} - -static size_t count_opts_list(QemuOptsList *list) -{ - QemuOptDesc *desc = NULL; - size_t num_opts = 0; - - if (!list) { - return 0; - } - - desc = list->desc; - while (desc && desc->name) { - num_opts++; - desc++; - } - - return num_opts; -} - -void qemu_opts_free(QemuOptsList *list) -{ - g_free(list); -} - -/* Realloc dst option list and append options from an option list (list) - * to it. dst could be NULL or a malloced list. - * The lifetime of dst must be shorter than the input list because the - * QemuOptDesc->name, ->help, and ->def_value_str strings are shared. - */ -QemuOptsList *qemu_opts_append(QemuOptsList *dst, - QemuOptsList *list) -{ - size_t num_opts, num_dst_opts; - QemuOptDesc *desc; - bool need_init = false; - bool need_head_update; - - if (!list) { - return dst; - } - - /* If dst is NULL, after realloc, some area of dst should be initialized - * before adding options to it. - */ - if (!dst) { - need_init = true; - need_head_update = true; - } else { - /* Moreover, even if dst is not NULL, the realloc may move it to a - * different address in which case we may get a stale tail pointer - * in dst->head. */ - need_head_update = QTAILQ_EMPTY(&dst->head); - } - - num_opts = count_opts_list(dst); - num_dst_opts = num_opts; - num_opts += count_opts_list(list); - dst = g_realloc(dst, sizeof(QemuOptsList) + - (num_opts + 1) * sizeof(QemuOptDesc)); - if (need_init) { - dst->name = NULL; - dst->implied_opt_name = NULL; - dst->merge_lists = false; - } - if (need_head_update) { - QTAILQ_INIT(&dst->head); - } - dst->desc[num_dst_opts].name = NULL; - - /* append list->desc to dst->desc */ - if (list) { - desc = list->desc; - while (desc && desc->name) { - if (find_desc_by_name(dst->desc, desc->name) == NULL) { - dst->desc[num_dst_opts++] = *desc; - dst->desc[num_dst_opts].name = NULL; - } - desc++; - } - } - - return dst; -} diff --git a/qemu/x86_64.h b/qemu/x86_64.h index 0ae4de7e..5aeea410 100644 --- a/qemu/x86_64.h +++ b/qemu/x86_64.h @@ -2434,32 +2434,11 @@ #define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_x86_64 #define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_x86_64 #define qemu_oom_check qemu_oom_check_x86_64 -#define qemu_opt_del qemu_opt_del_x86_64 -#define qemu_opt_del_all qemu_opt_del_all_x86_64 -#define qemu_opt_find qemu_opt_find_x86_64 -#define qemu_opt_foreach qemu_opt_foreach_x86_64 -#define qemu_opt_get qemu_opt_get_x86_64 -#define qemu_opt_get_bool qemu_opt_get_bool_x86_64 -#define qemu_opt_get_bool_del qemu_opt_get_bool_del_x86_64 -#define qemu_opt_get_bool_helper qemu_opt_get_bool_helper_x86_64 -#define qemu_opt_get_del qemu_opt_get_del_x86_64 -#define qemu_opt_get_number qemu_opt_get_number_x86_64 -#define qemu_opt_get_number_del qemu_opt_get_number_del_x86_64 -#define qemu_opt_get_number_helper qemu_opt_get_number_helper_x86_64 -#define qemu_opt_get_size qemu_opt_get_size_x86_64 -#define qemu_opt_get_size_del qemu_opt_get_size_del_x86_64 -#define qemu_opt_get_size_helper qemu_opt_get_size_helper_x86_64 -#define qemu_opt_has_help_opt qemu_opt_has_help_opt_x86_64 -#define qemu_opt_parse qemu_opt_parse_x86_64 #define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_x86_64 #define qemu_opts_append qemu_opts_append_x86_64 #define qemu_opts_create qemu_opts_create_x86_64 #define qemu_opts_del qemu_opts_del_x86_64 #define qemu_opts_do_parse qemu_opts_do_parse_x86_64 -#define qemu_opt_set qemu_opt_set_x86_64 -#define qemu_opt_set_bool qemu_opt_set_bool_x86_64 -#define qemu_opt_set_err qemu_opt_set_err_x86_64 -#define qemu_opt_set_number qemu_opt_set_number_x86_64 #define qemu_opts_find qemu_opts_find_x86_64 #define qemu_opts_foreach qemu_opts_foreach_x86_64 #define qemu_opts_free qemu_opts_free_x86_64 @@ -2475,9 +2454,7 @@ #define qemu_opts_set_id qemu_opts_set_id_x86_64 #define qemu_opts_to_qdict qemu_opts_to_qdict_x86_64 #define qemu_opts_validate qemu_opts_validate_x86_64 -#define qemu_opt_unset qemu_opt_unset_x86_64 #define qemu_parse_fd qemu_parse_fd_x86_64 -#define qemu_pipe qemu_pipe_x86_64 #define qemu_ram_addr_from_host qemu_ram_addr_from_host_x86_64 #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_x86_64 #define qemu_ram_alloc qemu_ram_alloc_x86_64 @@ -2490,8 +2467,6 @@ #define qemu_ram_setup_dump qemu_ram_setup_dump_x86_64 #define qemu_ram_unset_idstr qemu_ram_unset_idstr_x86_64 #define qemu_real_host_page_size qemu_real_host_page_size_x86_64 -#define qemu_set_cloexec qemu_set_cloexec_x86_64 -#define qemu_set_tty_echo qemu_set_tty_echo_x86_64 #define qemu_st_helpers qemu_st_helpers_x86_64 #define qemu_strnlen qemu_strnlen_x86_64 #define qemu_strsep qemu_strsep_x86_64