From patchwork Mon May 11 12:47:00 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: 48276 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 902C12121F for ; Mon, 11 May 2015 12:48:26 +0000 (UTC) Received: by wiun10 with SMTP id n10sf25545562wiu.1 for ; Mon, 11 May 2015 05:48:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:date:from:to:message-id:references :mime-version:content-type:content-disposition:in-reply-to:cc :subject:precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=YboeKYnrIB3IVu+0Bmo2xvPZoN1Upuw05gYj9qqkCD8=; b=bCyPt7hWcpoeKkwcAE84w2D1pCAuT5YRYPuSFsYTMS8NFsyyfkUQEbmWmpqAieJYBA S9BmMiXNpY/5oflyz8S8LF5fhnoo0F8tzX5kjI9l/6mWZs5tJWBY10vdM7jJTspfdpWg U8zoSfzUYrYOdrsEmEOnShThydJyCCXIjkPs56yhfOpmcnKy5Ir/6puplOMst+qV9omU sY4+xAE7XhuzeNZT1hZX8NeRGvuyJv7Lusg2rLA4zndjze1nBlffLhjt6krMxamIROSn Ak7fsYEZsbJV1ayNieZv/SNH0h7hvb7VJBt3rFPTR9abFuL6cVz9Zk46G3k5ht3QR0WA pwUw== X-Gm-Message-State: ALoCoQkx/qa5VQSabjvcrMch/3v6snB7nRQSL/M1kvLIMFPl34jU0ZAzIGpjuxMHNndzLj2GmSHR X-Received: by 10.112.29.39 with SMTP id g7mr7353676lbh.1.1431348505915; Mon, 11 May 2015 05:48:25 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.178.164 with SMTP id cz4ls663225lac.3.gmail; Mon, 11 May 2015 05:48:25 -0700 (PDT) X-Received: by 10.153.11.163 with SMTP id ej3mr7895840lad.105.1431348505744; Mon, 11 May 2015 05:48:25 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id pd4si8316530lbc.40.2015.05.11.05.48.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 May 2015 05:48:25 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by layy10 with SMTP id y10so92273401lay.0 for ; Mon, 11 May 2015 05:48:25 -0700 (PDT) X-Received: by 10.112.198.74 with SMTP id ja10mr8014059lbc.19.1431348505633; Mon, 11 May 2015 05:48:25 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1485317lbb; Mon, 11 May 2015 05:48:24 -0700 (PDT) X-Received: by 10.229.185.136 with SMTP id co8mr13711816qcb.16.1431348503782; Mon, 11 May 2015 05:48:23 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 7si12820134qhv.107.2015.05.11.05.48.22 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 11 May 2015 05:48:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:37037 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yrn8A-0002Ap-NP for patch@linaro.org; Mon, 11 May 2015 08:48:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yrn74-000123-0x for qemu-devel@nongnu.org; Mon, 11 May 2015 08:47:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yrn72-0001yY-Sd for qemu-devel@nongnu.org; Mon, 11 May 2015 08:47:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40710) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yrn72-0001yF-L1 for qemu-devel@nongnu.org; Mon, 11 May 2015 08:47:12 -0400 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 t4BCl3XI012492 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 11 May 2015 08:47:03 -0400 Received: from redhat.com (ovpn-116-50.ams2.redhat.com [10.36.116.50]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id t4BCl0NM008265; Mon, 11 May 2015 08:47:01 -0400 Date: Mon, 11 May 2015 14:47:00 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1431329108-2605-3-git-send-email-mst@redhat.com> References: <1431329108-2605-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1431329108-2605-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 , Alvise Rigo , Shannon Zhao , Shannon Zhao , Paolo Bonzini , Richard Henderson Subject: [Qemu-devel] [PULL 02/28] hw/i386: Move ACPI header definitions in an arch-independent 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mst@redhat.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Shannon Zhao The ACPI related header file acpi-defs.h, includes definitions that apply on other architectures as well. Move it in `include/hw/acpi/` to sanely include it from other architectures. Signed-off-by: Alvise Rigo Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- {hw/i386 => include/hw/acpi}/acpi-defs.h | 0 hw/i386/acpi-build.c | 2 +- tests/bios-tables-test.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename {hw/i386 => include/hw/acpi}/acpi-defs.h (100%) diff --git a/hw/i386/acpi-defs.h b/include/hw/acpi/acpi-defs.h similarity index 100% rename from hw/i386/acpi-defs.h rename to include/hw/acpi/acpi-defs.h diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 1cfe265..c6c0b72 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -33,7 +33,7 @@ #include "hw/i386/pc.h" #include "target-i386/cpu.h" #include "hw/timer/hpet.h" -#include "hw/i386/acpi-defs.h" +#include "hw/acpi/acpi-defs.h" #include "hw/acpi/acpi.h" #include "hw/nvram/fw_cfg.h" #include "hw/acpi/bios-linker-loader.h" diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 735ac61..7e85dc4 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -17,7 +17,7 @@ #include "qemu-common.h" #include "libqtest.h" #include "qemu/compiler.h" -#include "hw/i386/acpi-defs.h" +#include "hw/acpi/acpi-defs.h" #include "hw/i386/smbios.h" #include "qemu/bitmap.h"