From patchwork Thu Oct 27 19:02:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 122237 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5B724B6F89 for ; Fri, 28 Oct 2011 06:39:23 +1100 (EST) Received: from localhost ([::1]:35486 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJVnM-0004Bh-Fl for incoming@patchwork.ozlabs.org; Thu, 27 Oct 2011 15:39:20 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJVEZ-0005KP-Ux for qemu-devel@nongnu.org; Thu, 27 Oct 2011 15:03:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RJVEX-00029R-BZ for qemu-devel@nongnu.org; Thu, 27 Oct 2011 15:03:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2281) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJVEX-00029A-06 for qemu-devel@nongnu.org; Thu, 27 Oct 2011 15:03:21 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9RJ2vmu030611 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 27 Oct 2011 15:02:58 -0400 Received: from localhost (ovpn-113-103.phx2.redhat.com [10.3.113.103]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p9RJ2uKC028056; Thu, 27 Oct 2011 15:02:57 -0400 From: Luiz Capitulino To: aliguori@us.ibm.com Date: Thu, 27 Oct 2011 17:02:16 -0200 Message-Id: <1319742136-8691-20-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1319742136-8691-1-git-send-email-lcapitulino@redhat.com> References: <1319742136-8691-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Cc: mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 19/19] Drop qemu-objects.h from modules that don't require it 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 Previous commits dropped most qobjects usage from qemu modules (now they are a low level interface used by the QAPI). However, some modules still include the qemu-objects.h header file. This commit drops qemu-objects.h from some of those modules and includes qjson.h instead, which is what they actually need. Signed-off-by: Luiz Capitulino --- block.c | 2 +- error.c | 3 ++- vl.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c index 551aa80..b5c1544 100644 --- a/block.c +++ b/block.c @@ -27,7 +27,7 @@ #include "monitor.h" #include "block_int.h" #include "module.h" -#include "qemu-objects.h" +#include "qjson.h" #include "qemu-coroutine.h" #include "qmp-commands.h" diff --git a/error.c b/error.c index 68c0039..990050f 100644 --- a/error.c +++ b/error.c @@ -12,8 +12,9 @@ #include "qemu-common.h" #include "error.h" +#include "qjson.h" +#include "qdict.h" #include "error_int.h" -#include "qemu-objects.h" #include "qerror.h" struct Error diff --git a/vl.c b/vl.c index 1ddb17b..fb28ffc 100644 --- a/vl.c +++ b/vl.c @@ -143,9 +143,9 @@ int main(int argc, char **argv) #include "audio/audio.h" #include "migration.h" #include "kvm.h" +#include "qjson.h" #include "qemu-option.h" #include "qemu-config.h" -#include "qemu-objects.h" #include "qemu-options.h" #include "qmp-commands.h" #include "main-loop.h"