From patchwork Mon Nov 29 20:05:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 519725 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp6567794imj; Mon, 29 Nov 2021 12:07:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJwjgKb4Bc1++MFa8XwhaxJAk17jUHiKPkjmUG0oesSvvOV0DK6Wah8trFE7+7QXEmqcFLvb X-Received: by 2002:a7b:c008:: with SMTP id c8mr201462wmb.55.1638216432574; Mon, 29 Nov 2021 12:07:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638216432; cv=none; d=google.com; s=arc-20160816; b=QCXOa2NBNdzLBMfS8z+/gAdkZrjexFLaGMnYT1r7bQGlkA0VUKzMtcq2sMS1g3e1l5 JD8NVa1R2m6NQBH1WM4vqq8ek9VaOGeIx1Q29VaikKdp25tmPFPNRqc5KjpChhsFnv09 TIP0phQyJsgbmgHKaplUd5HuJ472p6/h64cAot1pouVrlsXAB/7sQDEaXUSm32ruCTJg 0xqUbS4QTE5hbMJPh/Uk+z89C9a5zOPRoO+dkgRl04nHIxZAVSb2T+kDEDSjRUu7hSWm d/e7hkOKuYoxXTJa4KEMr73uSIRmnhxjt1xpL/p3AncUTBLytXybJwRc7iZAxMTWe0mz MN4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=T9k9KN5zJmRQNsTgBr/a7NChGJkpUEj//jlPxI0w1T4=; b=cQHneJ0NHxhlApSzVIA9GlKqpaB/06YBe8/J5Q/xgEzXYetOMFQagakHIkiKrbny9+ pOZ/1iiqt1uoL3CKcHQq80tGRojAaVSJwtL+dG6UPak0D7zVvKEEKTsasTkhkS20uOSm yGrKeMQ6fBBxK/bMPtnuuKmbqyqLbNFIGwsAvOJ5LdvXHL6c/sDnfekwCzFWj0dXAzFg TDgKiZYNnd7Wib2VmCC4iulDVhkwQRbfvEhTFkB2VMXk2kmcMcNRKIS3CusUEZCDvza5 lcqZPyD0AkeWOajCSDMxjn5Rxj8d4TMvVJS/MTr6TlikVxGRY7z6XNNYxty9U4ZwnGWl wmaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mNjpmR00; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z10si20961571wrq.445.2021.11.29.12.07.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Nov 2021 12:07:12 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mNjpmR00; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mrmvf-0003Rv-Kr for patch@linaro.org; Mon, 29 Nov 2021 15:07:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrmtx-0003O9-Re for qemu-devel@nongnu.org; Mon, 29 Nov 2021 15:05:26 -0500 Received: from [2a00:1450:4864:20::32d] (port=55070 helo=mail-wm1-x32d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrmtq-0008CV-BE for qemu-devel@nongnu.org; Mon, 29 Nov 2021 15:05:25 -0500 Received: by mail-wm1-x32d.google.com with SMTP id i12so15638565wmq.4 for ; Mon, 29 Nov 2021 12:05:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T9k9KN5zJmRQNsTgBr/a7NChGJkpUEj//jlPxI0w1T4=; b=mNjpmR00l08Zl6qD7dwj47CypqFDuNy+c7yF4DFJi1qsvRTJbHBZJNg19AHDIIh7wT cZ8e3akLKnVyhiikU/a51/idKtcv0Nuim2vcE0KGUtLYbu+zgOF6bNF1wCPFnNcAeh9k vwD7bJtwVnY2SI//XNYcQ8B7F6QW5v0PvRxVqmlwDLbCehvtyUkUuiEhJSa1LDiK48Pn Ea2vkkT7CBFDgvk+acz/APUjiYf4cbK9RHkhDfZ7FUa3iuuaDeQZHBuQKSA2VJ94ZsIg 9MUJxmYNup7HnLLzOLSKxz2uEFQTO+Bj8NYBF/tEG2rGdFTFW+Ki3iB1LupchjoOm/SJ ePDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T9k9KN5zJmRQNsTgBr/a7NChGJkpUEj//jlPxI0w1T4=; b=YjJnaWY6pkDgyi0muF8x9Wfga5imf0xwdu3iHdMITaVT4zpUXQTMq/VJAzrkb8uTQF KGbz0FWuLvYuPPH/1nIBPlCH5QGOKhm1wwzVi8ezw+dTrWcQzsassZq79d6AtN/aGFiI mA9f5gvuMduAD1ybWUUUtDweqqSC59xqRYc4D4aogngHwzQbw1mYQxI0jfev0M4KwHbk 7ihZFggnOnc/p6G/SCp3nNiZM7Ae6MUmWS+fhznVASqzqtCGlqLaLwWSTBI39F0A9KZf 1j5JeJ8ZjEF4YYKno9pFrf7BNTxOsphhu3oGQ7bnEn+GamGIdCwTFUU/MLuldLIAPw9k anew== X-Gm-Message-State: AOAM530Mxk+VKQa0tw0/JTm5QSOSQCuUPPzKXcw2QLdod025nES9/QCM M/kzmBeN7x1pZgAwPQso/4LmGw== X-Received: by 2002:a05:600c:4108:: with SMTP id j8mr162764wmi.139.1638216314008; Mon, 29 Nov 2021 12:05:14 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id v15sm14678863wro.35.2021.11.29.12.05.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Nov 2021 12:05:13 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH for-7.0 1/4] include/hw/i386: Don't include qemu-common.h in .h files Date: Mon, 29 Nov 2021 20:05:07 +0000 Message-Id: <20211129200510.1233037-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211129200510.1233037-1-peter.maydell@linaro.org> References: <20211129200510.1233037-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Taylor Simpson , Yoshinori Sato , Sergio Lopez Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The qemu-common.h header is not supposed to be included from any other header files, only from .c files (as documented in a comment at the start of it). include/hw/i386/x86.h and include/hw/i386/microvm.h break this rule. In fact, the include is not required at all, so we can just drop it from both files. Signed-off-by: Peter Maydell --- include/hw/i386/microvm.h | 1 - include/hw/i386/x86.h | 1 - 2 files changed, 2 deletions(-) diff --git a/include/hw/i386/microvm.h b/include/hw/i386/microvm.h index 4d9c732d4b2..efcbd926fd4 100644 --- a/include/hw/i386/microvm.h +++ b/include/hw/i386/microvm.h @@ -18,7 +18,6 @@ #ifndef HW_I386_MICROVM_H #define HW_I386_MICROVM_H -#include "qemu-common.h" #include "exec/hwaddr.h" #include "qemu/notify.h" diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index bb1cfb88966..a145a303703 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -17,7 +17,6 @@ #ifndef HW_I386_X86_H #define HW_I386_X86_H -#include "qemu-common.h" #include "exec/hwaddr.h" #include "qemu/notify.h" From patchwork Mon Nov 29 20:05:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 519724 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp6567758imj; Mon, 29 Nov 2021 12:07:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJzbaGviUgwWTkmaziHy2QQXAxqVJyZ8FPeiumemj1sRE4SZePLrz1kDNqlDGW3Gpjjaub6z X-Received: by 2002:a7b:c207:: with SMTP id x7mr225532wmi.108.1638216431298; Mon, 29 Nov 2021 12:07:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638216431; cv=none; d=google.com; s=arc-20160816; b=uPBQoC4VfMvCFPFXQy0IDxkAT73fRhdjFCt4ZDaZernsJ3vEy7e8Y/fNEd2Jh9QHYg lGqYnsmlfBDVbs9Y3ueqmdXINj0m8LGcSi2KNR6aWJBgeEIMZFNbjloF2/gA0leDJmei UoVYlhEhqmdD+icDnLgv9bgJbIRG7ff8rMtGWkwMZzL0o4NdmS0QYN0GV1Q1tA2/eM1F hrz/g4z37Jm7KGLIEUnJ4sCCaGe1NhH65e/OpMK025XX3YbxCqC1SesCjRXWR8HGf+iQ 7KrL83VG754RS6EPCw9Ew3TIFfdSulK6xn7ooKQhs1eI9/gBJbXyX0qJ2DEGBU2MssTb gc4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=UnmMe2XVlfepy+SM6SWY8AYsfzJiHx81z75dkAVJ9Po=; b=0nc8YDNumYlra3+zIUNLj6eVZeDe+2J3GdzuapA5R57piitjja60E7386uJLmKMS1o IB6mZIPwvWn/c8ZjlrbDgoUeNEuIjcX08Zx2bS3qdsASdm2RIE8F/+pa60IVs6YXgIL9 6t61vg5lKUAqd1TDVWgP26+pYMdX1uyadkl6W0ABzay4QW4LfT+rVhV152qLuIIjW169 ztSIBBTP0XoX06wMWGgJWV3X9Sy4tYKFG031LFTQCXQR4IA7+RXdfqqVsEokm15gXEut iavvzn+jWV3W5JfdadwOylRBRrcCdrOXF/qMalNopcl7EUGiUYHmoqxuzpkHMo+iU1ZQ Kj+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hVFWrzAG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b15si20038692wrq.466.2021.11.29.12.07.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Nov 2021 12:07:11 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hVFWrzAG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mrmvd-0003TL-W9 for patch@linaro.org; Mon, 29 Nov 2021 15:07:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrmu0-0003Ov-3F for qemu-devel@nongnu.org; Mon, 29 Nov 2021 15:05:28 -0500 Received: from [2a00:1450:4864:20::32d] (port=55988 helo=mail-wm1-x32d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrmtq-0008Ce-Ht for qemu-devel@nongnu.org; Mon, 29 Nov 2021 15:05:27 -0500 Received: by mail-wm1-x32d.google.com with SMTP id p18so15622601wmq.5 for ; Mon, 29 Nov 2021 12:05:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UnmMe2XVlfepy+SM6SWY8AYsfzJiHx81z75dkAVJ9Po=; b=hVFWrzAG6sPmitcIJZiRpD4zOIr/efmL+IgPmctw3dF6NV+XjHw56FsW/6b+ZmfcbC 1aqoyiikKJTM9BHIEsUFQcueUepxNeWWwzuQT5WGaiDJNoZL0HYIq/LJaD2Y03e5/k63 csGbmSZ8q86yYTswSviFjcg9VGDG3VnDU43bB38zdY1Kp0AIWj2mLBwAw+AXSMhaEG4P 55zzkgxedoJ/AOGgpznc2fdPmYSg2Ww9HDXEfi7lPDsN6LQEdVbJg+wB+EKNRIjoQEO1 I7VpIWJjzG19s7wrd4GGyJRU0kN6mf/P2msta0jHcYx4kPrs3P1L7uYClYnsbWxjIlq0 9s7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UnmMe2XVlfepy+SM6SWY8AYsfzJiHx81z75dkAVJ9Po=; b=xWkjjd23S6aspXGzCtgASspb5fC6Jl19jIWz4ZaRANvdP2lfAgg7bCeEgXNYfJcdPG YrZ2nvZVJ9Jr8eUIINKwbuGwfFWh/GiwC41KWE1xRKlWHrye1bkzrB4SWRQ1DpiBhnKO cE8wD+gRydW8Gesu2WKAxKoGJiB5PyAIzczh8uVc02xAMDoyeOiNBH8CitwIwxoh4IKh f2XM7WYw1NC0jfjvrqAsSaWKEa73JKzzDBdTt9JAa8vC8YswDfKOgN+ZQ5BPD30nP9rs KPtzWJzRKN6i3h4IApHznwC8nP5ali395jWdXzutIaFffqzU74lcAeGyIq+5xVhgSmbP fYtw== X-Gm-Message-State: AOAM530oqjYGqA74+fNgqzNq7tc/ihB6TwA9spactlY4LWJI5/jGn5Yb uiC8KtjZrwBemdrCvbBtM0v/hg== X-Received: by 2002:a1c:7f56:: with SMTP id a83mr225953wmd.32.1638216314846; Mon, 29 Nov 2021 12:05:14 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id v15sm14678863wro.35.2021.11.29.12.05.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Nov 2021 12:05:14 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH for-7.0 2/4] target/hexagon/cpu.h: don't include qemu-common.h Date: Mon, 29 Nov 2021 20:05:08 +0000 Message-Id: <20211129200510.1233037-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211129200510.1233037-1-peter.maydell@linaro.org> References: <20211129200510.1233037-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Taylor Simpson , Yoshinori Sato , Sergio Lopez Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The qemu-common.h header is not supposed to be included from any other header files, only from .c files (as documented in a comment at the start of it). Move the include to linux-user/hexagon/cpu_loop.c, which needs it for the declaration of cpu_exec_step_atomic(). Signed-off-by: Peter Maydell Reviewed-by: Taylor Simpson --- target/hexagon/cpu.h | 1 - linux-user/hexagon/cpu_loop.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/target/hexagon/cpu.h b/target/hexagon/cpu.h index de121d950f2..58a0d3870bb 100644 --- a/target/hexagon/cpu.h +++ b/target/hexagon/cpu.h @@ -23,7 +23,6 @@ typedef struct CPUHexagonState CPUHexagonState; #include "fpu/softfloat-types.h" -#include "qemu-common.h" #include "exec/cpu-defs.h" #include "hex_regs.h" #include "mmvec/mmvec.h" diff --git a/linux-user/hexagon/cpu_loop.c b/linux-user/hexagon/cpu_loop.c index 6b24cbaba93..e47f8348d56 100644 --- a/linux-user/hexagon/cpu_loop.c +++ b/linux-user/hexagon/cpu_loop.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qemu.h" #include "user-internals.h" #include "cpu_loop-common.h" From patchwork Mon Nov 29 20:05:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 519726 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp6568620imj; Mon, 29 Nov 2021 12:07:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJzId6fFwSZ9vRVZigInw0tHnjxOlkh5EdyE3isME3Uamkp3n1hJXFRCqX0k05gjrWmM43GY X-Received: by 2002:a05:600c:1d28:: with SMTP id l40mr206645wms.192.1638216476718; Mon, 29 Nov 2021 12:07:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638216476; cv=none; d=google.com; s=arc-20160816; b=h2D4l3gKH9df1/Ey4bnGI3N1pS8kEhZauKXPiBrMlG9CIB7H4zH8rAb4wAzgVwu3ys 5qcve0L6OxVpthe5UOQ56RaXu26GbUBahAUNDYDMfvjg9qF/aaqyYxpV9Lxj5AD4UgyK Nl2n9XVXGbOgjsTvfrRtEBBcWo3CLfJyXsncBVMoca462x8CTr5X1zf+exDNBzDeiQc6 KctkYtGW5LoL6AqkNq8FWptdfkzvhPhbJb4+9nx2vZ52J+9xRokyOCIGUKBvcD97swvs vHG7BeugvjxtgJTYpAX/z864961W2GWAJYLvtj1LEXgbufCb5Y8ty8CqW7U6wZ9Pw6tP P65A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=qTo77hPRZPJCGOc5lQV7xcrmA1XxlNOYWfSFKOfnGds=; b=zuyeZC5y6AFg3V+KDJVGP7MG+FrMnaXAuAbS4UhaeKqRNeDB4Q3MVWBCxdZdCDi6wA Icn/stGyjujeScejaQ4TITtN3cl9yGWVRHyeKFVF7nfX5qg0ZqmMA4Z9eygh25cbo+vF 7tSi+EOwvKDFdou07trr+FMxCx2gi8Lnhg3UUHItqQ2LZaVFpSHMcwZHRFAIB9zk3De3 rGP+9vr3Tg+xyPBEULp+0MRYKYhjD9jmLty6Kxp9pAAX8dbZoixKpTI52WtJMemyMNWp 8C058n2EMxT9M0LBFa6ALyAg65dJgqt0QwKYAAWl5JC4jfrl0rOCtQ+gUk2l1ATWziIx qpQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aAzoGrNo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u14si22953894wrb.853.2021.11.29.12.07.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Nov 2021 12:07:56 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aAzoGrNo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mrmwN-0004P6-Qy for patch@linaro.org; Mon, 29 Nov 2021 15:07:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrmty-0003Oq-W8 for qemu-devel@nongnu.org; Mon, 29 Nov 2021 15:05:28 -0500 Received: from [2a00:1450:4864:20::331] (port=55074 helo=mail-wm1-x331.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrmtq-0008Co-Bi for qemu-devel@nongnu.org; Mon, 29 Nov 2021 15:05:26 -0500 Received: by mail-wm1-x331.google.com with SMTP id i12so15638636wmq.4 for ; Mon, 29 Nov 2021 12:05:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qTo77hPRZPJCGOc5lQV7xcrmA1XxlNOYWfSFKOfnGds=; b=aAzoGrNoqXqMNypiP5U/kE0CsU0QtfRtwkYpevgOcyzVCTVlv2cxqxXzo68x9rFerP LDOc0klBji4OqtegXIQpC25bULBnOXLZ+21TdLWCXLghRpzFWTIcAKDHaVpof9MYya2b 9C4DgLLCZPj/QYW14QLkeUUEnJzt2QuX7MSSyEqnB8SmlaNlQcmbIlphAPT4mEuzGKtg EXHjj42xnl9OS+3hFFteS+XQ1C8kOvhIA183CUP2MdB8t3H27qe9BlrhTHwMXzxuOzRf Ih6qPkfn3hCzFDWBGmnw/3wMNZgW4kZKunOu1IEiG2jFUjWXS3zzkcdaTBkrwFHJpK0w FOWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qTo77hPRZPJCGOc5lQV7xcrmA1XxlNOYWfSFKOfnGds=; b=ldXPXIIGaSeGrKl89yNmQvYZqPgzxXA5g4SmeXu6b5zAwuZw89od8FN3oV2XCP5aGj 1A5SgrBaknVBIsUrPj3RerjYhqhZqFkRZFIJtgsy2NYDZ0GBcba1bGOV987O+zfM3aOB qoXeFfvAytoDY3X3brPXPzgFXJeieFHsBLs0cpnUk0ZmG3jzMv2FTC1xnpxRNt2wKnZ9 44ZFzrmlRBA01ZqO8HpCJn+aqOmzpynAMGSH3OqCfrll/67Z+Wqo1X52BoV6b7cbbAHx q7+WLscqlQ8Dl1w3vpYDxRT94cwI/1FueWhPYpcRiO05rGICoEQsNsfPlKS6z91kaiJn PYGg== X-Gm-Message-State: AOAM530kdPgLGhLXpuZe7xslc5OKiifUdGChzsqZeGsSoEzHHtFDgTeq bnyumfydJACS8TdEaK8RSoydFQ== X-Received: by 2002:a05:600c:3494:: with SMTP id a20mr163020wmq.195.1638216315776; Mon, 29 Nov 2021 12:05:15 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id v15sm14678863wro.35.2021.11.29.12.05.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Nov 2021 12:05:15 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH for-7.0 3/4] target/rx/cpu.h: Don't include qemu-common.h Date: Mon, 29 Nov 2021 20:05:09 +0000 Message-Id: <20211129200510.1233037-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211129200510.1233037-1-peter.maydell@linaro.org> References: <20211129200510.1233037-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::331 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Taylor Simpson , Yoshinori Sato , Sergio Lopez Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The qemu-common.h header is not supposed to be included from any other header files, only from .c files (as documented in a comment at the start of it). Nothing actually relies on target/rx/cpu.h including it, so we can just drop the include. Signed-off-by: Peter Maydell Reviewed-by: Yoshinori Sato --- target/rx/cpu.h | 1 - 1 file changed, 1 deletion(-) diff --git a/target/rx/cpu.h b/target/rx/cpu.h index 4ac71aec370..657db84ef0a 100644 --- a/target/rx/cpu.h +++ b/target/rx/cpu.h @@ -20,7 +20,6 @@ #define RX_CPU_H #include "qemu/bitops.h" -#include "qemu-common.h" #include "hw/registerfields.h" #include "cpu-qom.h" From patchwork Mon Nov 29 20:05:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 519728 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp6573666imj; Mon, 29 Nov 2021 12:12:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJzfKwOJDVFr3fVpOkh7iV+MtcsiEvbeDvCXco5hbXazVTde5vrY+/Ae6EmVbCF5dgN4wuSJ X-Received: by 2002:a05:6102:c16:: with SMTP id x22mr35282062vss.69.1638216770326; Mon, 29 Nov 2021 12:12:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638216770; cv=none; d=google.com; s=arc-20160816; b=RrBIo7njvBoQKr8snUCj/xDApoKq7qPNUEtaZIeNyNWXlfoW0qT5NppEFHfHNixJkj we0TiLlNQw48/dYeX0I3H0hdHCO0h9DKTvchOAuSqe2sP3hFLZmS9iwtREzPnd3uqJP2 kd88y8MhYPPdCe7JGm8g8W+cAJ5q3GBzlg5VUKv2gY3JiUjkoU8c2H/fnsVX5VwjZGk0 FrsWJIGsV9uwJowiX2hnld5JkDY6QHrk34O/g7H7MFUh9olpoql5CmMzvP54/J6PkHSJ TUc00Z8FIVezRz4HKIpc7BBH0Tb/E8FNOlopSISDnw0h/VpAYdBz1ww+dWboNx+ZQKOZ 0BvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=sKPrq0WiNhFQC4eMSOOuu5+qd4ajSFj6dKcca8DNV3s=; b=bXA9sAwg4+25zcehhYcXWvuUaMHGWzhDVdjG6lIIVfqm1F1JSH/z7jvpmO3JIsmgCf dwGhVcNZlNXmzClEH8EWJhAzX47td8cL7f0hegPnb6NQTEP2Dxju1LQwUbIFGAVpS13u EhpWbyzxDlL2AEzr1dnWNKyktLnSIkZQia5p1jd0eeejASVrpAHgsc53tCizjf2mXgG0 H+6WqXLY7mnwiXe4MZ1+apOwRr9JMCfd1oFexwg+1JmYJZWKKSrHQox5IZdXKVPe+hDf aYPf77R7cQ9yrH2Ado5yNAH+U3XQgtP1SeHq2hO/ED661i8wy1K/6UmeXaPHp8zrBYeC tNmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mP3wWHLl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m6si7285685vsl.760.2021.11.29.12.12.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Nov 2021 12:12:50 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mP3wWHLl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mrn17-0002qU-QJ for patch@linaro.org; Mon, 29 Nov 2021 15:12:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrmty-0003Oo-VL for qemu-devel@nongnu.org; Mon, 29 Nov 2021 15:05:28 -0500 Received: from [2a00:1450:4864:20::333] (port=35536 helo=mail-wm1-x333.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrmtq-0008D1-C4 for qemu-devel@nongnu.org; Mon, 29 Nov 2021 15:05:26 -0500 Received: by mail-wm1-x333.google.com with SMTP id 77-20020a1c0450000000b0033123de3425so17832960wme.0 for ; Mon, 29 Nov 2021 12:05:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sKPrq0WiNhFQC4eMSOOuu5+qd4ajSFj6dKcca8DNV3s=; b=mP3wWHLlNPW5o+JxKlMf0nd0DI4W5wCSPd8Jjble7DHmCXOdcqLeXRrOJJ8KLxIiPj WTP9fxwcVRnVUhU3ctdpJXeLPCE30D+qeStaK/TrZZNhoNl86KhDDm4nPdSbbLS2lVnn PeSq5gbWSebm82p0anPmJ87jF1PkCAQ2AR8pn42MA0TzRkllj4vQeLK7kIiEXovyjhRz Jbmc7jXf4hMxL6fMAemZB6Hd0aDlVOGmisVt37X0+Kc75J7vjhJjAsGv9Kx8LB6LeQ8o wvj7y2yfbdOl21yxHVgS7LhBK1SYi+qgUoo4uHIbKRe8hgN+o7PEm0DTbypPk+o4fUgf phzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sKPrq0WiNhFQC4eMSOOuu5+qd4ajSFj6dKcca8DNV3s=; b=M8MCcFmPmoBF1D/rz8hitmAK5QEwt8u2tODEXcXzgnGx5+fqBJUyx2/2A9+xnTxSbN vmLciQhsmgoJJuPNfCpkBIiHluIM6S48YE/n9DGQqvSmQFBfize14GzyKDuBO+UwG9nB Xq5rw8TaudIi/OojhKMI0zK5ymAuLjpnMekn0wEq1HH3VqSN9P1Q2xcAGxCvWJpbS9Hx BmyozFBcKQis0n8KXM+w1uPV5mySoGX2bTrV9fE35PtqjsA/4drrazdw/+9HKYOzTm4f +ON7RfwciN+Q95zL/D3sMSx80uI1fbJ3h/n7xkQShJ33/B540+u2xBrtXbosF3GYGVzc nmvQ== X-Gm-Message-State: AOAM531jBDxhhzP/fAgcETwVbT8BDfffcbN6PAeCjk/mP5vTpOVO9pxG o0u1JYIK45dJmrhmG+LN00jY/w== X-Received: by 2002:a05:600c:34d6:: with SMTP id d22mr177431wmq.111.1638216316640; Mon, 29 Nov 2021 12:05:16 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id v15sm14678863wro.35.2021.11.29.12.05.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Nov 2021 12:05:16 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH for-7.0 4/4] hw/arm: Don't include qemu-common.h unnecessarily Date: Mon, 29 Nov 2021 20:05:10 +0000 Message-Id: <20211129200510.1233037-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211129200510.1233037-1-peter.maydell@linaro.org> References: <20211129200510.1233037-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::333 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Taylor Simpson , Yoshinori Sato , Sergio Lopez Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" A lot of C files in hw/arm include qemu-common.h when they don't need anything from it. Drop the include lines. omap1.c, pxa2xx.c and strongarm.c retain the include because they use it for the prototype of qemu_get_timedate(). Signed-off-by: Peter Maydell --- hw/arm/boot.c | 1 - hw/arm/digic_boards.c | 1 - hw/arm/highbank.c | 1 - hw/arm/npcm7xx_boards.c | 1 - hw/arm/sbsa-ref.c | 1 - hw/arm/stm32f405_soc.c | 1 - hw/arm/vexpress.c | 1 - hw/arm/virt.c | 1 - 8 files changed, 8 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 74ad397b1ff..399f8e837ce 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -8,7 +8,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/datadir.h" #include "qemu/error-report.h" #include "qapi/error.h" diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index b771a3d8b74..4093af09cb2 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/datadir.h" #include "hw/boards.h" #include "qemu/error-report.h" diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index c3cb315dbc6..4210894d814 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/datadir.h" #include "qapi/error.h" #include "hw/sysbus.h" diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c index dec7d16ae51..aff8c870420 100644 --- a/hw/arm/npcm7xx_boards.c +++ b/hw/arm/npcm7xx_boards.c @@ -24,7 +24,6 @@ #include "hw/qdev-core.h" #include "hw/qdev-properties.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/datadir.h" #include "qemu/units.h" #include "sysemu/blockdev.h" diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 358714bd3e8..dd944553f78 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/datadir.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/arm/stm32f405_soc.c b/hw/arm/stm32f405_soc.c index 0019b7f4785..c07947d9f8b 100644 --- a/hw/arm/stm32f405_soc.c +++ b/hw/arm/stm32f405_soc.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h" #include "hw/arm/stm32f405_soc.h" diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 58481c07629..3e6d63c7f96 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -23,7 +23,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/datadir.h" #include "cpu.h" #include "hw/sysbus.h" diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 30da05dfe04..3e2144e31af 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -29,7 +29,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/datadir.h" #include "qemu/units.h" #include "qemu/option.h"