From patchwork Thu Dec 6 13:06:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 204259 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 2F0412C00D2 for ; Fri, 7 Dec 2012 01:52:50 +1100 (EST) Received: from localhost ([::1]:46115 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgbC7-000598-3p for incoming@patchwork.ozlabs.org; Thu, 06 Dec 2012 08:08:51 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38964) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgbBr-0004gk-9y for qemu-devel@nongnu.org; Thu, 06 Dec 2012 08:08:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TgbBk-00057R-IZ for qemu-devel@nongnu.org; Thu, 06 Dec 2012 08:08:35 -0500 Received: from mail-ie0-f177.google.com ([209.85.223.177]:56347) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgbBk-00057M-D8 for qemu-devel@nongnu.org; Thu, 06 Dec 2012 08:08:28 -0500 Received: by mail-ie0-f177.google.com with SMTP id k13so12479965iea.22 for ; Thu, 06 Dec 2012 05:08:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=td5pzpu1n/MbK4TK9YBHmDFhn1geR/ONMnO98xrS3fQ=; b=amP8qGgVyTudKokVQDj1KDHdh7zZvMBzXZo8hXRORsCiKsXmjstW1XLhDJlRnZ8lac CIO/6+AAl1Ai1MZlsntI83g8Hb4CXO0My6cxxCKRa8CUMlK3+3K0AZIPmZdSzDpDzWHr uWhuR/YmW+ZPSvRvzeYDwu5OlESXYFZ+fUpKS0QHF8P6bJ5YXficV5lOL5HHaW7IRbPd hhm/JRPzdEjHP7U7hxbjxhfKK/A5DCUY4g3ygRwHfpuiRJ5qtqOBSQzMA953FvJ/RzL/ 7jRpkil+vOGjf3HAdfhdCOcTJExFDH7VUIsjfKb8v0Zbn4lHNezXK78NgHPuXUyeRD1q QpPw== Received: by 10.50.85.170 with SMTP id i10mr1319279igz.14.1354799307959; Thu, 06 Dec 2012 05:08:27 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-219-150.ip51.fastwebnet.it. [93.34.219.150]) by mx.google.com with ESMTPS id wm10sm15431723igc.2.2012.12.06.05.08.24 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 06 Dec 2012 05:08:26 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 6 Dec 2012 14:06:56 +0100 Message-Id: <1354799230-30904-19-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1354799230-30904-1-git-send-email-pbonzini@redhat.com> References: <1354799230-30904-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.177 Cc: aliguori@us.ibm.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 18/32] qapi: remove qapi/qapi-types-core.h 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 The file is only including error.h and qerror.h. Prefer explicit inclusion of whatever files are needed. Signed-off-by: Paolo Bonzini --- qapi/opts-visitor.c | 1 + qapi/qapi-dealloc-visitor.c | 1 + qapi/qapi-types-core.h | 20 -------------------- qapi/qapi-visit-core.c | 1 + qapi/qapi-visit-core.h | 2 +- qapi/qapi-visit-impl.h | 2 +- qemu-option-internal.h | 1 + qom/object.c | 1 + scripts/qapi-commands.py | 2 ++ target-i386/cpu.c | 1 + 10 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 qapi/qapi-types-core.h diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c index e3fd254..6ccb8a1 100644 --- a/qapi/opts-visitor.c +++ b/qapi/opts-visitor.c @@ -11,6 +11,7 @@ */ #include "qemu-common.h" +#include "qerror.h" #include "opts-visitor.h" #include "qemu-queue.h" #include "qemu-option-internal.h" diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c index 75214e7..7c44042 100644 --- a/qapi/qapi-dealloc-visitor.c +++ b/qapi/qapi-dealloc-visitor.c @@ -15,6 +15,7 @@ #include "qemu-queue.h" #include "qemu-common.h" #include "qemu-objects.h" +#include "qapi-visit-impl.h" typedef struct StackEntry { diff --git a/qapi/qapi-types-core.h b/qapi/qapi-types-core.h deleted file mode 100644 index 831df21..0000000 --- a/qapi/qapi-types-core.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Core Definitions for QAPI-generated Types - * - * Copyright IBM, Corp. 2011 - * - * Authors: - * Anthony Liguori - * - * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. - * See the COPYING.LIB file in the top-level directory. - * - */ - -#ifndef QAPI_TYPES_CORE_H -#define QAPI_TYPES_CORE_H - -#include "error.h" -#include "qerror.h" - -#endif diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index 3002939..4649fb7 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -12,6 +12,7 @@ */ #include "qemu-common.h" +#include "qerror.h" #include "qapi/qapi-visit-core.h" #include "qapi/qapi-visit-impl.h" diff --git a/qapi/qapi-visit-core.h b/qapi/qapi-visit-core.h index 60aceda..00ce678 100644 --- a/qapi/qapi-visit-core.h +++ b/qapi/qapi-visit-core.h @@ -13,7 +13,7 @@ #ifndef QAPI_VISITOR_CORE_H #define QAPI_VISITOR_CORE_H -#include "qapi/qapi-types-core.h" +#include "error.h" #include typedef struct GenericList diff --git a/qapi/qapi-visit-impl.h b/qapi/qapi-visit-impl.h index 0f3a189..efd4271 100644 --- a/qapi/qapi-visit-impl.h +++ b/qapi/qapi-visit-impl.h @@ -12,7 +12,7 @@ #ifndef QAPI_VISITOR_IMPL_H #define QAPI_VISITOR_IMPL_H -#include "qapi/qapi-types-core.h" +#include "error.h" #include "qapi/qapi-visit-core.h" void input_type_enum(Visitor *v, int *obj, const char *strings[], diff --git a/qemu-option-internal.h b/qemu-option-internal.h index 19fdc1c..77899b0 100644 --- a/qemu-option-internal.h +++ b/qemu-option-internal.h @@ -27,6 +27,7 @@ #define QEMU_OPTIONS_INTERNAL_H #include "qemu-option.h" +#include "qemu-error.h" struct QemuOpt { const char *name; diff --git a/qom/object.c b/qom/object.c index 0739aa2..8d3036d 100644 --- a/qom/object.c +++ b/qom/object.c @@ -15,6 +15,7 @@ #include "qapi/qapi-visit-core.h" #include "qapi/string-input-visitor.h" #include "qapi/string-output-visitor.h" +#include "qerror.h" /* TODO: replace QObject with a simpler visitor to avoid a dependency * of the QOM core on QObject? */ diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index 2db0bf1..5d034c2 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -367,6 +367,8 @@ def gen_command_def_prologue(prefix="", proxy=False): */ #include "qemu-common.h" +#include "module.h" +#include "qerror.h" #include "qemu-objects.h" #include "qapi/qmp-core.h" #include "qapi/qapi-visit-core.h" diff --git a/target-i386/cpu.c b/target-i386/cpu.c index f56aa0d..52f5e5e 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -26,6 +26,7 @@ #include "qemu-option.h" #include "qemu-config.h" +#include "qerror.h" #include "qapi/qapi-visit-core.h" #include "arch_init.h"