From patchwork Thu Sep 12 09:15:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 274477 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AABDE2C0368 for ; Thu, 12 Sep 2013 19:18:10 +1000 (EST) Received: from localhost ([::1]:40447 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VK32O-00029q-Gg for incoming@patchwork.ozlabs.org; Thu, 12 Sep 2013 05:18:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VK300-0007Id-Jf for qemu-devel@nongnu.org; Thu, 12 Sep 2013 05:15:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VK2zs-0003kG-0Y for qemu-devel@nongnu.org; Thu, 12 Sep 2013 05:15:40 -0400 Received: from e28smtp09.in.ibm.com ([122.248.162.9]:54920) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VK2zr-0003k4-AW for qemu-devel@nongnu.org; Thu, 12 Sep 2013 05:15:31 -0400 Received: from /spool/local by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 12 Sep 2013 14:39:05 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp09.in.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 12 Sep 2013 14:39:03 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 970FD125805F for ; Thu, 12 Sep 2013 14:45:29 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r8C9FOUw45547648 for ; Thu, 12 Sep 2013 14:45:24 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r8C9FPAL008306 for ; Thu, 12 Sep 2013 14:45:26 +0530 Received: from RH64wenchao ([9.181.129.59]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id r8C9FDVm007408; Thu, 12 Sep 2013 14:45:24 +0530 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Thu, 12 Sep 2013 17:15:12 +0800 Message-Id: <1378977312-17696-9-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1378977312-17696-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1378977312-17696-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13091209-2674-0000-0000-00000A9E5ADD X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.9 Cc: kwolf@redhat.com, pbonzini@redhat.com, anthony@codemonkey.ws, stefanha@redhat.com, Wenchao Xia Subject: [Qemu-devel] [RFC PATCH 8/8] stubs: remove mon-protocol-event.o in stub obj 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 Now block layer do not use this symbol now, so qemg-img, qemu-io and qemu-nbd do not link with this file any more. The test program tests/test-qdev-global-props still need it, so add this obj in rule of test/Makefile, and keeps the c file now. Signed-off-by: Wenchao Xia --- stubs/Makefile.objs | 1 - tests/Makefile | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index f306cba..6fe1e3f 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -15,7 +15,6 @@ stub-obj-y += migr-blocker.o stub-obj-y += mon-is-qmp.o stub-obj-y += mon-printf.o stub-obj-y += mon-print-filename.o -stub-obj-y += mon-protocol-event.o stub-obj-y += mon-set-error.o stub-obj-y += pci-drive-hot-add.o stub-obj-y += reset.o diff --git a/tests/Makefile b/tests/Makefile index c13fefc..7d3ee3b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -134,7 +134,8 @@ tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \ hw/core/irq.o \ qom/object.o qom/container.o qom/qom-qobject.o \ $(test-qapi-obj-y) \ - libqemuutil.a libqemustub.a + libqemuutil.a libqemustub.a \ + stubs/mon-protocol-event.o tests/test-qapi-types.c tests/test-qapi-types.h :\ $(SRC_PATH)/tests/qapi-schema/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py