From patchwork Wed Apr 25 23:45:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Clark X-Patchwork-Id: 10364393 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4376E602DC for ; Wed, 25 Apr 2018 23:58:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3136028FC2 for ; Wed, 25 Apr 2018 23:58:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2304A29022; Wed, 25 Apr 2018 23:58:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9AE7E28FC2 for ; Wed, 25 Apr 2018 23:58:28 +0000 (UTC) Received: from localhost ([::1]:39602 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBUIt-0005j6-P9 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 25 Apr 2018 19:58:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBU8L-0004fa-H8 for qemu-devel@nongnu.org; Wed, 25 Apr 2018 19:47:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBU8K-0004tD-Lb for qemu-devel@nongnu.org; Wed, 25 Apr 2018 19:47:33 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:38999) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fBU8K-0004su-Fk for qemu-devel@nongnu.org; Wed, 25 Apr 2018 19:47:32 -0400 Received: by mail-pf0-x242.google.com with SMTP id z9so16591624pfe.6 for ; Wed, 25 Apr 2018 16:47:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BzoWDjqOkLr1gXTgXEqkRe19OYL1d4M1Ffyez2Cfl2s=; b=h7CeaqAEOaEDe1DZwafdlsoxrYzXpdN7XTWDitDalJCjc0uEk+Mi4RMWeddxyl5Sw5 WYetgGssmILfDVjN32wkfvAM4a3Kw4IjWo2CIr6BEmq1iCH9ZY8bcab8aYd4Y+20V2Iu O/+f8XFoRuCmJEarKTal9IkqjYM7NRhjvIPWbChMQJofBSLX+5W0c/9Or1YLRk6CXvKp P5JercltG6OhV9QZVUeVWJhKp+iuRUBmR/sOrZEKpd/JN9qF0upr6QR96xBcuIeVfZkg RsQ5AuKB0+WdrZqng93DSQdyMjDHM7tKxbkIU0eB2kqreQX8N/1dMCpAFQ/08dUonYAZ YRGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BzoWDjqOkLr1gXTgXEqkRe19OYL1d4M1Ffyez2Cfl2s=; b=UcurPLEWKswiJdSFTlhdzx3ZADjQh3Ay/JQE/41hbwsGVMVP8vaIkjT5xN2oJf8NCR 0aHFI1+r2raHm4pXa3kgl+9hoWdgJqlWnUQSecUh94M+Oz0IRxKNJO+/tEonoFP06sb+ uRyePpqAUx2qR1PFxUOt6GhY2pwKtQf36/Heg6cFEpjGSUevjq4wVYEfV0M0TrMwB/xe B5AS5p0gEyxoxd8kiZjxd/VzyqGBkHkqaB2pe20JSz0+UQuZA/vifQWNkrjc7HGzr6xg ek83ZOafihckO+sXQlcz1kDLmVSxQ1NGauKsp1ex5fj4bJT7uC9YruPODOkc+m+qwjy+ QUcQ== X-Gm-Message-State: ALQs6tDBVVJpvpRHzDsamYYCeI1I6Xi3iLsRasuzyRkVBrLzS9NA9h7l bqSHOxhNELRt2DbLHG6TgF0cdsHCkW8= X-Google-Smtp-Source: AIpwx494xz1Wo796JXUfhqP2pYH89ouyj7lk02bYruuiyuzzjzfId2t7wKXoR9V9c5MsO+Uodk+tCQ== X-Received: by 10.98.15.195 with SMTP id 64mr29511614pfp.63.1524700051404; Wed, 25 Apr 2018 16:47:31 -0700 (PDT) Received: from localhost.localdomain (122-58-167-38-fibre.bb.spark.co.nz. [122.58.167.38]) by smtp.gmail.com with ESMTPSA id e10sm29577549pfn.67.2018.04.25.16.47.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Apr 2018 16:47:30 -0700 (PDT) From: Michael Clark To: qemu-devel@nongnu.org Date: Thu, 26 Apr 2018 11:45:10 +1200 Message-Id: <1524699938-6764-8-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1524699938-6764-1-git-send-email-mjc@sifive.com> References: <1524699938-6764-1-git-send-email-mjc@sifive.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PATCH v8 07/35] RISC-V: Make some header guards more specific X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: patches@groups.riscv.org, Michael Clark , Palmer Dabbelt , Sagar Karandikar , Bastian Koppelmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Cc: Sagar Karandikar Cc: Bastian Koppelmann Signed-off-by: Michael Clark Signed-off-by: Palmer Dabbelt Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- include/hw/riscv/spike.h | 4 ++-- include/hw/riscv/virt.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/hw/riscv/spike.h b/include/hw/riscv/spike.h index 8410430..641b70d 100644 --- a/include/hw/riscv/spike.h +++ b/include/hw/riscv/spike.h @@ -16,8 +16,8 @@ * this program. If not, see . */ -#ifndef HW_SPIKE_H -#define HW_SPIKE_H +#ifndef HW_RISCV_SPIKE_H +#define HW_RISCV_SPIKE_H typedef struct { /*< private >*/ diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index b91a412..3a4f23e 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -16,8 +16,8 @@ * this program. If not, see . */ -#ifndef HW_VIRT_H -#define HW_VIRT_H +#ifndef HW_RISCV_VIRT_H +#define HW_RISCV_VIRT_H typedef struct { /*< private >*/