From patchwork Wed Mar 17 17:56:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 47966 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 05859B7D2A for ; Thu, 18 Mar 2010 05:59:24 +1100 (EST) Received: from localhost ([127.0.0.1]:53624 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NryPC-0003vC-Nw for incoming@patchwork.ozlabs.org; Wed, 17 Mar 2010 14:55:46 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NrxUS-0000WL-R4 for qemu-devel@nongnu.org; Wed, 17 Mar 2010 13:57:09 -0400 Received: from [199.232.76.173] (port=55478 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NrxUP-0000T7-FD for qemu-devel@nongnu.org; Wed, 17 Mar 2010 13:57:05 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NrxUK-0007m1-23 for qemu-devel@nongnu.org; Wed, 17 Mar 2010 13:57:04 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:44965) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NrxUJ-0007lR-Cb for qemu-devel@nongnu.org; Wed, 17 Mar 2010 13:56:59 -0400 Received: from blackfin.pond.sub.org (pD9E398E1.dip.t-dialin.net [217.227.152.225]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 8C568276DB4 for ; Wed, 17 Mar 2010 18:56:55 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id EC01180; Wed, 17 Mar 2010 18:56:54 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 17 Mar 2010 18:56:53 +0100 Message-Id: <1268848614-6844-6-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1268848614-6844-1-git-send-email-armbru@redhat.com> References: <1268848614-6844-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 5/6] error: Link qemu-img, qemu-nbd, qemu-io with qemu-error.o X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The location tracking interface is used by code shared with qemi-img, qemu-nbd and qemu-io, so it needs to be available there. Commit 827b0813 provides it in a rather hamfisted way: it adds a dummy implementation to qemu-tool.c. It's cleaner to provide the real thing, and put a few more dummy monitor functions into qemu-tool.c. Signed-off-by: Markus Armbruster --- Makefile | 6 +++--- qemu-tool.c | 50 ++++++++++++++++---------------------------------- 2 files changed, 19 insertions(+), 37 deletions(-) diff --git a/Makefile b/Makefile index 2066c12..aad361e 100644 --- a/Makefile +++ b/Makefile @@ -129,11 +129,11 @@ bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS) qemu-img.o: qemu-img-cmds.h qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o: $(GENERATED_HEADERS) -qemu-img$(EXESUF): qemu-img.o qemu-tool.o $(block-obj-y) $(qobject-obj-y) +qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(block-obj-y) $(qobject-obj-y) -qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o $(block-obj-y) $(qobject-obj-y) +qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(block-obj-y) $(qobject-obj-y) -qemu-io$(EXESUF): qemu-io.o qemu-tool.o cmd.o $(block-obj-y) $(qobject-obj-y) +qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(block-obj-y) $(qobject-obj-y) qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $@") diff --git a/qemu-tool.c b/qemu-tool.c index 97ca949..8d6d0ef 100644 --- a/qemu-tool.c +++ b/qemu-tool.c @@ -15,7 +15,6 @@ #include "monitor.h" #include "qemu-timer.h" #include "qemu-log.h" -#include "qemu-error.h" #include @@ -33,6 +32,22 @@ void qemu_service_io(void) { } +Monitor *cur_mon; + +int monitor_cur_is_qmp(void) +{ + return 0; +} + +void monitor_set_error(Monitor *mon, QError *qerror) +{ + assert(0); +} + +void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap) +{ +} + void monitor_printf(Monitor *mon, const char *fmt, ...) { } @@ -103,36 +118,3 @@ int64_t qemu_get_clock(QEMUClock *clock) qemu_gettimeofday(&tv); return (tv.tv_sec * 1000000000LL + (tv.tv_usec * 1000)) / 1000000; } - -Location *loc_push_restore(Location *loc) -{ - return loc; -} - -Location *loc_push_none(Location *loc) -{ - return loc; -} - -Location *loc_pop(Location *loc) -{ - return loc; -} - -Location *loc_save(Location *loc) -{ - return loc; -} - -void loc_restore(Location *loc) -{ -} - -void error_report(const char *fmt, ...) -{ - va_list args; - - va_start(args, fmt); - vfprintf(stderr, fmt, args); - va_end(args); -}