From 7512ff57de098c7a31775c2cdd3de2b71af93e4c Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Tue, 10 Jan 2017 16:29:47 +0800 Subject: [PATCH] more cleanup --- qemu/include/qapi/qmp-event.h | 27 ---- qemu/include/qapi/qmp/dispatch.h | 58 -------- qemu/include/qapi/qmp/json-lexer.h | 51 ------- qemu/include/qapi/qmp/json-parser.h | 24 ---- qemu/include/qapi/qmp/json-streamer.h | 40 ------ qemu/include/qapi/util.h | 17 --- qemu/include/qemu/bitmap.h | 184 -------------------------- qemu/include/qemu/module.h | 1 - qemu/include/qemu/option.h | 35 ----- qemu/include/qemu/osdep.h | 7 - qemu/include/qemu/seqlock.h | 65 --------- qemu/include/qemu/timer.h | 141 -------------------- qemu/include/sysemu/cpus.h | 4 - qemu/include/sysemu/os-posix.h | 50 ------- qemu/include/sysemu/os-win32.h | 27 ---- qemu/qapi/string-input-visitor.c | 1 - qemu/target-i386/cpu.c | 1 - qemu/util/oslib-win32.c | 46 +------ 18 files changed, 1 insertion(+), 778 deletions(-) delete mode 100644 qemu/include/qapi/qmp-event.h delete mode 100644 qemu/include/qapi/qmp/dispatch.h delete mode 100644 qemu/include/qapi/qmp/json-lexer.h delete mode 100644 qemu/include/qapi/qmp/json-parser.h delete mode 100644 qemu/include/qapi/qmp/json-streamer.h delete mode 100644 qemu/include/qapi/util.h delete mode 100644 qemu/include/qemu/option.h delete mode 100644 qemu/include/qemu/seqlock.h delete mode 100644 qemu/include/sysemu/os-posix.h diff --git a/qemu/include/qapi/qmp-event.h b/qemu/include/qapi/qmp-event.h deleted file mode 100644 index 8a8ffb57..00000000 --- a/qemu/include/qapi/qmp-event.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * QMP Event related - * - * Copyright (c) 2014 Wenchao Xia - * - * Authors: - * Wenchao Xia - * - * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. - * See the COPYING.LIB file in the top-level directory. - * - */ - -#ifndef QMP_EVENT_H -#define QMP_EVENT_H - -#include "qapi/error.h" -#include "qapi/qmp/qdict.h" - -typedef void (*QMPEventFuncEmit)(unsigned event, QDict *dict, Error **errp); - -void qmp_event_set_func_emit(QMPEventFuncEmit emit); - -QMPEventFuncEmit qmp_event_get_func_emit(void); - -QDict *qmp_event_build_dict(const char *event_name); -#endif diff --git a/qemu/include/qapi/qmp/dispatch.h b/qemu/include/qapi/qmp/dispatch.h deleted file mode 100644 index e389697f..00000000 --- a/qemu/include/qapi/qmp/dispatch.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Core Definitions for QAPI/QMP Dispatch - * - * Copyright IBM, Corp. 2011 - * - * Authors: - * Anthony Liguori - * - * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. - * See the COPYING.LIB file in the top-level directory. - * - */ - -#ifndef QMP_CORE_H -#define QMP_CORE_H - -#include "qapi/qmp/qobject.h" -#include "qapi/qmp/qdict.h" -#include "qapi/error.h" - -typedef void (QmpCommandFunc)(QDict *, QObject **, Error **); - -typedef enum QmpCommandType -{ - QCT_NORMAL, -} QmpCommandType; - -typedef enum QmpCommandOptions -{ - QCO_NO_OPTIONS = 0x0, - QCO_NO_SUCCESS_RESP = 0x1, -} QmpCommandOptions; - -typedef struct QmpCommand -{ - const char *name; - QmpCommandType type; - QmpCommandFunc *fn; - QmpCommandOptions options; - QTAILQ_ENTRY(QmpCommand) node; - bool enabled; -} QmpCommand; - -void qmp_register_command(const char *name, QmpCommandFunc *fn, - QmpCommandOptions options); -QmpCommand *qmp_find_command(const char *name); -QObject *qmp_dispatch(QObject *request); -void qmp_disable_command(const char *name); -void qmp_enable_command(const char *name); -bool qmp_command_is_enabled(const QmpCommand *cmd); -const char *qmp_command_name(const QmpCommand *cmd); -bool qmp_has_success_response(const QmpCommand *cmd); -QObject *qmp_build_error_object(Error *err); -typedef void (*qmp_cmd_callback_fn)(QmpCommand *cmd, void *opaque); -void qmp_for_each_command(qmp_cmd_callback_fn fn, void *opaque); - -#endif - diff --git a/qemu/include/qapi/qmp/json-lexer.h b/qemu/include/qapi/qmp/json-lexer.h deleted file mode 100644 index cdff0460..00000000 --- a/qemu/include/qapi/qmp/json-lexer.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * JSON lexer - * - * Copyright IBM, Corp. 2009 - * - * Authors: - * Anthony Liguori - * - * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. - * See the COPYING.LIB file in the top-level directory. - * - */ - -#ifndef QEMU_JSON_LEXER_H -#define QEMU_JSON_LEXER_H - -#include "qapi/qmp/qstring.h" -#include "qapi/qmp/qlist.h" - -typedef enum json_token_type { - JSON_OPERATOR = 100, - JSON_INTEGER, - JSON_FLOAT, - JSON_KEYWORD, - JSON_STRING, - JSON_ESCAPE, - JSON_SKIP, - JSON_ERROR, -} JSONTokenType; - -typedef struct JSONLexer JSONLexer; - -typedef void (JSONLexerEmitter)(JSONLexer *, QString *, JSONTokenType, int x, int y); - -struct JSONLexer -{ - JSONLexerEmitter *emit; - int state; - QString *token; - int x, y; -}; - -void json_lexer_init(JSONLexer *lexer, JSONLexerEmitter func); - -int json_lexer_feed(JSONLexer *lexer, const char *buffer, size_t size); - -int json_lexer_flush(JSONLexer *lexer); - -void json_lexer_destroy(JSONLexer *lexer); - -#endif diff --git a/qemu/include/qapi/qmp/json-parser.h b/qemu/include/qapi/qmp/json-parser.h deleted file mode 100644 index 44d88f34..00000000 --- a/qemu/include/qapi/qmp/json-parser.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * JSON Parser - * - * Copyright IBM, Corp. 2009 - * - * Authors: - * Anthony Liguori - * - * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. - * See the COPYING.LIB file in the top-level directory. - * - */ - -#ifndef QEMU_JSON_PARSER_H -#define QEMU_JSON_PARSER_H - -#include "qemu-common.h" -#include "qapi/qmp/qlist.h" -#include "qapi/error.h" - -QObject *json_parser_parse(QList *tokens, va_list *ap); -QObject *json_parser_parse_err(QList *tokens, va_list *ap, Error **errp); - -#endif diff --git a/qemu/include/qapi/qmp/json-streamer.h b/qemu/include/qapi/qmp/json-streamer.h deleted file mode 100644 index 823f7d7f..00000000 --- a/qemu/include/qapi/qmp/json-streamer.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * JSON streaming support - * - * Copyright IBM, Corp. 2009 - * - * Authors: - * Anthony Liguori - * - * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. - * See the COPYING.LIB file in the top-level directory. - * - */ - -#ifndef QEMU_JSON_STREAMER_H -#define QEMU_JSON_STREAMER_H - -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/json-lexer.h" - -typedef struct JSONMessageParser -{ - void (*emit)(struct JSONMessageParser *parser, QList *tokens); - JSONLexer lexer; - int brace_count; - int bracket_count; - QList *tokens; - uint64_t token_size; -} JSONMessageParser; - -void json_message_parser_init(JSONMessageParser *parser, - void (*func)(JSONMessageParser *, QList *)); - -int json_message_parser_feed(JSONMessageParser *parser, - const char *buffer, size_t size); - -int json_message_parser_flush(JSONMessageParser *parser); - -void json_message_parser_destroy(JSONMessageParser *parser); - -#endif diff --git a/qemu/include/qapi/util.h b/qemu/include/qapi/util.h deleted file mode 100644 index de9238bf..00000000 --- a/qemu/include/qapi/util.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * QAPI util functions - * - * Copyright Fujitsu, Inc. 2014 - * - * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. - * See the COPYING.LIB file in the top-level directory. - * - */ - -#ifndef QAPI_UTIL_H -#define QAPI_UTIL_H - -int qapi_enum_parse(const char *lookup[], const char *buf, - int max, int def, Error **errp); - -#endif diff --git a/qemu/include/qemu/bitmap.h b/qemu/include/qemu/bitmap.h index a3207f5e..89b6b34d 100644 --- a/qemu/include/qemu/bitmap.h +++ b/qemu/include/qemu/bitmap.h @@ -26,21 +26,8 @@ * Note that nbits should be always a compile time evaluable constant. * Otherwise many inlines will generate horrible code. * - * bitmap_zero(dst, nbits) *dst = 0UL - * bitmap_fill(dst, nbits) *dst = ~0UL - * bitmap_copy(dst, src, nbits) *dst = *src - * bitmap_and(dst, src1, src2, nbits) *dst = *src1 & *src2 - * bitmap_or(dst, src1, src2, nbits) *dst = *src1 | *src2 - * bitmap_xor(dst, src1, src2, nbits) *dst = *src1 ^ *src2 - * bitmap_andnot(dst, src1, src2, nbits) *dst = *src1 & ~(*src2) - * bitmap_complement(dst, src, nbits) *dst = ~(*src) - * bitmap_equal(src1, src2, nbits) Are *src1 and *src2 equal? - * bitmap_intersects(src1, src2, nbits) Do *src1 and *src2 overlap? - * bitmap_empty(src, nbits) Are all bits zero in *src? - * bitmap_full(src, nbits) Are all bits set in *src? * bitmap_set(dst, pos, nbits) Set specified bit area * bitmap_clear(dst, pos, nbits) Clear specified bit area - * bitmap_find_next_zero_area(buf, len, pos, n, mask) Find bit free area */ /* @@ -48,15 +35,6 @@ * * set_bit(bit, addr) *addr |= bit * clear_bit(bit, addr) *addr &= ~bit - * change_bit(bit, addr) *addr ^= bit - * test_bit(bit, addr) Is bit set in *addr? - * test_and_set_bit(bit, addr) Set bit and return old value - * test_and_clear_bit(bit, addr) Clear bit and return old value - * test_and_change_bit(bit, addr) Change bit and return old value - * find_first_zero_bit(addr, nbits) Position first zero bit in *addr - * find_first_bit(addr, nbits) Position first set bit in *addr - * find_next_zero_bit(addr, nbits, bit) Position next zero bit in *addr >= bit - * find_next_bit(addr, nbits, bit) Position next set bit in *addr >= bit */ #define BITMAP_LAST_WORD_MASK(nbits) \ @@ -68,170 +46,8 @@ #define DECLARE_BITMAP(name,bits) \ unsigned long name[BITS_TO_LONGS(bits)] -#define small_nbits(nbits) \ - ((nbits) <= BITS_PER_LONG) - -int slow_bitmap_empty(const unsigned long *bitmap, long bits); -int slow_bitmap_full(const unsigned long *bitmap, long bits); -int slow_bitmap_equal(const unsigned long *bitmap1, - const unsigned long *bitmap2, long bits); -void slow_bitmap_complement(unsigned long *dst, const unsigned long *src, - long bits); -void slow_bitmap_shift_right(unsigned long *dst, - const unsigned long *src, int shift, long bits); -void slow_bitmap_shift_left(unsigned long *dst, - const unsigned long *src, int shift, long bits); -int slow_bitmap_and(unsigned long *dst, const unsigned long *bitmap1, - const unsigned long *bitmap2, long bits); -void slow_bitmap_or(unsigned long *dst, const unsigned long *bitmap1, - const unsigned long *bitmap2, long bits); -void slow_bitmap_xor(unsigned long *dst, const unsigned long *bitmap1, - const unsigned long *bitmap2, long bits); -int slow_bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1, - const unsigned long *bitmap2, long bits); -int slow_bitmap_intersects(const unsigned long *bitmap1, - const unsigned long *bitmap2, long bits); - -static inline unsigned long *bitmap_try_new(long nbits) -{ - long len = BITS_TO_LONGS(nbits) * sizeof(unsigned long); - return g_try_malloc0(len); -} - -static inline unsigned long *bitmap_new(long nbits) -{ - unsigned long *ptr = bitmap_try_new(nbits); - if (ptr == NULL) { - abort(); - } - return ptr; -} - -static inline void bitmap_zero(unsigned long *dst, long nbits) -{ - if (small_nbits(nbits)) { - *dst = 0UL; - } else { - long len = BITS_TO_LONGS(nbits) * sizeof(unsigned long); - memset(dst, 0, len); - } -} - -static inline void bitmap_fill(unsigned long *dst, long nbits) -{ - size_t nlongs = BITS_TO_LONGS(nbits); - if (!small_nbits(nbits)) { - long len = (nlongs - 1) * sizeof(unsigned long); - memset(dst, 0xff, len); - } - dst[nlongs - 1] = BITMAP_LAST_WORD_MASK(nbits); -} - -static inline void bitmap_copy(unsigned long *dst, const unsigned long *src, - long nbits) -{ - if (small_nbits(nbits)) { - *dst = *src; - } else { - long len = BITS_TO_LONGS(nbits) * sizeof(unsigned long); - memcpy(dst, src, len); - } -} - -static inline int bitmap_and(unsigned long *dst, const unsigned long *src1, - const unsigned long *src2, long nbits) -{ - if (small_nbits(nbits)) { - return (*dst = *src1 & *src2) != 0; - } - return slow_bitmap_and(dst, src1, src2, nbits); -} - -static inline void bitmap_or(unsigned long *dst, const unsigned long *src1, - const unsigned long *src2, long nbits) -{ - if (small_nbits(nbits)) { - *dst = *src1 | *src2; - } else { - slow_bitmap_or(dst, src1, src2, nbits); - } -} - -static inline void bitmap_xor(unsigned long *dst, const unsigned long *src1, - const unsigned long *src2, long nbits) -{ - if (small_nbits(nbits)) { - *dst = *src1 ^ *src2; - } else { - slow_bitmap_xor(dst, src1, src2, nbits); - } -} - -static inline int bitmap_andnot(unsigned long *dst, const unsigned long *src1, - const unsigned long *src2, long nbits) -{ - if (small_nbits(nbits)) { - return (*dst = *src1 & ~(*src2)) != 0; - } - return slow_bitmap_andnot(dst, src1, src2, nbits); -} - -static inline void bitmap_complement(unsigned long *dst, - const unsigned long *src, - long nbits) -{ - if (small_nbits(nbits)) { - *dst = ~(*src) & BITMAP_LAST_WORD_MASK(nbits); - } else { - slow_bitmap_complement(dst, src, nbits); - } -} - -static inline int bitmap_equal(const unsigned long *src1, - const unsigned long *src2, long nbits) -{ - if (small_nbits(nbits)) { - return ! ((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits)); - } else { - return slow_bitmap_equal(src1, src2, nbits); - } -} - -static inline int bitmap_empty(const unsigned long *src, long nbits) -{ - if (small_nbits(nbits)) { - return ! (*src & BITMAP_LAST_WORD_MASK(nbits)); - } else { - return slow_bitmap_empty(src, nbits); - } -} - -static inline int bitmap_full(const unsigned long *src, long nbits) -{ - if (small_nbits(nbits)) { - return ! (~(*src) & BITMAP_LAST_WORD_MASK(nbits)); - } else { - return slow_bitmap_full(src, nbits); - } -} - -static inline int bitmap_intersects(const unsigned long *src1, - const unsigned long *src2, long nbits) -{ - if (small_nbits(nbits)) { - return ((*src1 & *src2) & BITMAP_LAST_WORD_MASK(nbits)) != 0; - } else { - return slow_bitmap_intersects(src1, src2, nbits); - } -} - void bitmap_set(unsigned long *map, long i, long len); void bitmap_clear(unsigned long *map, long start, long nr); -unsigned long bitmap_find_next_zero_area(unsigned long *map, - unsigned long size, - unsigned long start, - unsigned long nr, - unsigned long align_mask); static inline unsigned long *bitmap_zero_extend(unsigned long *old, long old_nbits, long new_nbits) diff --git a/qemu/include/qemu/module.h b/qemu/include/qemu/module.h index 1674d459..4161e23c 100644 --- a/qemu/include/qemu/module.h +++ b/qemu/include/qemu/module.h @@ -48,7 +48,6 @@ typedef enum { MODULE_INIT_MAX } module_init_type; -#define block_init(function) module_init(function, MODULE_INIT_BLOCK) #define machine_init(function) module_init(function, MODULE_INIT_MACHINE) #define qapi_init(function) module_init(function, MODULE_INIT_QAPI) #define type_init(function) module_init(function, MODULE_INIT_QOM) diff --git a/qemu/include/qemu/option.h b/qemu/include/qemu/option.h deleted file mode 100644 index df3278f2..00000000 --- a/qemu/include/qemu/option.h +++ /dev/null @@ -1,35 +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_H -#define QEMU_OPTIONS_H - -#include -#include "qapi/error.h" - -void parse_option_size(const char *name, const char *value, - uint64_t *ret, Error **errp); - -#endif diff --git a/qemu/include/qemu/osdep.h b/qemu/include/qemu/osdep.h index 981ac5f1..dbd795a0 100644 --- a/qemu/include/qemu/osdep.h +++ b/qemu/include/qemu/osdep.h @@ -168,11 +168,6 @@ void qemu_anon_ram_free(void *ptr, size_t size); #endif -int qemu_madvise(void *addr, size_t len, int advice); - -int qemu_open(const char *name, int flags, ...); -int qemu_close(int fd); - #if defined(__HAIKU__) && defined(__i386__) #define FMT_pid "%ld" #elif defined(WIN64) @@ -181,8 +176,6 @@ int qemu_close(int fd); #define FMT_pid "%d" #endif -int qemu_create_pidfile(const char *filename); - #ifdef _WIN32 static inline void qemu_timersub(const struct timeval *val1, const struct timeval *val2, diff --git a/qemu/include/qemu/seqlock.h b/qemu/include/qemu/seqlock.h deleted file mode 100644 index 22c96b8b..00000000 --- a/qemu/include/qemu/seqlock.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Seqlock implementation for QEMU - * - * Copyright Red Hat, Inc. 2013 - * - * Author: - * Paolo Bonzini - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ -#ifndef QEMU_SEQLOCK_H -#define QEMU_SEQLOCK_H 1 - -#include -#include - -typedef struct QemuSeqLock QemuSeqLock; - -struct QemuSeqLock { - QemuMutex *mutex; - unsigned sequence; -}; - -static inline void seqlock_init(QemuSeqLock *sl, QemuMutex *mutex) -{ - sl->mutex = mutex; - sl->sequence = 0; -} - -/* Lock out other writers and update the count. */ -static inline void seqlock_write_lock(QemuSeqLock *sl) -{ - if (sl->mutex) { - qemu_mutex_lock(sl->mutex); - } - ++sl->sequence; - - /* Write sequence before updating other fields. */ - smp_wmb(); -} - -static inline void seqlock_write_unlock(QemuSeqLock *sl) -{ - /* Write other fields before finalizing sequence. */ - smp_wmb(); - - ++sl->sequence; - if (sl->mutex) { - qemu_mutex_unlock(sl->mutex); - } -} - -static inline unsigned seqlock_read_begin(QemuSeqLock *sl) -{ - /* Always fail if a write is in progress. */ - unsigned ret = sl->sequence & ~1; - - /* Read sequence before reading other fields. */ - smp_rmb(); - return ret; -} - -#endif diff --git a/qemu/include/qemu/timer.h b/qemu/include/qemu/timer.h index 02236453..f3612863 100644 --- a/qemu/include/qemu/timer.h +++ b/qemu/include/qemu/timer.h @@ -106,147 +106,6 @@ static inline int64_t qemu_clock_get_us(QEMUClockType type) return qemu_clock_get_ns(type) / SCALE_US; } -/** - * qemu_clock_has_timers: - * @type: the clock type - * - * Determines whether a clock's default timer list - * has timers attached - * - * Note that this function should not be used when other threads also access - * the timer list. The return value may be outdated by the time it is acted - * upon. - * - * Returns: true if the clock's default timer list - * has timers attached - */ -bool qemu_clock_has_timers(QEMUClockType type); - -/** - * qemu_clock_expired: - * @type: the clock type - * - * Determines whether a clock's default timer list - * has an expired clock. - * - * Returns: true if the clock's default timer list has - * an expired timer - */ -bool qemu_clock_expired(QEMUClockType type); - -/** - * qemu_clock_use_for_deadline: - * @type: the clock type - * - * Determine whether a clock should be used for deadline - * calculations. Some clocks, for instance vm_clock with - * use_icount set, do not count in nanoseconds. Such clocks - * are not used for deadline calculations, and are presumed - * to interrupt any poll using qemu_notify/aio_notify - * etc. - * - * Returns: true if the clock runs in nanoseconds and - * should be used for a deadline. - */ -bool qemu_clock_use_for_deadline(QEMUClockType type); - -/** - * qemu_clock_deadline_ns_all: - * @type: the clock type - * - * Calculate the deadline across all timer lists associated - * with a clock (as opposed to just the default one) - * in nanoseconds, or -1 if no timer is set to expire. - * - * Returns: time until expiry in nanoseconds or -1 - */ -int64_t qemu_clock_deadline_ns_all(QEMUClockType type); - -/** - * qemu_clock_get_main_loop_timerlist: - * @type: the clock type - * - * Return the default timer list assocatiated with a clock. - * - * Returns: the default timer list - */ -QEMUTimerList *qemu_clock_get_main_loop_timerlist(QEMUClockType type); - -/** - * qemu_clock_nofify: - * @type: the clock type - * - * Call the notifier callback connected with the default timer - * list linked to the clock, or qemu_notify() if none. - */ -void qemu_clock_notify(QEMUClockType type); - -/** - * qemu_clock_enable: - * @type: the clock type - * @enabled: true to enable, false to disable - * - * Enable or disable a clock - * Disabling the clock will wait for related timerlists to stop - * executing qemu_run_timers. Thus, this functions should not - * be used from the callback of a timer that is based on @clock. - * Doing so would cause a deadlock. - * - * Caller should hold BQL. - */ -void qemu_clock_enable(QEMUClockType type, bool enabled); - -/** - * qemu_clock_warp: - * @type: the clock type - * - * Warp a clock to a new value - */ -void qemu_clock_warp(QEMUClockType type); - -/** - * qemu_clock_register_reset_notifier: - * @type: the clock type - * @notifier: the notifier function - * - * Register a notifier function to call when the clock - * concerned is reset. - */ -void qemu_clock_register_reset_notifier(QEMUClockType type, - Notifier *notifier); - -/** - * qemu_clock_unregister_reset_notifier: - * @type: the clock type - * @notifier: the notifier function - * - * Unregister a notifier function to call when the clock - * concerned is reset. - */ -void qemu_clock_unregister_reset_notifier(QEMUClockType type, - Notifier *notifier); - -/** - * qemu_clock_run_timers: - * @type: clock on which to operate - * - * Run all the timers associated with the default timer list - * of a clock. - * - * Returns: true if any timer ran. - */ -bool qemu_clock_run_timers(QEMUClockType type); - -/** - * qemu_clock_run_all_timers: - * - * Run all the timers associated with the default timer list - * of every clock. - * - * Returns: true if any timer ran. - */ -bool qemu_clock_run_all_timers(void); - /* * QEMUTimerList */ diff --git a/qemu/include/sysemu/cpus.h b/qemu/include/sysemu/cpus.h index cac07eda..8a55e0b9 100644 --- a/qemu/include/sysemu/cpus.h +++ b/qemu/include/sysemu/cpus.h @@ -7,10 +7,6 @@ struct uc_struct; int resume_all_vcpus(struct uc_struct*); void cpu_stop_current(struct uc_struct*); -void cpu_synchronize_all_states(void); -void cpu_synchronize_all_post_reset(void); -void cpu_synchronize_all_post_init(void); - #ifndef CONFIG_USER_ONLY /* vl.c */ extern int smp_cores; diff --git a/qemu/include/sysemu/os-posix.h b/qemu/include/sysemu/os-posix.h deleted file mode 100644 index 03555df0..00000000 --- a/qemu/include/sysemu/os-posix.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * posix specific declarations - * - * Copyright (c) 2003-2008 Fabrice Bellard - * Copyright (c) 2010 Jes Sorensen - * - * 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_OS_POSIX_H -#define QEMU_OS_POSIX_H - -#include - -void os_set_line_buffering(void); -void os_set_proc_name(const char *s); -void os_setup_signal_handling(void); -void os_setup_post(void); -int os_mlock(void); - -typedef struct timeval qemu_timeval; -#define qemu_gettimeofday(tp) gettimeofday(tp, NULL) - -#ifndef CONFIG_UTIMENSAT -#ifndef UTIME_NOW -# define UTIME_NOW ((1l << 30) - 1l) -#endif -#ifndef UTIME_OMIT -# define UTIME_OMIT ((1l << 30) - 2l) -#endif -#endif -typedef struct timespec qemu_timespec; - -#endif diff --git a/qemu/include/sysemu/os-win32.h b/qemu/include/sysemu/os-win32.h index 89f53631..4b391305 100644 --- a/qemu/include/sysemu/os-win32.h +++ b/qemu/include/sysemu/os-win32.h @@ -27,7 +27,6 @@ #define QEMU_OS_WIN32_H #include -#include #include /* Workaround for older versions of MinGW. */ @@ -76,36 +75,10 @@ /* Declaration of ffs() is missing in MinGW's strings.h. */ int ffs(int i); -/* Missing POSIX functions. Don't use MinGW-w64 macros. */ -#undef gmtime_r -struct tm *gmtime_r(const time_t *timep, struct tm *result); -#undef localtime_r -struct tm *localtime_r(const time_t *timep, struct tm *result); - -// char *strtok_r(char *str, const char *delim, char **saveptr); - -static inline void os_setup_signal_handling(void) {} -static inline void os_setup_post(void) {} -void os_set_line_buffering(void); -static inline void os_set_proc_name(const char *dummy) {} - size_t getpagesize(void); #if !defined(EPROTONOSUPPORT) # define EPROTONOSUPPORT EINVAL #endif -int setenv(const char *name, const char *value, int overwrite); - -typedef struct { - long tv_sec; - long tv_usec; -} qemu_timeval; -int qemu_gettimeofday(qemu_timeval *tp); - -static inline int os_mlock(void) -{ - return -ENOSYS; -} - #endif diff --git a/qemu/qapi/string-input-visitor.c b/qemu/qapi/string-input-visitor.c index 5bd9fae8..a9a0f588 100644 --- a/qemu/qapi/string-input-visitor.c +++ b/qemu/qapi/string-input-visitor.c @@ -14,7 +14,6 @@ #include "qapi/string-input-visitor.h" #include "qapi/visitor-impl.h" #include "qapi/qmp/qerror.h" -#include "qemu/option.h" #include "qemu/queue.h" #include "qemu/range.h" diff --git a/qemu/target-i386/cpu.c b/qemu/target-i386/cpu.c index d8b58510..41e6ca7a 100644 --- a/qemu/target-i386/cpu.c +++ b/qemu/target-i386/cpu.c @@ -25,7 +25,6 @@ #include "sysemu/cpus.h" #include "topology.h" -#include "qemu/option.h" #include "qapi/qmp/qerror.h" #include "qapi-types.h" diff --git a/qemu/util/oslib-win32.c b/qemu/util/oslib-win32.c index b875fad0..26013620 100644 --- a/qemu/util/oslib-win32.c +++ b/qemu/util/oslib-win32.c @@ -62,7 +62,7 @@ void *qemu_memalign(size_t alignment, size_t size) { return qemu_oom_check(qemu_try_memalign(alignment, size)); } - + void *qemu_anon_ram_alloc(size_t size, uint64_t *align) { void *ptr; @@ -91,50 +91,6 @@ void qemu_anon_ram_free(void *ptr, size_t size) } } -/* FIXME: add proper locking */ -struct tm *gmtime_r(const time_t *timep, struct tm *result) -{ - struct tm *p = gmtime(timep); - memset(result, 0, sizeof(*result)); - if (p) { - *result = *p; - p = result; - } - return p; -} - -/* FIXME: add proper locking */ -struct tm *localtime_r(const time_t *timep, struct tm *result) -{ - struct tm *p = localtime(timep); - memset(result, 0, sizeof(*result)); - if (p) { - *result = *p; - p = result; - } - return p; -} - -/* Offset between 1/1/1601 and 1/1/1970 in 100 nanosec units */ -#define _W32_FT_OFFSET (116444736000000000ULL) - -int qemu_gettimeofday(qemu_timeval *tp) -{ - union { - unsigned long long ns100; /*time since 1 Jan 1601 in 100ns units */ - FILETIME ft; - } _now; - - if(tp) { - GetSystemTimeAsFileTime (&_now.ft); - tp->tv_usec=(long)((_now.ns100 / 10ULL) % 1000000ULL ); - tp->tv_sec= (long)((_now.ns100 - _W32_FT_OFFSET) / 10000000ULL); - } - /* Always return 0 as per Open Group Base Specifications Issue 6. - Do not set errno on error. */ - return 0; -} - size_t getpagesize(void) { SYSTEM_INFO system_info;