From patchwork Tue Oct 3 13:45:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 820889 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hWjyc6sG"; dkim-atps=neutral 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 3y60kn1g0mz9t2Z for ; Wed, 4 Oct 2017 00:49:21 +1100 (AEDT) Received: from localhost ([::1]:58662 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzNZX-0004Bt-7z for incoming@patchwork.ozlabs.org; Tue, 03 Oct 2017 09:49:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzNWc-0001yK-8l for qemu-devel@nongnu.org; Tue, 03 Oct 2017 09:46:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dzNWW-00040a-Ll for qemu-devel@nongnu.org; Tue, 03 Oct 2017 09:46:18 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:49906) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dzNWW-0003yq-FG for qemu-devel@nongnu.org; Tue, 03 Oct 2017 09:46:12 -0400 Received: by mail-wm0-x243.google.com with SMTP id b189so12949596wmd.4 for ; Tue, 03 Oct 2017 06:46:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=sopavv89tFt0+qMreJXUtNjuoit7R3aar+KsY+GrKLo=; b=hWjyc6sGNaEX0FqPrhuezDINO7sFUHfIX1aSSyfBJCUJ0ReVOgUJ0edtZ0ksrfNsHB F0tfZZv67nQ3VnJdE1GlUJFYePh3fX31N/mnjWxVurRUcTo7w/BdEQOnu9U6XS7ZgC25 innDMaioIyQky6NirUNAc098sYirq+48cyUfEGx7cm7WP8KghKPnNMGzhJ1y/bZwEc6K 8oyK6cPgyrxt/SPLx0rlYLGdGkEfWe1HEH0lC9sbr77Zmz9l3FI2tg+Szb6kD8t4wOfT q12wdJYtoMmmf/GPZn+EosEGZRfLIvbUBDLXfplEQh+8y1YtG5DkBmUAtaLW7Uwm02jk xG/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=sopavv89tFt0+qMreJXUtNjuoit7R3aar+KsY+GrKLo=; b=dY3s3ul4OZigRD8yCj6VjMXxx9Rk3u5oXy+8e7Z4cHJCl+c/uOj27X1ag08p+CJM7T 80Ve2f+WfFiklRh4CrtCcLrb1w775+5CwCcJa4OrKZZ2sCpPkdNADKcouPEGKCmgH2zD ELSYWbqwCj721WUAw+JES+jGLbfiOsthmkCkMGWI3VYZ7H4+QNHGPwcYlh82D7SKYHxN YdiV1bI8o5X50EabneTL11LuCdgQKVhoDmYemRcvELXpQNROL871yKNSidM9k4eoip1Y Y2c6fB44/0MdmJIP6+9Vx+IQC/h4Z5MiBiygI1mqWrLESkS7n4O+jZjTO6tBX0yhEfvi Fo9A== X-Gm-Message-State: AMCzsaVDmnVfNvHuVH8BKiIugcqMCag+L9ceV25CO6lhkBWyu5lYQbVA PWMQymNUSMqT0ylVYOcPadkRpodI X-Google-Smtp-Source: AOwi7QCRogRgDhYpXS4XC4JWcph1HnbWQu9YvEIEOyHLf0vP9NP5kZBfgEnU7JyObVBPZ4Uj/549/Q== X-Received: by 10.28.54.133 with SMTP id y5mr9973999wmh.6.1507038371224; Tue, 03 Oct 2017 06:46:11 -0700 (PDT) Received: from donizetti.lan (dynamic-adsl-78-12-246-117.clienti.tiscali.it. [78.12.246.117]) by smtp.gmail.com with ESMTPSA id u52sm21724267wrb.23.2017.10.03.06.46.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Oct 2017 06:46:09 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 3 Oct 2017 15:45:32 +0200 Message-Id: <20171003134540.21625-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171003134540.21625-1-pbonzini@redhat.com> References: <20171003134540.21625-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PATCH 02/10] i386: hvf: header cleanup 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: sergio.g.delreal@gmail.com, agraf@suse.de, alex@alex.org.uk Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Remove inclusions of system headers and avoid "pragma once". Signed-off-by: Paolo Bonzini --- target/i386/hvf/x86.h | 8 +++----- target/i386/hvf/x86_decode.h | 9 ++++----- target/i386/hvf/x86_descr.h | 5 ++++- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/target/i386/hvf/x86.h b/target/i386/hvf/x86.h index 7fd8fede80..ae957fc895 100644 --- a/target/i386/hvf/x86.h +++ b/target/i386/hvf/x86.h @@ -16,12 +16,9 @@ * License along with this program; if not, see . */ -#pragma once +#ifndef HVF_X86_H +#define HVF_X86_H 1 -#include -#include -#include -#include #include "qemu-common.h" #include "x86_gen.h" @@ -474,3 +471,4 @@ static inline uint64_t rdtscp(void) return tsc; } +#endif diff --git a/target/i386/hvf/x86_decode.h b/target/i386/hvf/x86_decode.h index 329131360f..50957819f6 100644 --- a/target/i386/hvf/x86_decode.h +++ b/target/i386/hvf/x86_decode.h @@ -15,12 +15,9 @@ * License along with this program; if not, see . */ -#pragma once +#ifndef HVF_X86_DECODE_H +#define HVF_X86_DECODE_H 1 -#include -#include -#include -#include #include "qemu-common.h" #include "x86.h" #include "cpu.h" @@ -323,3 +320,5 @@ void calc_modrm_operand64(CPUX86State *env, struct x86_decode *decode, struct x86_decode_op *op); void set_addressing_size(CPUX86State *env, struct x86_decode *decode); void set_operand_size(CPUX86State *env, struct x86_decode *decode); + +#endif diff --git a/target/i386/hvf/x86_descr.h b/target/i386/hvf/x86_descr.h index 1285dd3897..034d8e95c5 100644 --- a/target/i386/hvf/x86_descr.h +++ b/target/i386/hvf/x86_descr.h @@ -16,7 +16,8 @@ * License along with this program; if not, see . */ -#pragma once +#ifndef HVF_X86_DESCR_H +#define HVF_X86_DESCR_H 1 #include "x86.h" @@ -53,3 +54,5 @@ uint32_t vmx_read_segment_ar(CPUState *cpu, x86_reg_segment seg); void vmx_segment_to_x86_descriptor(struct CPUState *cpu, struct vmx_segment *vmx_desc, struct x86_segment_descriptor *desc); + +#endif