From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDeRv-00031D-EO for qemu-devel@nongnu.org; Mon, 17 Sep 2012 12:45:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDeRp-0000Bz-BH for qemu-devel@nongnu.org; Mon, 17 Sep 2012 12:45:31 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:40235) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDeRp-00007Z-4J for qemu-devel@nongnu.org; Mon, 17 Sep 2012 12:45:25 -0400 Received: by mail-pz0-f45.google.com with SMTP id n15so293267dad.4 for ; Mon, 17 Sep 2012 09:45:24 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 17 Sep 2012 18:44:55 +0200 Message-Id: <1347900303-24314-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1347900303-24314-1-git-send-email-pbonzini@redhat.com> References: <1347900303-24314-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1/9] tools: split monitor-dummy.c, clean up qemu-tool.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, afaerber@suse.de qemu-ga uses glib mostly, so it does not need a large part of the dummy functions in qemu-tool.o (which are more related to the main loop and/or the block layer). Split the functions required by QAPI out into monitor-dummy.c. Signed-off-by: Paolo Bonzini --- Makefile | 2 +- Makefile.objs | 2 +- monitor-dummy.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ qemu-tool.c | 54 ------------------------------------------------ 4 file modificati, 66 inserzioni(+), 56 rimozioni(-) create mode 100644 monitor-dummy.c diff --git a/Makefile b/Makefile index 1cd5bc8..6426d85 100644 --- a/Makefile +++ b/Makefile @@ -153,7 +153,7 @@ endif qemu-img.o: qemu-img-cmds.h tools-obj-y = $(oslib-obj-y) $(trace-obj-y) qemu-tool.o qemu-timer.o \ - qemu-timer-common.o main-loop.o notify.o \ + qemu-timer-common.o main-loop.o notify.o monitor-dummy.o \ iohandler.o cutils.o iov.o async.o tools-obj-$(CONFIG_POSIX) += compatfd.o diff --git a/Makefile.objs b/Makefile.objs index 4412757..5c622d6 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -228,7 +228,7 @@ universal-obj-y += $(qapi-obj-y) ###################################################################### # guest agent -qga-obj-y = qga/ qemu-ga.o module.o +qga-obj-y = qga/ qemu-ga.o module.o monitor-dummy.o qga-obj-$(CONFIG_WIN32) += oslib-win32.o qga-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-sockets.o qemu-option.o diff --git a/monitor-dummy.c b/monitor-dummy.c new file mode 100644 index 0000000..9aa87b3 --- /dev/null +++ b/monitor-dummy.c @@ -0,0 +1,64 @@ +/* + * Compatibility for qemu-img/qemu-nbd + * + * Copyright IBM, Corp. 2008 + * + * Authors: + * Anthony Liguori + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + * Contributions after 2012-01-13 are licensed under the terms of the + * GNU GPL, version 2 or (at your option) any later version. + */ + +#include "qemu-common.h" +#include "monitor.h" + +Monitor *cur_mon; + +int monitor_cur_is_qmp(void) +{ + return 0; +} + +void monitor_set_error(Monitor *mon, QError *qerror) +{ +} + +void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap) +{ +} + +void monitor_printf(Monitor *mon, const char *fmt, ...) +{ +} + +void monitor_print_filename(Monitor *mon, const char *filename) +{ +} + +void monitor_protocol_event(MonitorEvent event, QObject *data) +{ +} + +int monitor_fdset_get_fd(int64_t fdset_id, int flags) +{ + return -1; +} + +int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd) +{ + return -1; +} + +int monitor_fdset_dup_fd_remove(int dup_fd) +{ + return -1; +} + +int monitor_fdset_dup_fd_find(int dup_fd) +{ + return -1; +} diff --git a/qemu-tool.c b/qemu-tool.c index 18205ba..ec5a659 100644 --- a/qemu-tool.c +++ b/qemu-tool.c @@ -14,7 +14,6 @@ */ #include "qemu-common.h" -#include "monitor.h" #include "qemu-timer.h" #include "qemu-log.h" #include "migration.h" @@ -24,64 +23,11 @@ #include -struct QEMUBH -{ - QEMUBHFunc *cb; - void *opaque; -}; - const char *qemu_get_vm_name(void) { return NULL; } -Monitor *cur_mon; - -int monitor_cur_is_qmp(void) -{ - return 0; -} - -void monitor_set_error(Monitor *mon, QError *qerror) -{ -} - -void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap) -{ -} - -void monitor_printf(Monitor *mon, const char *fmt, ...) -{ -} - -void monitor_print_filename(Monitor *mon, const char *filename) -{ -} - -void monitor_protocol_event(MonitorEvent event, QObject *data) -{ -} - -int monitor_fdset_get_fd(int64_t fdset_id, int flags) -{ - return -1; -} - -int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd) -{ - return -1; -} - -int monitor_fdset_dup_fd_remove(int dup_fd) -{ - return -1; -} - -int monitor_fdset_dup_fd_find(int dup_fd) -{ - return -1; -} - int64_t cpu_get_clock(void) { return qemu_get_clock_ns(rt_clock); -- 1.7.12