From patchwork Mon Oct 29 18:07:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 195105 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 65E9E2C0097 for ; Tue, 30 Oct 2012 05:14:36 +1100 (EST) Received: from localhost ([::1]:54141 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TStlU-00048s-Kn for incoming@patchwork.ozlabs.org; Mon, 29 Oct 2012 14:08:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TStks-0002fl-K1 for qemu-devel@nongnu.org; Mon, 29 Oct 2012 14:08:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TStko-0005eu-Fx for qemu-devel@nongnu.org; Mon, 29 Oct 2012 14:08:06 -0400 Received: from mail-da0-f45.google.com ([209.85.210.45]:48867) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TStko-0005en-8y for qemu-devel@nongnu.org; Mon, 29 Oct 2012 14:08:02 -0400 Received: by mail-da0-f45.google.com with SMTP id n15so2388289dad.4 for ; Mon, 29 Oct 2012 11:08:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=4W7hoILGqC6Eql6K//r92/+8xYn8JqMzQw/ehAxzze0=; b=FViVoRT2TihCXqlWBU12BhhKjyb/SiDxQ8u8DhL2cgAOy/QEm+YJdztg64m0SsvTPm k+CkEiSW0XfGzMk3hibdXmkghExQ2jUeYF4F5E8Ofdp87DxU625FuMHRo/L1JUPlZ6d1 PFKWBr4vNd7QKhZ/z+ImtldbeU0ld9qWxlkiEWlouFHl/E6PXta1Xy5K0elZU0hhpN4E E10W4plUgS+iiNFpWdDpTr4LZND7CcBGcOVCkmNxqOfnU1bLdP/xVxkT97Sy644KX+nM ohEoBzW9Y0gqfWo/2NCvQhqRkR1Hj/9oUSKV7vfr7XtQ0TaDSQpZGecfqo8+8Kngqh4A uU3w== Received: by 10.68.218.226 with SMTP id pj2mr95872344pbc.33.1351534081647; Mon, 29 Oct 2012 11:08:01 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id vi9sm6327135pbc.41.2012.10.29.11.07.55 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 29 Oct 2012 11:07:59 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 29 Oct 2012 19:07:11 +0100 Message-Id: <1351534038-15503-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1351534038-15503-1-git-send-email-pbonzini@redhat.com> References: <1351534038-15503-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.45 Subject: [Qemu-devel] [PATCH 04/11] sockets: use weak aliases instead of qemu-tool.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qemu-tool.c has its own (largeish) set of dependencies. Weak aliases can be placed directly where people use them, and do not contribute to increasing the dependencies of generic utility files. Signed-off-by: Paolo Bonzini --- qemu-sockets.c | 7 +++++++ qemu-tool.c | 6 ------ 2 file modificati, 7 inserzioni(+), 6 rimozioni(-) diff --git a/qemu-sockets.c b/qemu-sockets.c index cfed9c5..225cd0c 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -967,3 +967,10 @@ int socket_init(void) #endif return 0; } + +static int default_monitor_get_fd(Monitor *mon, const char *name, Error **errp) +{ + error_setg(errp, "only QEMU supports file descriptor passing"); + return -1; +} +QEMU_WEAK_ALIAS(monitor_get_fd, default_monitor_get_fd); diff --git a/qemu-tool.c b/qemu-tool.c index da4c05a..f2f9813 100644 --- a/qemu-tool.c +++ b/qemu-tool.c @@ -38,12 +38,6 @@ const char *qemu_get_vm_name(void) Monitor *cur_mon; -int monitor_get_fd(Monitor *mon, const char *name, Error **errp) -{ - error_setg(errp, "only QEMU supports file descriptor passing"); - return -1; -} - void vm_stop(RunState state) { abort();