From patchwork Wed Feb 15 11:26:58 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: 653700 Delivered-To: patch@linaro.org Received: by 2002:adf:f90f:0:0:0:0:0 with SMTP id b15csp280994wrr; Wed, 15 Feb 2023 03:29:29 -0800 (PST) X-Google-Smtp-Source: AK7set8SX+dvt5dV9FoxE60xGltpP4h7g/++WGgCkZnpJ0zZNlSNT17M39sUvW6Dfj+9FDype9JL X-Received: by 2002:a05:622a:100f:b0:3b9:bca3:d93d with SMTP id d15-20020a05622a100f00b003b9bca3d93dmr2864919qte.22.1676460569424; Wed, 15 Feb 2023 03:29:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676460569; cv=none; d=google.com; s=arc-20160816; b=geiUkf69dQg7eC4uD+aGCxkyP7tlc/bDWgjinZWzFrwi5HKTtEzHX7jhep0pRcnxLf ASvDlUhCQisGjfbf9zRuqqt/CweWhB6Mu9ysrRF6M5uoH/b7RGyPya/TrRbyQixWUQ25 t+uKxzg6MMdTaAOsMYLaQYxcZFs/C60RE26zY4sBVp5VIi4YjIy0PEhfK0nQzB3RWxhM AQskNVJEmGCrkrzs3xbge6/Li8eb7C+9TNoJc2J95A0iSglsv1KG2uGx/lAEX6EsplYr uvxtXKo0/2qWTVe9i7UerQ0YnJQWi03BSYCCLdyQOJPrxGmMbAgPwp57b4LPqgTvc0so 6mVg== 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:cc:to :from:dkim-signature; bh=HDxlxVOZMpWrGXNGMddy/NkpJei0Gesyel8wOOF9FHI=; b=ZU7y8EM6Jsg2NdGtoMpWvHj3Fh8q2S6c8pQ+NTvx3w4bfR5BOVK35mBrdyTkHSDNOX t65MiPW2IrA3gjEwUuKGDT5dlnOb/77zmSN14IoLEYtZ9h1sVWlcDMT1cReauf1fOnIM jC4HG8s1Gya1rxb6sPGgNfDAiy7R2YhvhaqCWwLFSj8g+0KpZTTVvUWq8wRADlWzL4GZ 3+SETmIgpGdqxIieHueQPQijxQGeMq+zQTt0u6pP5QgDFkSrKcSe84EjFFakVRe9uIkI sRRItrJYI7R5ArToSch1W+SaVxy+oEKTeyGIuUZDaheUdCbMtzYq5xwNUL1T0g7LoDpm O97w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E3EG9HjG; 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 s4-20020a05620a254400b0072a64b0660bsi14031152qko.310.2023.02.15.03.29.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Feb 2023 03:29:29 -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=E3EG9HjG; 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 1pSFx0-0000So-Pb; Wed, 15 Feb 2023 06:27:50 -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 1pSFww-0000Np-Uu for qemu-devel@nongnu.org; Wed, 15 Feb 2023 06:27:48 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pSFwv-0003Vy-Cu for qemu-devel@nongnu.org; Wed, 15 Feb 2023 06:27:46 -0500 Received: by mail-wm1-x336.google.com with SMTP id p5so678439wmg.4 for ; Wed, 15 Feb 2023 03:27:44 -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:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HDxlxVOZMpWrGXNGMddy/NkpJei0Gesyel8wOOF9FHI=; b=E3EG9HjGmp9f876gATkgg5yilXE0k3C+5ZI6BYww/sUBcfHLiRxhLrPn08LbI2orX6 Xz3KMPwEo7bQIjboWeP/OdgQemsycJa/sW6CtItEL1J1YdmoLg2156jpWZ5yr82/Wcxl Sme/UzZBJC/0n/Cpvnjz7j+6v7VMUKk7Mxtss7nAI6BFHpoq7NlkScnyVd/MV8WMdyiW caPhVLl9pRz/TG5N1smivJzWVAF5vdNSck/w5/VQPSiEOn+MOh/KJwGclI+bClulPfSb lf06Dlnhkc2vlb7XJBiWBu2lemwwyBB2WlkFRebRsJ+2OTEanaPn9mtcxrRdTlpL/adW WGQQ== 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HDxlxVOZMpWrGXNGMddy/NkpJei0Gesyel8wOOF9FHI=; b=QIA9PKTeioHFkX3LYuhnQDXahgPUsk95HsxdJxcxp7cqNUMZr+8lMPxGlI+RPIWI/O p3LCUtEJ9+giImfyyCeXmgSoHc2Q2hRiZGBUxWSs54X2eKFNkReBca+hy+GPYfQT1bfp I8Cm3kvSfeouEUkVlQ2mmUimYQLrqcthvBTm+1xIYZoBL8s4MXa43nNdDZzyIJSrTr9F +fT4fR3FkAqmToYWeHAI8ekduqqxBnPY4mWQtba/1FZoyenKz9YxiG3jSk07dltZo8vG J3t25aE82mPcaiZPkgp498iCNEAqomh+DyxdC7G91vYgmJ5aQHwslWfAvawDFbVa12YB y6aA== X-Gm-Message-State: AO0yUKXnDCtypT3oiGOBdC8N25DWwLideaHXi3vFT/LJsMw1E9Ti5GKy tX4XFzGQTZ0hLO7d+i3N3nVb0ACXfdfojsFl X-Received: by 2002:a05:600c:318f:b0:3df:e468:17dc with SMTP id s15-20020a05600c318f00b003dfe46817dcmr1679731wmp.40.1676460463380; Wed, 15 Feb 2023 03:27:43 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id o3-20020a05600c510300b003e2052bad94sm1395593wms.33.2023.02.15.03.27.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Feb 2023 03:27:43 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Eduardo Habkost , John Snow , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 06/20] hw/ide/atapi: Restrict 'scsi/constants.h' inclusion Date: Wed, 15 Feb 2023 12:26:58 +0100 Message-Id: <20230215112712.23110-7-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230215112712.23110-1-philmd@linaro.org> References: <20230215112712.23110-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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=unavailable 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é Reviewed-by: Richard Henderson --- 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