From patchwork Mon Feb 1 14:18:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Llu=C3=ADs_Vilanova?= X-Patchwork-Id: 8180021 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 94FB8BEEE5 for ; Mon, 1 Feb 2016 14:20:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E2E502020F for ; Mon, 1 Feb 2016 14:20:53 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 2736E2015A for ; Mon, 1 Feb 2016 14:20:53 +0000 (UTC) Received: from localhost ([::1]:52690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQFLY-0007zb-H3 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 01 Feb 2016 09:20:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58236) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQFJr-0005Uf-MN for qemu-devel@nongnu.org; Mon, 01 Feb 2016 09:19:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQFJo-0000eQ-Fm for qemu-devel@nongnu.org; Mon, 01 Feb 2016 09:19:07 -0500 Received: from roura.ac.upc.edu ([147.83.33.10]:60016 helo=roura.ac.upc.es) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQFJo-0000eG-3x for qemu-devel@nongnu.org; Mon, 01 Feb 2016 09:19:04 -0500 Received: from gw-3.ac.upc.es (gw-3.ac.upc.es [147.83.30.9]) by roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id u11EIxaW005866; Mon, 1 Feb 2016 15:18:59 +0100 Received: from localhost (unknown [84.88.51.85]) by gw-3.ac.upc.es (Postfix) with ESMTPSA id C80739B; Mon, 1 Feb 2016 15:18:59 +0100 (CET) From: =?utf-8?b?TGx1w61z?= Vilanova To: qemu-devel@nongnu.org Date: Mon, 1 Feb 2016 15:18:59 +0100 Message-Id: <145433633928.1640.17568234812071127997.stgit@localhost> X-Mailer: git-send-email 2.7.0.rc3 In-Reply-To: <145433632525.1640.17641977349086897078.stgit@localhost> References: <145433632525.1640.17641977349086897078.stgit@localhost> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by roura.ac.upc.es id u11EIxaW005866 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 147.83.33.10 Cc: Blue Swirl , Peter Maydell Subject: [Qemu-devel] [PATCH v2 2/2] build: [bsd-user] Rename all "syscall.h" in target directories to "target_syscall.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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This fixes double-definitions in bsd-user builds when using the UST tracing backend (which indirectly includes the system's "syscall.h"). Signed-off-by: Lluís Vilanova Reviewed-by: Peter Maydell --- bsd-user/i386/target_syscall.h | 4 ++++ bsd-user/qemu.h | 2 +- bsd-user/sparc/target_syscall.h | 5 +++++ bsd-user/sparc64/target_syscall.h | 5 +++++ bsd-user/x86_64/target_syscall.h | 5 +++++ 5 files changed, 20 insertions(+), 1 deletion(-) rename bsd-user/i386/{syscall.h => target_syscall.h} (97%) rename bsd-user/sparc/{syscall.h => target_syscall.h} (62%) rename bsd-user/sparc64/{syscall.h => target_syscall.h} (66%) rename bsd-user/x86_64/{syscall.h => target_syscall.h} (97%) diff --git a/bsd-user/i386/syscall.h b/bsd-user/i386/target_syscall.h similarity index 97% rename from bsd-user/i386/syscall.h rename to bsd-user/i386/target_syscall.h index 9b34c61..82d1c58 100644 --- a/bsd-user/i386/syscall.h +++ b/bsd-user/i386/target_syscall.h @@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H + /* default linux values for the selectors */ #define __USER_CS (0x23) #define __USER_DS (0x2B) @@ -159,3 +162,4 @@ struct target_vm86plus_struct { #define UNAME_MACHINE "i386" +#endif /* TARGET_SYSCALL_H */ diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 735cb40..1a361df 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -38,7 +38,7 @@ enum BSDType { extern enum BSDType bsd_type; #include "syscall_defs.h" -#include "syscall.h" +#include "target_syscall.h" #include "target_signal.h" #include "exec/gdbstub.h" diff --git a/bsd-user/sparc/syscall.h b/bsd-user/sparc/target_syscall.h similarity index 62% rename from bsd-user/sparc/syscall.h rename to bsd-user/sparc/target_syscall.h index 5a9bb7e..c7eec6b 100644 --- a/bsd-user/sparc/syscall.h +++ b/bsd-user/sparc/target_syscall.h @@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H + struct target_pt_regs { abi_ulong psr; abi_ulong pc; @@ -7,3 +10,5 @@ struct target_pt_regs { }; #define UNAME_MACHINE "sun4" + +#endif /* TARGET_SYSCALL_H */ diff --git a/bsd-user/sparc64/syscall.h b/bsd-user/sparc64/target_syscall.h similarity index 66% rename from bsd-user/sparc64/syscall.h rename to bsd-user/sparc64/target_syscall.h index 81a816d..2f06100 100644 --- a/bsd-user/sparc64/syscall.h +++ b/bsd-user/sparc64/target_syscall.h @@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H + struct target_pt_regs { abi_ulong u_regs[16]; abi_ulong tstate; @@ -8,3 +11,5 @@ struct target_pt_regs { }; #define UNAME_MACHINE "sun4u" + +#endif /* TARGET_SYSCALL_H */ diff --git a/bsd-user/x86_64/syscall.h b/bsd-user/x86_64/target_syscall.h similarity index 97% rename from bsd-user/x86_64/syscall.h rename to bsd-user/x86_64/target_syscall.h index 630514a..85a9766 100644 --- a/bsd-user/x86_64/syscall.h +++ b/bsd-user/x86_64/target_syscall.h @@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H + #define __USER_CS (0x33) #define __USER_DS (0x2B) @@ -114,3 +117,5 @@ struct target_msqid64_ds { #define TARGET_ARCH_SET_FS 0x1002 #define TARGET_ARCH_GET_FS 0x1003 #define TARGET_ARCH_GET_GS 0x1004 + +#endif /* TARGET_SYSCALL_H */