From patchwork Mon Feb 27 14:01:50 2023 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: 657058 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp2378528wrb; Mon, 27 Feb 2023 06:22:59 -0800 (PST) X-Google-Smtp-Source: AK7set8ZMq9HnWdpvLrNIUoQk4UU+b0+jXzXETZqmqw00tgrfS9aSrce2cz29H2x1h394h5R/s6T X-Received: by 2002:a05:622a:64e:b0:3b8:6763:c25f with SMTP id a14-20020a05622a064e00b003b86763c25fmr28582248qtb.13.1677507779684; Mon, 27 Feb 2023 06:22:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677507779; cv=none; d=google.com; s=arc-20160816; b=vtqURy3FNlqE2OC7PTjJtpkItH/WX5zDovJ9tVV2fmU/aS2zi+xXhbclTaDQOgfPzm qSUpjzOTPqmwRTiTX0TZrjOA4koi2k1WBK8pXSpnX1tbmwnTcPah89JqQJY2UOjyve7D 9xzv3bNgwTGrCjkETGP/sY15rW1Osa/oqq39g6EXRx0ypNpevnNEk2hxkH00do5cetKI enukHX37Y2IJiLKjqf+jqxPWRLkgqOTdgRaP2PHWIRBLYM+GpomSiBRvF1hORqQRMR1R Zy52tbqQkXfLnpnK+KcJ29qV+NcfMhzlJqndzjLOi8lbcHypArFkpEaNJffKsqcZwVot FSXQ== 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=HqwZ52hr6zNLG2cBZSpTKqrDS8szOBhqgsEVua8GwmQ=; b=M7wUjBomksa1JksPACHAe3SKT6FPdAZmT2Auls9WsnDhzdEnThay1HVY0gqLgmbh+y YJ6yUznSABN1/+cJF7kPYojzGuyNEntqVAPRh6XM8viopTHTVjMXNnBtdUMMszrektpS fjPHU8sbA5knp+BOJhm6Ncl5sO2Lou/OWUr4338VaTFIO6vbtnvJED/w1eOPxzF9C6bx 4d7It/lX/UBnePDn7HpjU4ZTriUHDCOyDCXMc0Ff8953Jv7kU4KPtiNkIy8wC2paMvab z0E4/5S2ZgIGb7fdmQ9Zqjofb4gGhVpinfa6arbcPCr+itCLCRKo/PlqZw+/J/Lo+6pt /2vQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K6KBh4ls; 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 u14-20020a05620a454e00b00705dcaac535si7387111qkp.187.2023.02.27.06.22.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Feb 2023 06:22:59 -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=K6KBh4ls; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWeEH-0000PQ-D9; Mon, 27 Feb 2023 09:11:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWeDH-0007Kk-SL for qemu-devel@nongnu.org; Mon, 27 Feb 2023 09:10:47 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWeDF-00011p-UD for qemu-devel@nongnu.org; Mon, 27 Feb 2023 09:10:47 -0500 Received: by mail-wr1-x435.google.com with SMTP id j2so6350683wrh.9 for ; Mon, 27 Feb 2023 06:10:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=HqwZ52hr6zNLG2cBZSpTKqrDS8szOBhqgsEVua8GwmQ=; b=K6KBh4lsyNmiJU94VCSXIvfEobVCBGUhSCKD1zPL56uiCZDkspXZfFVFyC8ODYjj4m Fs63H4iepJltytQB9C6+080FlinLj1q9bWGIdB435vyl25RldEdv5n1OzIgOEUSYUSu9 zQAU++l5HcKDpbnFawYB16uzT2jZGnbjh/+xZfPT79RHGb/WosXtZ8oEgwIpHv1Y4Fw8 JreslamcVNJSfh/FhCGm+zKm5Bzyq/OHUvl0Ykay45vkM705AkIhzSyu7A90KLTKJQ6R nDkC9lx6AULcTmrcsFzcyznRSVZ/Z078k8oRqQqT9EmZ8sUKMyZ39MsFXV0H2emtfb9z oZ5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HqwZ52hr6zNLG2cBZSpTKqrDS8szOBhqgsEVua8GwmQ=; b=Mqf4E3lGcInOf7+rdmcVLHOhpxPgbZuvLOIECsC//nZ1o7OFUZD4hE6IIBcd1OjEgF fVfQwTVwmNAjJRW/wkrOwt551I9abV7anstu7MlWYAZS4hp5Xt+ZKuHfsrvD/oQTJvQG TqfR6xlTry4RthGPj7kddqEyWhMUg90XbEJWNhn96HhKAs3sA7yBqEr2HzOGWkTFn4nK CLU8UG0Ner7z2F1tIExcPVWU4gZwvEwnHAWeW4R/VrmhXrfcPINWZzclrtNsx7QKLGCA zw/KGH7iQc7C17xNraUczjdsm4ZuZf1fEIZWBS9IbZSJkNHABRzMjWGFGxJ5qR75MsnG +0Gg== X-Gm-Message-State: AO0yUKUlF5IS4OCE/dk0EtK8LC6sVn8B6cKwVTg15wJVt66Srd+s9ZP/ C0RyufTlpWa8pn4yGGxg0ITYdeuvurKqVes7 X-Received: by 2002:a5d:4e08:0:b0:2cb:76d4:42ea with SMTP id p8-20020a5d4e08000000b002cb76d442eamr3658271wrt.36.1677507044482; Mon, 27 Feb 2023 06:10:44 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id l3-20020a05600012c300b002c5694aef92sm7166141wrx.21.2023.02.27.06.10.43 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 27 Feb 2023 06:10:44 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 103/126] hw/ide/atapi: Restrict 'scsi/constants.h' inclusion Date: Mon, 27 Feb 2023 15:01:50 +0100 Message-Id: <20230227140213.35084-94-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230227140213.35084-1-philmd@linaro.org> References: <20230227140213.35084-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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-bounces+patch=linaro.org@nongnu.org Only atapi.c requires the SCSI constants. No need to include it in all files including "hw/ide/internal.h". Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20230215112712.23110-7-philmd@linaro.org> Reviewed-by: Richard Henderson Reviewed-by: Alex Bennée --- hw/ide/atapi.c | 1 + include/hw/ide/internal.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 0a9aa6f009..0c36bd0afd 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -27,6 +27,7 @@ #include "hw/ide/internal.h" #include "hw/scsi/scsi.h" #include "sysemu/block-backend.h" +#include "scsi/constants.h" #include "trace.h" #define ATAPI_SECTOR_BITS (2 + BDRV_SECTOR_BITS) diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h index fc0aa81a88..29a8e79817 100644 --- a/include/hw/ide/internal.h +++ b/include/hw/ide/internal.h @@ -13,7 +13,6 @@ #include "hw/isa/isa.h" #include "sysemu/dma.h" #include "hw/block/block.h" -#include "scsi/constants.h" /* debug IDE devices */ #define USE_DMA_CDROM