From patchwork Tue Jan 27 13:14:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 433526 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0AD6E1400DE for ; Wed, 28 Jan 2015 01:49:20 +1100 (AEDT) Received: from localhost ([::1]:47849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YG7SA-0004vf-B8 for incoming@patchwork.ozlabs.org; Tue, 27 Jan 2015 09:49:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YG5yS-0004o0-05 for qemu-devel@nongnu.org; Tue, 27 Jan 2015 08:14:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YG5yR-0008OM-2d for qemu-devel@nongnu.org; Tue, 27 Jan 2015 08:14:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34458) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YG5yQ-0008OA-Re for qemu-devel@nongnu.org; Tue, 27 Jan 2015 08:14:31 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0RDEPvM003054 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 27 Jan 2015 08:14:26 -0500 Received: from redhat.com (ovpn-116-122.ams2.redhat.com [10.36.116.122]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id t0RDEMRk015512; Tue, 27 Jan 2015 08:14:23 -0500 Date: Tue, 27 Jan 2015 15:14:22 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1422364369-8667-11-git-send-email-mst@redhat.com> References: <1422364369-8667-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1422364369-8667-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell , Juan Quintela , dgilbert@redhat.com, Anthony Liguori , Paolo Bonzini , Richard Henderson Subject: [Qemu-devel] [PULL 10/16] bios-linker-loader: move header to common location 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 Will be usable by MIPS, ARM. Signed-off-by: Michael S. Tsirkin --- {hw/i386 => include/hw/acpi}/bios-linker-loader.h | 0 hw/i386/acpi-build.c | 2 +- hw/i386/bios-linker-loader.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename {hw/i386 => include/hw/acpi}/bios-linker-loader.h (100%) diff --git a/hw/i386/bios-linker-loader.h b/include/hw/acpi/bios-linker-loader.h similarity index 100% rename from hw/i386/bios-linker-loader.h rename to include/hw/acpi/bios-linker-loader.h diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 2f1daf7..4944249 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -36,7 +36,7 @@ #include "hw/i386/acpi-defs.h" #include "hw/acpi/acpi.h" #include "hw/nvram/fw_cfg.h" -#include "bios-linker-loader.h" +#include "hw/acpi/bios-linker-loader.h" #include "hw/loader.h" #include "hw/isa/isa.h" #include "hw/acpi/memory_hotplug.h" diff --git a/hw/i386/bios-linker-loader.c b/hw/i386/bios-linker-loader.c index aa56184..5cc4d90 100644 --- a/hw/i386/bios-linker-loader.c +++ b/hw/i386/bios-linker-loader.c @@ -19,7 +19,7 @@ */ #include "qemu-common.h" -#include "bios-linker-loader.h" +#include "hw/acpi/bios-linker-loader.h" #include "hw/nvram/fw_cfg.h" #include "qemu/bswap.h"