From patchwork Fri Dec 21 16:05:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 207853 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 D41EC2C009B for ; Sat, 22 Dec 2012 04:06:12 +1100 (EST) Received: from localhost ([::1]:41988 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm630-0006Pm-OF for incoming@patchwork.ozlabs.org; Fri, 21 Dec 2012 12:06:10 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55497) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm57j-0006zP-Uj for qemu-devel@nongnu.org; Fri, 21 Dec 2012 11:07:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tm57h-0006vx-1J for qemu-devel@nongnu.org; Fri, 21 Dec 2012 11:06:59 -0500 Received: from mail-ie0-f180.google.com ([209.85.223.180]:40807) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm57g-0006vs-Tc for qemu-devel@nongnu.org; Fri, 21 Dec 2012 11:06:56 -0500 Received: by mail-ie0-f180.google.com with SMTP id c10so6366366ieb.39 for ; Fri, 21 Dec 2012 08:06:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=m+N905Qx8wpc9K9aSztX5EcAcfXsPGG1AR943x5jfDo=; b=vtBzYNXZVXwxgB62mvRMm9Mf25Wsf/sbERQVnj+WYP/WmAMnnkOIaet+bgk0jqBSrW Gy1GF9ZXw9QEoDG4k1GpE2pGL8EvwmDokOi5Ir3mskCaE8tgQHiBc005ZNX3OpoqSwWe jZj4D5QWeOPM+geG7yn1PyHHfCJgXEL7UYHgkdk5zYUBn/qdMu9u28aXB11aRJePXRYt 3lGdK9iKgfVH5h1KpHI/VP6I5VoqdlF6lnRTO7TC1ZOAMgLvAogQ3JwtP8PhJSJY0Dmw bZ5hbyJro2VKHGI8XqtPCDovlshH5YFN6y8Iz4TtJecUKl6Ohe/WSabgFFjM4nfjf73o dAxg== X-Received: by 10.50.152.240 with SMTP id vb16mr13580646igb.45.1356106016448; Fri, 21 Dec 2012 08:06:56 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-179-137.ip50.fastwebnet.it. [93.34.179.137]) by mx.google.com with ESMTPS id u4sm9757244igw.6.2012.12.21.08.06.54 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Dec 2012 08:06:56 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 21 Dec 2012 17:05:42 +0100 Message-Id: <1356105948-13216-22-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.0.2 In-Reply-To: <1356105948-13216-1-git-send-email-pbonzini@redhat.com> References: <1356105948-13216-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.223.180 Cc: alevy@redhat.com, vilanova@ac.upc.edu, afaerber@suse.de Subject: [Qemu-devel] [PATCH 21/27] build: move QAPI definitions for QEMU out of qapi-obj-y 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 There is no reason why for example qemu-ga should include all the definitions for the QEMU monitor. However, there are a few that are needed (qapi_free_SocketAddress, qapi_free_InetSocketAddress, ErrorClass_lookup). These should be moved to a separate "core" .json schema that goes into libqemuutil.a. For now, make this clearer by moving the qapi-*.o definitions out of libqemuutil.a. Once the above refactoring is done, qga-obj-y should not include anymore qapi-types.o and qapi-visit.o. Signed-off-by: Paolo Bonzini --- Makefile.objs | 6 ++++-- tests/Makefile | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index e16f0a3..30351ea 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -152,7 +152,6 @@ common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y) # qapi qapi-obj-y = qapi/ -qapi-obj-y += qapi-types.o qapi-visit.o common-obj-y += qmp-marshal.o qapi-visit.o qapi-types.o common-obj-y += qmp.o hmp.o @@ -166,11 +165,14 @@ universal-obj-y += qom/ universal-obj-y += disas/ universal-obj-y += $(trace-obj-y) universal-obj-y += $(qapi-obj-y) +universal-obj-y += qapi-types.o qapi-visit.o ###################################################################### # guest agent -qga-obj-y = qga/ +# FIXME: a few definitions from qapi-types.o/qapi-visit.o are needed +# by libqemuutil.a. These should be moved to a separate .json schema. +qga-obj-y = qga/ qapi-types.o qapi-visit.o vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) diff --git a/tests/Makefile b/tests/Makefile index 23718de..8cab3c3 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -70,7 +70,7 @@ tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visitor.o $(te tests/test-qmp-output-visitor$(EXESUF): tests/test-qmp-output-visitor.o $(test-qapi-obj-y) libqemuutil.a libqemustub.a tests/test-qmp-input-visitor$(EXESUF): tests/test-qmp-input-visitor.o $(test-qapi-obj-y) libqemuutil.a libqemustub.a tests/test-qmp-input-strict$(EXESUF): tests/test-qmp-input-strict.o $(test-qapi-obj-y) libqemuutil.a libqemustub.a -tests/test-qmp-commands$(EXESUF): tests/test-qmp-commands.o tests/test-qmp-marshal.o $(test-qapi-obj-y) libqemuutil.a libqemustub.a +tests/test-qmp-commands$(EXESUF): tests/test-qmp-commands.o tests/test-qmp-marshal.o $(test-qapi-obj-y) qapi-types.o qapi-visit.o libqemuutil.a libqemustub.a tests/test-visitor-serialization$(EXESUF): tests/test-visitor-serialization.o $(test-qapi-obj-y) libqemuutil.a libqemustub.a tests/rtc-test$(EXESUF): tests/rtc-test.o $(trace-obj-y)