From patchwork Tue Oct 17 16:43:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 827145 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="iXtdE+eF"; 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 3yGh8D6DKvz9sRW for ; Wed, 18 Oct 2017 03:53:00 +1100 (AEDT) Received: from localhost ([::1]:40573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4V6w-00072w-MO for incoming@patchwork.ozlabs.org; Tue, 17 Oct 2017 12:52:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4V0C-0001m8-Jd for qemu-devel@nongnu.org; Tue, 17 Oct 2017 12:46:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4V0B-0003JA-Rg for qemu-devel@nongnu.org; Tue, 17 Oct 2017 12:46:00 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:50272) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4V0B-0003Ir-NQ; Tue, 17 Oct 2017 12:45:59 -0400 Received: by mail-qt0-x242.google.com with SMTP id f15so4900795qtf.7; Tue, 17 Oct 2017 09:45:59 -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 :mime-version:content-transfer-encoding; bh=ZTkofEvEm4lN4E56aFN1R3Z7Y2LlaxOcI2xcwOQWAj8=; b=iXtdE+eFtqGJ1t2zEXv+XQ8HC8As/g7mnutZ5W44a1ysEtCJY+SKNhDfd5P7Gdnp5j 1xRn8h6YqB3kvZhRtmkvq3Gi51e1/n9n5UR9cAR998bNDrcXxTp37mrZx+7TUj6CE6A9 BpO8wrYAtABKzmAlxukcBGjIKsSTLjGI7Ch/Zwa3zyNinYs1/rreZ4ya1kMj90qUzvcw 4RRkUsMR8HK5baANxQNpH5cGHnwMxIRVvLC3nKsXkl6CbAwCetC0LK/BT6CoOeKo5nRC Ny6gfTz6yf4lxpAnef4UKVHv6DcHChOn6PHsbIhcow6QJuUfmQJrlGFqkHW2x9cZFvpf D9KA== 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:mime-version:content-transfer-encoding; bh=ZTkofEvEm4lN4E56aFN1R3Z7Y2LlaxOcI2xcwOQWAj8=; b=CaFl99+XFEs3qO1t1iqAaM0JrHx6vjBOlT+zpcmHwRGJMKY3gXmfaLmAaTB24kfMPN v5y6kQ9vY+Ea88GbKAnU3J8L/iKJH+YqtmxoraKgK7lxhiPQHi0knTjUu50GtftILOH6 SDfxZ2/km9FoQEPTyiZGCA0whQC12vIBDyxbu3wLP/DVsWDyXUz/94n6xblMhUQC1mPa AK5KpcyAQmri4kiofwB8Jno2r/GMDHSYz3YJpI1r9g+uNCmhdMGxmeabczfk4Xxg8X7v M497wLjaMdbRQHauSr0iBgB0BpWZxp1jp7w34V/bh4nHliV9VOgv5cEdNnCcdrXfa0zt wdOQ== X-Gm-Message-State: AMCzsaWEOzFvi0eHFajNralrf3euFE/2h1N5mVmLCrniiKxLB5nyPTw6 NyERbSLT9NcHSHmU9eST+PQ= X-Google-Smtp-Source: ABhQp+RR0ee/lAcwVlDh5DS/vCl2YzAKDA1djFRkxLIV7Sz+YHRDxVFiN7rkq6l+AHzOQQOiP2Oggg== X-Received: by 10.237.42.97 with SMTP id k30mr21063862qtf.184.1508258759133; Tue, 17 Oct 2017 09:45:59 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id q49sm6687653qtq.80.2017.10.17.09.45.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Oct 2017 09:45:58 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Michael Tokarev , Peter Maydell , Thomas Huth , Paolo Bonzini , Richard Henderson , Eduardo Habkost , Yu Ning , Vincent Palatin , Corey Minyard Date: Tue, 17 Oct 2017 13:43:59 -0300 Message-Id: <20171017164426.25277-16-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017164426.25277-1-f4bug@amsat.org> References: <20171017164426.25277-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH v3 15/42] i386/hax: remove duplicated includes 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: qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" applied using ./scripts/clean-includes Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell --- include/sysemu/hax.h | 1 - target/i386/hax-darwin.h | 3 --- target/i386/hax-windows.h | 2 -- target/i386/hax-darwin.c | 6 +----- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/include/sysemu/hax.h b/include/sysemu/hax.h index 232a68ab1b..f252399623 100644 --- a/include/sysemu/hax.h +++ b/include/sysemu/hax.h @@ -22,7 +22,6 @@ #ifndef QEMU_HAX_H #define QEMU_HAX_H -#include "config-host.h" #include "qemu-common.h" int hax_sync_vcpus(void); diff --git a/target/i386/hax-darwin.h b/target/i386/hax-darwin.h index 0c0968b77d..fb8e25a096 100644 --- a/target/i386/hax-darwin.h +++ b/target/i386/hax-darwin.h @@ -15,10 +15,7 @@ #ifndef TARGET_I386_HAX_DARWIN_H #define TARGET_I386_HAX_DARWIN_H -#include #include -#include -#include #define HAX_INVALID_FD (-1) static inline int hax_invalid_fd(hax_fd fd) diff --git a/target/i386/hax-windows.h b/target/i386/hax-windows.h index 1d8f68de91..f7c3e99246 100644 --- a/target/i386/hax-windows.h +++ b/target/i386/hax-windows.h @@ -24,8 +24,6 @@ #include #include #include -#include -#include #include #define HAX_INVALID_FD INVALID_HANDLE_VALUE diff --git a/target/i386/hax-darwin.c b/target/i386/hax-darwin.c index 1c5bbd0a2d..ee9417454c 100644 --- a/target/i386/hax-darwin.c +++ b/target/i386/hax-darwin.c @@ -11,13 +11,9 @@ */ /* HAX module interface - darwin version */ -#include -#include -#include -#include +#include "qemu/osdep.h" #include -#include "qemu/osdep.h" #include "target/i386/hax-i386.h" hax_fd hax_mod_open(void)