From patchwork Wed Dec 15 10:40:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 524258 Delivered-To: patch@linaro.org Received: by 2002:a05:6e04:2287:0:0:0:0 with SMTP id bl7csp236084imb; Wed, 15 Dec 2021 03:19:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJwuyz1oCgXL2eqJOz1V+Bgh/l7mtV3x+fO3Ol3v+YOW1lCQK4ZbEIl+jpyZn8svNaxdQMcw X-Received: by 2002:a25:c552:: with SMTP id v79mr5397880ybe.709.1639567175414; Wed, 15 Dec 2021 03:19:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639567175; cv=none; d=google.com; s=arc-20160816; b=dTMvX9AX0jfNx/Hhte/wLvKUV7N0p9DTrznaDs8aPwVt4ctUne6UIyyw0H4nefazag FuovcvN7gvdnEoPGh5J4eRLjJSZkgQtX6+gig+kD8hIRAh7J/YWovgvv8dV38wVdnU7V buUwIcEKopS6d3LtI3V6HJ78RSeAe4IwNCaBoZDCQjUKkvYGztLG959ETfHbkAZGzLvw qBALyqQ2ZoxM/iM/0ZcGcHpdYDhgxiOdi+gGyfn2cs6b0en3Q7qFHFlJCnU/DMnFLYam 83/Tw5ykJ0HMGzhUXoYgdFuJrb4J3RVln4IkCckpAbs0I47qSfskqSUbN1e7Ruhe6tF4 ERNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=hhMYipSwn2eG/b+4IrljLjNjCQxUpkJwZAkhclx3/mk=; b=pSHfl8oHT8L4V3jBrkwzH+slY/cCDlQPYgFqMUSuevZ0BeCKU9kf38L7j3CpnqP7hE Xeo9Mc1xIvdgC6KxvOKmEYgPLs7wbtzK0TNL2RWozLBpRjlJgopMK5NZDzqGCnizTXGz eYWsHEDRuDw0pKXCfPEhzUfc3RWcrRq+ullKAJ0dDJUqvqOpvnQOLs+Gg1vVNea4tUJn DQN4maSJ8UMQipCweHxzSgLKOj7ZBJAD+j35zbWUhNfmPg9KTTxAK1UNpPDKkKLoD2qE FkOlMKuX0Djx1pJ/jx05zfoSemtIRagRATptu0lesUqN42H7p6/Csgrsy3LIsSQDgWke 6ztA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=z6EGwv64; 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=pass (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 v200si2088512ybe.243.2021.12.15.03.19.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Dec 2021 03:19:35 -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=pass header.i=@linaro.org header.s=google header.b=z6EGwv64; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxSJq-0007Hk-Kg for patch@linaro.org; Wed, 15 Dec 2021 06:19:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxRif-0007AV-19 for qemu-devel@nongnu.org; Wed, 15 Dec 2021 05:41:09 -0500 Received: from [2a00:1450:4864:20::429] (port=42981 helo=mail-wr1-x429.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mxRiZ-0008Sh-E2 for qemu-devel@nongnu.org; Wed, 15 Dec 2021 05:41:08 -0500 Received: by mail-wr1-x429.google.com with SMTP id c4so37353474wrd.9 for ; Wed, 15 Dec 2021 02:41:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=hhMYipSwn2eG/b+4IrljLjNjCQxUpkJwZAkhclx3/mk=; b=z6EGwv649E4JN+CwBINKq0vDHUKGNsUv0kpdoAllXJGuOWLIDMw4pZKQhjZ1pP1m+A 6OYCTeNm1yphx9P51KeC94N6Ma2u2NTxdp5ghVXSrXQ9U3iNUWMmUsvAy1/TmaQXtl5E BdDcBJzChghIlQqdbbgEfIW4pFAJ3u9uVjJsvoAi1q8dmrGdpF1zZRmgPwZweBm3TMyW DQ1Cj0zcxbDxI41bW32E3AbWuiCWuMKp7mSwAbhn2yaWKilIwgvXBOWX9Kxfc+OPt6Xv XjkMKDHRD/6MRT0OLmqZb8pLSKqKIJixB2NT+KT3Inj8k1NUqRBdMWXme3TzaVKaSU2o +KTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hhMYipSwn2eG/b+4IrljLjNjCQxUpkJwZAkhclx3/mk=; b=VtTp2kuhssf5Py7ohAuWH2Y6WOLxaclfEH5rF+5RsYAb6b/7GXwotk5XBoL7UOpOM6 ndiMlxN6T7sZqCMW+YPAGLDAw+uYS+NFKHMd2aMfIrlgbo2nPJBuglYjKP6ulEmUEnlx 5S9ljhp4naI/CE/CM/5XjRN21UL9rvQ95kFR0phqfobaTsaTIi0EpdJOE0VK+U9OULoz U6ufiFEtJmtpBUSQExyP9dREdQew6ZVkrAnySOmP1JhtNo5ebaLzrangSu+P9p/OVBJO tVGSwBsY7TP+2ezXaWnAPkzVMyJaGaFlMIRaY3LEH5JC1UPOaUuOOw3S83l74W548Kd2 10Cw== X-Gm-Message-State: AOAM5329mTYZUDgMdkOHX4OnGXC8fsEBm4Ch9CbvOXNpmcEYR31iK2rt B7lpg+NPNu7IT4ws1drnFV6kUJLdMzTPiw== X-Received: by 2002:a5d:5303:: with SMTP id e3mr3811934wrv.73.1639564862200; Wed, 15 Dec 2021 02:41:02 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id e18sm1600815wrs.48.2021.12.15.02.41.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Dec 2021 02:41:02 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 20/33] include/hw/i386: Don't include qemu-common.h in .h files Date: Wed, 15 Dec 2021 10:40:36 +0000 Message-Id: <20211215104049.2030475-21-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211215104049.2030475-1-peter.maydell@linaro.org> References: <20211215104049.2030475-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::429 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x429.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, 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: , 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 Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-id: 20211129200510.1233037-2-peter.maydell@linaro.org --- 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"