From nobody Fri May 17 03:13:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675752538; cv=none; d=zohomail.com; s=zohoarc; b=fVv282kg5MQR5ECU75qMeCkitWwnBbQ/z66aHYKOrz4PNnQPPNyxWZbW+RY6tqpClEmgp3cL+l7NvS0o3CJC9nt2M/Y6U2kAM87+nP+a18rKaXbhdh0oz4Ej5F8HTm3E66gJiDcZATKwP3UDukD4pyWeC5gnCb0C0P2wOT/d88U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675752538; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WLCEF4l0RAtVNgbN7tLKPlBbtpSUGZN8mX5pRk5Iuis=; b=ZyVjl7GCzhcdAStFoTrRNl/V2Mvc/QqjqnwtwmLdV2Fuhe3Qs+bJbZjWRjE2dzmu1gXshMjWcSWpmoVYXqhojEvPmirTE6lH2/MnRmldvW2wwXbae2Q49d9nNlepwkZpEGVcxkG4sqG8A0tfZPlqYznC/M2T/QcuVK8dTjWKQ3w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675752538730724.6565075728373; Mon, 6 Feb 2023 22:48:58 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHjS-00076m-Au; Tue, 07 Feb 2023 01:45:34 -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 1pPHjP-00075c-Uw for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjO-0003zF-2H for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:31 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-631-S10hFY8PNaC7IaTJZhAfWg-1; Tue, 07 Feb 2023 01:45:25 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5EB0C1C08969; Tue, 7 Feb 2023 06:45:25 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 36A61492C3C; Tue, 7 Feb 2023 06:45:25 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E283421E6A20; Tue, 7 Feb 2023 07:45:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WLCEF4l0RAtVNgbN7tLKPlBbtpSUGZN8mX5pRk5Iuis=; b=FilH/rMonAEv3guhH4EwV6Rmw3Krbw0TruD4G9nrhxFFXjq26sa0EYMGXXKrsSdfqbEWN9 E1xr4bUKE5di9ZYgSHuj28Q/fEWXOCpW3y9bPSdwQM0Gj/exOBW4TxOCI4HFcQSyGUZnAW +UfeHPBYPqDOp2F1tD2Ieg2Ouy0ceVA= X-MC-Unique: S10hFY8PNaC7IaTJZhAfWg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, "Michael S . Tsirkin" , Eric Blake Subject: [PULL 01/20] scripts/clean-includes: Fully skip / ignore files Date: Tue, 7 Feb 2023 07:45:04 +0100 Message-Id: <20230207064523.3968603-2-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752540100100011 Content-Type: text/plain; charset="utf-8" When clean-includes claims to skip or ignore a file, only the part that sanitizes use of qemu/osdep.h skips the file. The part that looks for duplicate #include does not, and neither does committing to Git. The latter can get unrelated stuff included in the commit, but only if you run clean-includes in a dirty tree, which is unwise. Messed up when we added skipping in commit fd3e39a40c "scripts/clean-includes: Enhance to handle header files". The former can cause bogus reports for --check-dup-head. Added in commit d66253e46a "scripts/clean-includes: added duplicate #include check", duplicating the prior mistake. Fix the script to fully skip files. Fixes: fd3e39a40ca2 ("scripts/clean-includes: Enhance to handle header file= s") Fixes: d66253e46ae2 ("scripts/clean-includes: added duplicate #include chec= k") Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Reviewed-by: Eric Blake Message-Id: <20230202133830.2152150-2-armbru@redhat.com> --- scripts/clean-includes | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/clean-includes b/scripts/clean-includes index d37bd4f692..86944f27fc 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -111,6 +111,7 @@ cat >"$COCCIFILE" < 1) print $0}' if [ $? -eq 0 ]; then echo "Found duplicate header file includes. Please check the above= files manually." @@ -184,7 +186,7 @@ if [ "$DUPHEAD" =3D "yes" ]; then fi =20 if [ "$GIT" =3D "yes" ]; then - git add -- "$@" + git add -- $files git commit --signoff -F - < (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16757525369361004.1984069937174; Mon, 6 Feb 2023 22:48:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHkf-00085A-K3; Tue, 07 Feb 2023 01:46: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 1pPHk1-0007LX-6h for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:46:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjz-00044B-Ff for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:46:08 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-629-NgY-KWpBNqGPht3JI7oKEQ-1; Tue, 07 Feb 2023 01:45:25 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5EE7185A5B1; Tue, 7 Feb 2023 06:45:25 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 36BD5492B21; Tue, 7 Feb 2023 06:45:25 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E4E3D21E6A21; Tue, 7 Feb 2023 07:45:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mio3AGiefmL/jc/ixLRzIIZ2DOgsg5gqJq29mnTQ8ok=; b=Kc+NDROeyjCt1yOfoS9sHuvSRqr1NdJ9E8XajcHgLM0SnGisgBsdJyTnziuNo6LzZZTGvk 0OYb5Xzxv2YyM8qTwwRNkSsKB02JgB1OHMPXwM8bSoTM1gUkb6HQPGuOQm+A9HBi5mqwKf fClWXX2+PXDtt/IzM8ag91xJvyANvxw= X-MC-Unique: NgY-KWpBNqGPht3JI7oKEQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, "Michael S . Tsirkin" , Eric Blake Subject: [PULL 02/20] scripts/clean-includes: Don't claim duplicate headers found when not Date: Tue, 7 Feb 2023 07:45:05 +0100 Message-Id: <20230207064523.3968603-3-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752538102100003 Content-Type: text/plain; charset="utf-8" When running with --check-dup-head, the script always claims it "Found duplicate header file includes." Fix to do it only when it actually found some. Fixes: d66253e46ae2 ("scripts/clean-includes: added duplicate #include chec= k") Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Reviewed-by: Eric Blake Message-Id: <20230202133830.2152150-3-armbru@redhat.com> --- scripts/clean-includes | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/clean-includes b/scripts/clean-includes index 86944f27fc..8e8420d785 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -177,9 +177,8 @@ for f in "$@"; do done =20 if [ "$DUPHEAD" =3D "yes" ] && [ -n "$files" ]; then - egrep "^[[:space:]]*#[[:space:]]*include" $files | tr -d '[:blank:]' \ - | sort | uniq -c | awk '{if ($1 > 1) print $0}' - if [ $? -eq 0 ]; then + if egrep "^[[:space:]]*#[[:space:]]*include" $files | tr -d '[:blank:]= ' \ + | sort | uniq -c | grep -v '^ *1 '; then echo "Found duplicate header file includes. Please check the above= files manually." exit 1 fi --=20 2.39.0 From nobody Fri May 17 03:13:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675752616; cv=none; d=zohomail.com; s=zohoarc; b=LwquO008FLXHayW6fAKNqWnGM3vK0jyuhBpkIvObo9WIwc7rQM8lNvMPwRysAxk+cgyHfHCsa6AER19qCJCLbfQo3XKWlJ4AEpK8y8xOLTDdgPllF1Rh7doB8t84/WY9kt6EFlX+SHjp/OvMeLpGNNWMzZRtJfMIEly96fUPDe4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675752616; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YmeLp6xk811nQ/fO7ZYXf9A8JHBkcMC0AWBOA6v1d5Y=; b=EjyQA/ZoD/bpQ6QVu45Z1ENo6ftFxNliaxWAKqNB0Ya+bAmX4bZz4h912PA2xidUWD5in6fL1IFplOrV61jW2XD05ac2lEDFE2gleWJ56CZ/IoEKLzY0PCdpmY7sIfvu0SRRU3rpiF0zrAFlR3jE4bDTN+rvi8Ow0R/ytwsJpbU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675752616535431.4720211274881; Mon, 6 Feb 2023 22:50:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHjl-00078o-5y; Tue, 07 Feb 2023 01:45:55 -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 1pPHjP-00075F-M8 for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjO-0003zD-2N for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:31 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-62-HhC7dLqnNBm2lI0eP9ZjEA-1; Tue, 07 Feb 2023 01:45:25 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5EA5980D0ED; Tue, 7 Feb 2023 06:45:25 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 368A22166B29; Tue, 7 Feb 2023 06:45:25 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E769621E6A22; Tue, 7 Feb 2023 07:45:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YmeLp6xk811nQ/fO7ZYXf9A8JHBkcMC0AWBOA6v1d5Y=; b=Xj0lqJirqOvadZyvtFfDLKUYJ2yZ8ygq6w+stzrrDyWRiG1v1lMFuILp5TzPGNHnj9WYiV g7eODfO6L855j0OXR4gXAcR0/vYnoFhrbyZZ/qX3cjGaFqS/JMvZVj5X0+a8z2S0E5QO+R A8WUB+ZGn8g40ICx9ahpiML/1sFMPrQ= X-MC-Unique: HhC7dLqnNBm2lI0eP9ZjEA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, "Michael S . Tsirkin" , Eric Blake Subject: [PULL 03/20] scripts/clean-includes: Skip symbolic links Date: Tue, 7 Feb 2023 07:45:06 +0100 Message-Id: <20230207064523.3968603-4-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752618388100003 Content-Type: text/plain; charset="utf-8" When a symbolic link points to a file that needs cleaning, the script replaces the link with a cleaned regular file. Not wanted; skip them. We have a few symbolic links under subprojects/libvduse/ and subprojects/libvhost-user/. Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Reviewed-by: Eric Blake Message-Id: <20230202133830.2152150-4-armbru@redhat.com> --- scripts/clean-includes | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/clean-includes b/scripts/clean-includes index 8e8420d785..f0466a6262 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -113,6 +113,10 @@ EOT =20 files=3D for f in "$@"; do + if [ -L "$f" ]; then + echo "SKIPPING $f (symbolic link)" + continue + fi case "$f" in *.c.inc) # These aren't standalone C source files --=20 2.39.0 From nobody Fri May 17 03:13:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675752377; cv=none; d=zohomail.com; s=zohoarc; b=Z/e1t9cx4r2Q1TaeIu2U6MNTXD58Q6oZP17ec57GquJPHi9wPK0dLjixTF/pKACHzRE5VisNkPuwWbrBJR8xulFY98eqUDX+4p1yja7Q8QJxtYXv84coyf0h0SpwN8fJR+g+Q5L23NG9qUl+bGzMtjIUB8Yg8ZvUOlcvgL7KEK8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675752377; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=h290jl/tV8uf8qI9r6sUMI+UrmA12JKxE3OAgW1eoyE=; b=MCh2mQz2xotqk6uJBTklXtrx5iUl6DHld+tuMe/ryURZHo17OUoAlg8d+WOqi2nt3rYe1qk6Dfku0y9R75l9xRgBGOk8FcsdKrlIG5dBBTguSFR33LH1UChUagJ+bqUi1YyJHySBSVFROyuAe9TgPTS7y5IltRZaS8ZqYjCWtQw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675752377383620.2522184981707; Mon, 6 Feb 2023 22:46:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHjT-000776-OK; Tue, 07 Feb 2023 01:45:35 -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 1pPHjP-00075I-MU for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjN-0003zB-Hv for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:31 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-629-isHVohtSO9OTJcIMlnG84w-1; Tue, 07 Feb 2023 01:45:25 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6042138012E7; Tue, 7 Feb 2023 06:45:25 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 36C3F2026E04; Tue, 7 Feb 2023 06:45:25 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E9D7C21E6A23; Tue, 7 Feb 2023 07:45:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h290jl/tV8uf8qI9r6sUMI+UrmA12JKxE3OAgW1eoyE=; b=h7Yb1TO4vHftBQ27vfIkyZjv60kByavvQOEWcONDcB8tZW58cDFvZQGnUAqEZryrWCpILe HfcIoY9A3ewpAK9YXe6ZVyosda/G+4m3OPRozFI2NO6Ddmd/dUmuYRBEpgmddVu56WYRK+ KLvONAvr2NWztrKbRbATM5Nu0NXGsSs= X-MC-Unique: isHVohtSO9OTJcIMlnG84w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Juan Quintela Subject: [PULL 04/20] scripts/clean-includes: Improve --git commit message Date: Tue, 7 Feb 2023 07:45:07 +0100 Message-Id: <20230207064523.3968603-5-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752379138100003 Content-Type: text/plain; charset="utf-8" The script drops #include "qemu/osdep.h" from headers. Mention it in the commit message it uses for --git. Signed-off-by: Markus Armbruster Reviewed-by: Juan Quintela Message-Id: <20230202133830.2152150-5-armbru@redhat.com> --- scripts/clean-includes | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/clean-includes b/scripts/clean-includes index f0466a6262..58e1607a82 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -193,11 +193,17 @@ if [ "$GIT" =3D "yes" ]; then git commit --signoff -F - < (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675752381920475.5877803124416; Mon, 6 Feb 2023 22:46:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHjw-0007KJ-A9; Tue, 07 Feb 2023 01:46:04 -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 1pPHjU-00077I-7u for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjR-00040k-Ho for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:35 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-37-OZNHb6LoOuWHvyxRZug3mA-1; Tue, 07 Feb 2023 01:45:27 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E083385CBE8; Tue, 7 Feb 2023 06:45:26 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A12622026D37; Tue, 7 Feb 2023 06:45:26 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id EC4BE21E6A24; Tue, 7 Feb 2023 07:45:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v4Fqz8WHpO8MeziwDo5BgBz2HpsME8oFRO9k7rvWsjc=; b=QDRJv5ns0CiffvXp1pmi78OqUH7750Tb5/2AV/6Rthy9lFv5W7/3Rw7clBIdVIhihEJkf/ X3e6tb4cXk4PNMBnbuwFzKVWaoMCOY8K1bU4jM62LUWPnQydLQTn7lL2eoHNdHjogYIyVK C0fr+URG5I66VyTdUJ6OsOmF6kvhXl0= X-MC-Unique: OZNHb6LoOuWHvyxRZug3mA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Warner Losh , "Michael S . Tsirkin" Subject: [PULL 05/20] bsd-user: Clean up includes Date: Tue, 7 Feb 2023 07:45:08 +0100 Message-Id: <20230207064523.3968603-6-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752383186100003 Content-Type: text/plain; charset="utf-8" This commit was created with scripts/clean-includes. All .c should include qemu/osdep.h first. The script performs three related cleanups: * Ensure .c files include qemu/osdep.h first. * Including it in a .h is redundant, since the .c already includes it. Drop such inclusions. * Likewise, including headers qemu/osdep.h includes is redundant. Drop these, too. Signed-off-by: Markus Armbruster Reviewed-by: Warner Losh Reviewed-by: Michael S. Tsirkin Message-Id: <20230202133830.2152150-6-armbru@redhat.com> --- bsd-user/bsd-proc.h | 4 ---- bsd-user/qemu.h | 1 - bsd-user/arm/signal.c | 1 + bsd-user/arm/target_arch_cpu.c | 2 ++ bsd-user/freebsd/os-sys.c | 1 + bsd-user/i386/signal.c | 1 + bsd-user/i386/target_arch_cpu.c | 3 +-- bsd-user/main.c | 4 +--- bsd-user/strace.c | 1 - bsd-user/x86_64/signal.c | 1 + bsd-user/x86_64/target_arch_cpu.c | 3 +-- 11 files changed, 9 insertions(+), 13 deletions(-) diff --git a/bsd-user/bsd-proc.h b/bsd-user/bsd-proc.h index 68b66e571d..a1061bffb8 100644 --- a/bsd-user/bsd-proc.h +++ b/bsd-user/bsd-proc.h @@ -20,11 +20,7 @@ #ifndef BSD_PROC_H_ #define BSD_PROC_H_ =20 -#include -#include -#include #include -#include =20 /* exit(2) */ static inline abi_long do_bsd_exit(void *cpu_env, abi_long arg1) diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index be6105385e..0ceecfb6df 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -17,7 +17,6 @@ #ifndef QEMU_H #define QEMU_H =20 -#include "qemu/osdep.h" #include "cpu.h" #include "qemu/units.h" #include "exec/cpu_ldst.h" diff --git a/bsd-user/arm/signal.c b/bsd-user/arm/signal.c index 2b1dd745d1..9734407543 100644 --- a/bsd-user/arm/signal.c +++ b/bsd-user/arm/signal.c @@ -17,6 +17,7 @@ * along with this program; if not, see . */ =20 +#include "qemu/osdep.h" #include "qemu.h" =20 /* diff --git a/bsd-user/arm/target_arch_cpu.c b/bsd-user/arm/target_arch_cpu.c index 02bf9149d5..fe38ae2210 100644 --- a/bsd-user/arm/target_arch_cpu.c +++ b/bsd-user/arm/target_arch_cpu.c @@ -16,6 +16,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ + +#include "qemu/osdep.h" #include "target_arch.h" =20 void target_cpu_set_tls(CPUARMState *env, target_ulong newtls) diff --git a/bsd-user/freebsd/os-sys.c b/bsd-user/freebsd/os-sys.c index 309e27b9d6..1676ec10f8 100644 --- a/bsd-user/freebsd/os-sys.c +++ b/bsd-user/freebsd/os-sys.c @@ -17,6 +17,7 @@ * along with this program; if not, see . */ =20 +#include "qemu/osdep.h" #include "qemu.h" #include "target_arch_sysarch.h" =20 diff --git a/bsd-user/i386/signal.c b/bsd-user/i386/signal.c index 5dd975ce56..a3131047b8 100644 --- a/bsd-user/i386/signal.c +++ b/bsd-user/i386/signal.c @@ -17,6 +17,7 @@ * along with this program; if not, see . */ =20 +#include "qemu/osdep.h" #include "qemu.h" =20 /* diff --git a/bsd-user/i386/target_arch_cpu.c b/bsd-user/i386/target_arch_cp= u.c index d349e45299..2a3af2ddef 100644 --- a/bsd-user/i386/target_arch_cpu.c +++ b/bsd-user/i386/target_arch_cpu.c @@ -17,9 +17,8 @@ * along with this program; if not, see . */ =20 -#include - #include "qemu/osdep.h" + #include "cpu.h" #include "qemu.h" #include "qemu/timer.h" diff --git a/bsd-user/main.c b/bsd-user/main.c index 6f09180d65..41290e16f9 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -18,12 +18,10 @@ * along with this program; if not, see . */ =20 -#include -#include +#include "qemu/osdep.h" #include #include =20 -#include "qemu/osdep.h" #include "qemu/help-texts.h" #include "qemu/units.h" #include "qemu/accel.h" diff --git a/bsd-user/strace.c b/bsd-user/strace.c index a77d10dd6b..96499751eb 100644 --- a/bsd-user/strace.c +++ b/bsd-user/strace.c @@ -20,7 +20,6 @@ #include #include #include -#include =20 #include "qemu.h" =20 diff --git a/bsd-user/x86_64/signal.c b/bsd-user/x86_64/signal.c index c3875bc4c6..46cb865180 100644 --- a/bsd-user/x86_64/signal.c +++ b/bsd-user/x86_64/signal.c @@ -16,6 +16,7 @@ * along with this program; if not, see . */ =20 +#include "qemu/osdep.h" #include "qemu.h" =20 /* diff --git a/bsd-user/x86_64/target_arch_cpu.c b/bsd-user/x86_64/target_arc= h_cpu.c index be7bd10720..1d32f18907 100644 --- a/bsd-user/x86_64/target_arch_cpu.c +++ b/bsd-user/x86_64/target_arch_cpu.c @@ -17,9 +17,8 @@ * along with this program; if not, see . */ =20 -#include - #include "qemu/osdep.h" + #include "cpu.h" #include "qemu.h" #include "qemu/timer.h" --=20 2.39.0 From nobody Fri May 17 03:13:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675752646; cv=none; d=zohomail.com; s=zohoarc; b=G34agn+oQrTFGUokYnyTTF7aglZ4ms6svw04K65X3y/7QPXyGc+zOdDFeT1epn2iqk0o/+DUxjhIJ8uUjstgeCMLFjwwzFjo6v8m4WRVYiw+pcq9JdW44/exBvbEk7ERvHgiDYLlVMUmaT1q+YdBihvajWTmzPxvYkqOIpaC7S0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675752646; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TbyDkxR5dLH0/WOl4HmUzQjGzmSY8YhxMJraVX7STN4=; b=PgRBoFE74O66q8Jb/FZwBIqFGd9puwuf1bNbdvZTxeUICL88waoey88qcifY7YLl7Ut7vWz/RaMAyak8HY4musG2RZf2kAFceTpTE5NK09jPEXWDt5ehtaD2P8RdoiUQnB+OtMfvIIC6hmv5iF723GCNAY+sA7ps/XGu30cgsXA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16757526469361009.856659673966; Mon, 6 Feb 2023 22:50:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHjs-0007IT-DK; Tue, 07 Feb 2023 01:46:00 -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 1pPHjR-00076F-97 for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:33 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjP-0003zv-LG for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:32 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-78-MRmpyX8ZMbuk0ZwECMRsfA-1; Tue, 07 Feb 2023 01:45:27 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AC56180D0F0; Tue, 7 Feb 2023 06:45:26 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 89C51140EBF4; Tue, 7 Feb 2023 06:45:26 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id EEA1521E6A25; Tue, 7 Feb 2023 07:45:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TbyDkxR5dLH0/WOl4HmUzQjGzmSY8YhxMJraVX7STN4=; b=OFVaqfC/BSHDt4hD4qe1X/K22Dkxq3vEDtXrnjIMtDvN0+NUDJ0hM0rqVXMbrgxLTYqWe0 YDDR0Gu05hxV7JZU27SbQfoVOunsG0ALnEna5V6+H6KulUzzyu2R7Cc3w56tkH26DNlAnz rMJJddvjmFD8ebyiGTDjfUZ/DUPmoYc= X-MC-Unique: MRmpyX8ZMbuk0ZwECMRsfA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S . Tsirkin" Subject: [PULL 06/20] crypto: Clean up includes Date: Tue, 7 Feb 2023 07:45:09 +0100 Message-Id: <20230207064523.3968603-7-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752648665100003 This commit was created with scripts/clean-includes. All .c should include qemu/osdep.h first. The script performs three related cleanups: * Ensure .c files include qemu/osdep.h first. * Including it in a .h is redundant, since the .c already includes it. Drop such inclusions. * Likewise, including headers qemu/osdep.h includes is redundant. Drop these, too. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael S. Tsirkin Message-Id: <20230202133830.2152150-7-armbru@redhat.com> --- crypto/block-luks-priv.h | 1 - 1 file changed, 1 deletion(-) diff --git a/crypto/block-luks-priv.h b/crypto/block-luks-priv.h index dc2dd14e52..8fc967afcb 100644 --- a/crypto/block-luks-priv.h +++ b/crypto/block-luks-priv.h @@ -18,7 +18,6 @@ * */ =20 -#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/bswap.h" =20 --=20 2.39.0 From nobody Fri May 17 03:13:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675752895; cv=none; d=zohomail.com; s=zohoarc; b=RhkAYK6DWU1ciE6Ogv9R3167WBYjWHN9koB0xHG7F69nAnlgHqd4q+t3TMBCh1u4Non+mmVXKxudJhzLyGrIM3L2ILf56Oq+mhiIkYv6nRBnjYELOmk/zY4jF/DSCkIpDOiJzYVS8QmPt9PybBjTtHgV37syRjeMcijJ7jOo2Do= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675752895; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VyKjmmsSGipP123CSA3gXhn76wRU2ii6MXOg1K5qTBU=; b=SiNhdXoVx8UEBVIlSAtQHty54rGKfiyoNUTLY7vx7Z9eaAHYj7plqXFHZg6wmnA+QxmPOdzRjbQG5qabol1UMbbmmw0Z+c1W63izpHe2+yEy83KHUoCis3bOOneWu+VVMGof7QMrl8bVQiQQgme12ahPEEwqt3kpGp1MVBcqB6I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675752895307713.4566875411242; Mon, 6 Feb 2023 22:54:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHjr-0007Hp-HU; Tue, 07 Feb 2023 01:45:59 -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 1pPHjR-00075v-3s for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:33 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjP-0003zj-Ef for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:32 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-204-mhL7AFljO1utO0MQPDV_oQ-1; Tue, 07 Feb 2023 01:45:27 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 118AF857D07; Tue, 7 Feb 2023 06:45:27 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E3814492B21; Tue, 7 Feb 2023 06:45:26 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id F11D721E6A26; Tue, 7 Feb 2023 07:45:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VyKjmmsSGipP123CSA3gXhn76wRU2ii6MXOg1K5qTBU=; b=B20bVCjmdgOSmq+NUM1OOQcbbI75c0nnm9/QX6/4enWkrFtUKjX5J1h1p9FAimLTEX+xd/ b/75LvRdBPrPXOC68zar/CN570j/5tFC4uKJylt98+dZslAxHfIo4UHrfPec9/PSo8bAQg wKLPupiQWOqv9QGK4s5L+FaX548IDaI= X-MC-Unique: mhL7AFljO1utO0MQPDV_oQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, "Michael S . Tsirkin" , Jonathan Cameron Subject: [PULL 07/20] hw/cxl: Clean up includes Date: Tue, 7 Feb 2023 07:45:10 +0100 Message-Id: <20230207064523.3968603-8-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752895983100003 Content-Type: text/plain; charset="utf-8" This commit was created with scripts/clean-includes. All .c should include qemu/osdep.h first. The script performs three related cleanups: * Ensure .c files include qemu/osdep.h first. * Including it in a .h is redundant, since the .c already includes it. Drop such inclusions. * Likewise, including headers qemu/osdep.h includes is redundant. Drop these, too. Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Message-Id: <20230202133830.2152150-8-armbru@redhat.com> Acked-by: Jonathan Cameron --- include/hw/cxl/cxl_component.h | 2 -- include/hw/cxl/cxl_host.h | 1 - include/hw/cxl/cxl_pci.h | 1 - 3 files changed, 4 deletions(-) diff --git a/include/hw/cxl/cxl_component.h b/include/hw/cxl/cxl_component.h index 5dca21e95b..692d7a5507 100644 --- a/include/hw/cxl/cxl_component.h +++ b/include/hw/cxl/cxl_component.h @@ -15,9 +15,7 @@ #define CXL2_COMPONENT_CM_REGION_SIZE 0x1000 #define CXL2_COMPONENT_BLOCK_SIZE 0x10000 =20 -#include "qemu/compiler.h" #include "qemu/range.h" -#include "qemu/typedefs.h" #include "hw/cxl/cxl_cdat.h" #include "hw/register.h" #include "qapi/error.h" diff --git a/include/hw/cxl/cxl_host.h b/include/hw/cxl/cxl_host.h index a1b662ce40..c9bc9c7c50 100644 --- a/include/hw/cxl/cxl_host.h +++ b/include/hw/cxl/cxl_host.h @@ -7,7 +7,6 @@ * COPYING file in the top-level directory. */ =20 -#include "qemu/osdep.h" #include "hw/cxl/cxl.h" #include "hw/boards.h" =20 diff --git a/include/hw/cxl/cxl_pci.h b/include/hw/cxl/cxl_pci.h index 01e15ed5b4..407be95b9e 100644 --- a/include/hw/cxl/cxl_pci.h +++ b/include/hw/cxl/cxl_pci.h @@ -10,7 +10,6 @@ #ifndef CXL_PCI_H #define CXL_PCI_H =20 -#include "qemu/compiler.h" =20 #define CXL_VENDOR_ID 0x1e98 =20 --=20 2.39.0 From nobody Fri May 17 03:13:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675752378; cv=none; d=zohomail.com; s=zohoarc; b=BqRhQuzVCq8eBC8EmjXPreV3Wbgy/B6pVRPuUkBAw71RPF6c+XpDYGimd3BiOjbFhFIgkKUj6IV+TdBn3zuIFmkzfQbz6JkZcwxzk+EDfVjvi/XuwVdQx/rmAQ+YeNzDFj7Jpsph/SJ2nIFt7YQWxEstU9Out9ce1si/8i1l1WY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675752378; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=h/73WI2wxjygWlvRwnVtAjNZYNmF/Z9nNpljCWw6qKI=; b=FeykLfs4+8J/w86usZ7QyxhosMMVO0WFJe3/PxhIt1xqkcGX7SqCOglWxcQ55JID183xGZenMqxCXmtIddHj1GFg6pwfQpbANdU4XxUyA2kP7owMs4lJOAEQ1kfPqjsKElpjl8fJu3KmiU9RWg771BzfWDlKzOxng6ep+5A9has= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675752378371830.2359019169842; Mon, 6 Feb 2023 22:46:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHjS-00076h-6i; Tue, 07 Feb 2023 01:45:34 -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 1pPHjO-00074u-IN for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjN-0003z4-5f for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:30 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-78-INmIdBczN7SI_yPIBNS4Ew-1; Tue, 07 Feb 2023 01:45:27 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AA7B9858F09; Tue, 7 Feb 2023 06:45:26 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 89685400DFDB; Tue, 7 Feb 2023 06:45:26 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id F34E321E6A28; Tue, 7 Feb 2023 07:45:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h/73WI2wxjygWlvRwnVtAjNZYNmF/Z9nNpljCWw6qKI=; b=O27AIj38sIBVZbfvR3fAhZM9FZCU6stzQbrt3PGA1S2RkcxXqnSk+ztxgaNzZWip9y5bgW /NAvrbQdgqTdlgRpzxhZhfQ7abXdhUqkHQTdDh7OyyyX+rmcAts/GBI+aNUseRqF7S1fdW +XrkVAPp5KXguK4yFEm5LMcaViEzy/E= X-MC-Unique: INmIdBczN7SI_yPIBNS4Ew-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, "Michael S . Tsirkin" Subject: [PULL 08/20] hw/input: Clean up includes Date: Tue, 7 Feb 2023 07:45:11 +0100 Message-Id: <20230207064523.3968603-9-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752379138100004 Content-Type: text/plain; charset="utf-8" This commit was created with scripts/clean-includes. All .c should include qemu/osdep.h first. The script performs three related cleanups: * Ensure .c files include qemu/osdep.h first. * Including it in a .h is redundant, since the .c already includes it. Drop such inclusions. * Likewise, including headers qemu/osdep.h includes is redundant. Drop these, too. Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Message-Id: <20230202133830.2152150-9-armbru@redhat.com> --- include/hw/input/pl050.h | 1 - hw/input/tsc210x.c | 1 - 2 files changed, 2 deletions(-) diff --git a/include/hw/input/pl050.h b/include/hw/input/pl050.h index 89ec4fafc9..4cb8985f31 100644 --- a/include/hw/input/pl050.h +++ b/include/hw/input/pl050.h @@ -10,7 +10,6 @@ #ifndef HW_PL050_H #define HW_PL050_H =20 -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/input/ps2.h" diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c index fdd5ff87d9..7eae5989f7 100644 --- a/hw/input/tsc210x.c +++ b/hw/input/tsc210x.c @@ -20,7 +20,6 @@ */ =20 #include "qemu/osdep.h" -#include "qemu/log.h" #include "hw/hw.h" #include "audio/audio.h" #include "qemu/timer.h" --=20 2.39.0 From nobody Fri May 17 03:13:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675752618; cv=none; d=zohomail.com; s=zohoarc; b=QduVilkZJZCBJfkM3Jpo7ifyLOwDRRYk94ap9lvqL9bWWY9/0citCudQDasJxYDYhkx3OVVIfERUja1bug7c47BNReqESf3QPZ5D1iO3pTCVLDPxAqtVnrKCTg0+NP0t/8OmTIQNAp2x0DAF+KaOl8XPkFddyDLxHvwawPthlxk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675752618; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WOCqh0Ouf9lk7FdEGkKrbLzSKUzB7kmriObL8PDTGjQ=; b=IObLvycKxT/WUoODbMh4JLzkpmk9auxvddyhNCHfIZ/HklW7hZ+ZMeKsn+hNWHfa0/XNt7Dqq+wl1vgOc/6PzLqCrk4IOwJtUciavH7vOxecbCt3/+4F/Jk117452wGibbrmXLeajpaC5QcaqM1TWAseJ2IMgEA96no4mwBO6io= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675752618764560.4213955239366; Mon, 6 Feb 2023 22:50:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHjo-0007CV-6k; Tue, 07 Feb 2023 01:45:56 -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 1pPHjR-000766-6b for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:33 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjP-0003zm-CM for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:32 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-74-ZenzJsX5MCKathV29n6Z5g-1; Tue, 07 Feb 2023 01:45:27 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AC82B29AB3F3; Tue, 7 Feb 2023 06:45:26 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 89559C15BAD; Tue, 7 Feb 2023 06:45:26 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 019C621E6900; Tue, 7 Feb 2023 07:45:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WOCqh0Ouf9lk7FdEGkKrbLzSKUzB7kmriObL8PDTGjQ=; b=TUBBU449B+zOXyk7zcUl2t4IiusJa+qAW6ctUnMpk9Gkn9EDl8iP2AFgwaG7zsHkJCfx3U sACnlHTaSSWC9TFvHhYSAXTTcQRZyfFLAg0jNFsBaTsFzT+4e7WM8xr0k09BWm8uWckma6 8Zy2mpuo2x2olPPoI7ylNIHvAIN3yas= X-MC-Unique: ZenzJsX5MCKathV29n6Z5g-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S . Tsirkin" Subject: [PULL 09/20] hw/tricore: Clean up includes Date: Tue, 7 Feb 2023 07:45:12 +0100 Message-Id: <20230207064523.3968603-10-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752620444100007 This commit was created with scripts/clean-includes. All .c should include qemu/osdep.h first. The script performs three related cleanups: * Ensure .c files include qemu/osdep.h first. * Including it in a .h is redundant, since the .c already includes it. Drop such inclusions. * Likewise, including headers qemu/osdep.h includes is redundant. Drop these, too. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael S. Tsirkin Message-Id: <20230202133830.2152150-10-armbru@redhat.com> --- include/hw/tricore/triboard.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/hw/tricore/triboard.h b/include/hw/tricore/triboard.h index 094c8bd563..4fdd2d7d97 100644 --- a/include/hw/tricore/triboard.h +++ b/include/hw/tricore/triboard.h @@ -18,7 +18,6 @@ * License along with this library; if not, see . */ =20 -#include "qemu/osdep.h" #include "qapi/error.h" #include "hw/boards.h" #include "sysemu/sysemu.h" --=20 2.39.0 From nobody Fri May 17 03:13:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675752378; cv=none; d=zohomail.com; s=zohoarc; b=eXTZ1+idH0PwigrEb+vjIS/tjEM+z+AOulsTteZt91gbpbFgovTAgkf2N02LiFvJ470fV23TavWAXHE0LUzHB+nCxaCn38oUrPLHrYBUCKE8fpyaCOkpzJi6a8qSSVKGYiiLxkBKUP2qom1wXMu2oRJZDq6O7f3et7W7iQRZAiQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675752378; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XAFLlF366IRpOgTTPxU8jSKPAlBQ8uZkSp1iE3vAEa4=; b=LopksLafOz5QbcwnloXfOWeL/Xm38kOK4C+7qwXoFRxAWgndNn+Y2YmJCR2zuAE9onwyEx0qr2PbGpP7gHjGbmhB44zJwpSnF8zqyRqHXkb2JFuc0llWG2M7+hclwY4UEALMK9gKb6FSd4YhjrfXB5yg1xk+YQio9ogONbyssNo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675752378234162.6331681562309; Mon, 6 Feb 2023 22:46:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHjT-00077A-Q2; Tue, 07 Feb 2023 01:45:35 -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 1pPHjP-00075E-JF for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjN-0003z3-5m for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:31 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-78-mp2j6YVhOUuoIWmwdPslzg-1; Tue, 07 Feb 2023 01:45:27 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ABDD638012E7; Tue, 7 Feb 2023 06:45:26 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8A29B492B22; Tue, 7 Feb 2023 06:45:26 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0419A21E6901; Tue, 7 Feb 2023 07:45:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XAFLlF366IRpOgTTPxU8jSKPAlBQ8uZkSp1iE3vAEa4=; b=S0qf/qO0GNjf2C5XVIgFbxWpv+T1SnDCYfWOfeuCTJLifj5zdd4CKEQlLyaSO/sVUj117M YG9RDe7QRKkCvt34PTmPPWaXooeQYIroDSbgzLTYmZ8p+4qOsci22hG85vweNFqZ52EGDe /kn0kpyIwXULcLAABJOTijQ3UF57jQI= X-MC-Unique: mp2j6YVhOUuoIWmwdPslzg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Konstantin Kostiuk , "Michael S . Tsirkin" Subject: [PULL 10/20] qga: Clean up includes Date: Tue, 7 Feb 2023 07:45:13 +0100 Message-Id: <20230207064523.3968603-11-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752379252100009 Content-Type: text/plain; charset="utf-8" This commit was created with scripts/clean-includes. All .c should include qemu/osdep.h first. The script performs three related cleanups: * Ensure .c files include qemu/osdep.h first. * Including it in a .h is redundant, since the .c already includes it. Drop such inclusions. * Likewise, including headers qemu/osdep.h includes is redundant. Drop these, too. Signed-off-by: Markus Armbruster Reviewed-by: Konstantin Kostiuk Reviewed-by: Michael S. Tsirkin Message-Id: <20230202133830.2152150-11-armbru@redhat.com> --- qga/cutils.h | 2 -- qga/commands-posix.c | 1 - qga/cutils.c | 3 ++- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/qga/cutils.h b/qga/cutils.h index f0f30a7d28..c1f2f4b17a 100644 --- a/qga/cutils.h +++ b/qga/cutils.h @@ -1,8 +1,6 @@ #ifndef CUTILS_H_ #define CUTILS_H_ =20 -#include "qemu/osdep.h" - int qga_open_cloexec(const char *name, int flags, mode_t mode); =20 #endif /* CUTILS_H_ */ diff --git a/qga/commands-posix.c b/qga/commands-posix.c index ebd33a643c..079689d79a 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -51,7 +51,6 @@ #else #include #endif -#include #ifdef CONFIG_SOLARIS #include #endif diff --git a/qga/cutils.c b/qga/cutils.c index b8e142ef64..b21bcf3683 100644 --- a/qga/cutils.c +++ b/qga/cutils.c @@ -2,8 +2,9 @@ * This work is licensed under the terms of the GNU GPL, version 2 or late= r. * See the COPYING file in the top-level directory. */ -#include "cutils.h" =20 +#include "qemu/osdep.h" +#include "cutils.h" #include "qapi/error.h" =20 /** --=20 2.39.0 From nobody Fri May 17 03:13:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675752884; cv=none; d=zohomail.com; s=zohoarc; b=g9H9pJvqTjU8brqKPGDoHzMcPYt3IkD2r8ywwzkUIU92WTOikxbqZ9Bfdu7yyUCUuE0dpbyd+rQbl56Ae+wx91gUcStYDmf4iG55CBjbWtRAjow0c6yB0Zk/upeDoggsRdtSVfl297iqMHiIg+R6PfBrE1vEG9CGQ3JB3wPXzlQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675752884; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=W8kmPlQQxffAVXPX6qzLhAXD9Nw3mbZV0QLD3w/pX5I=; b=TsYQYY3+L9Q4BbnT6jCCO2dRGJg6X3Da51lS2NIA37suHERfuk8n+VO3QArZ7wgOW9KNp5OCOjkTbqmOmt8nqHlMZxJcY6WASJzCMWv/G48SheQeO2AOtuQWCWttA7zWUkabp2ylWld/31Bti6Nkh1pruaLZGlBbFiUHDk68iKc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16757528841971001.9962912709713; Mon, 6 Feb 2023 22:54:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHjv-0007KK-DU; Tue, 07 Feb 2023 01:46:03 -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 1pPHjT-00077E-RU for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjR-00040i-7y for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:35 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-292-NwhVslh4PKSAqKWfdO8xng-1; Tue, 07 Feb 2023 01:45:27 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AA831800B23; Tue, 7 Feb 2023 06:45:26 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 89618492B21; Tue, 7 Feb 2023 06:45:26 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 068CB21E690F; Tue, 7 Feb 2023 07:45:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=W8kmPlQQxffAVXPX6qzLhAXD9Nw3mbZV0QLD3w/pX5I=; b=Jpd1QSxOMUMbEvnbLjKqfvuEEAU86tJ/v2a4eCKa4as5CZDKO1GJyianeG2X13wAt8mlsw so+VpdN6oL2GDg7BcG4hAJUKCG2tiDlYSX3xxymXb61FbLqWgFflqBncBSbwlpN7KuKZyL bL52kRDXeNaGyemWJRW0/+mA+n0ajuc= X-MC-Unique: NwhVslh4PKSAqKWfdO8xng-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, "Dr . David Alan Gilbert" , "Michael S . Tsirkin" , Juan Quintela Subject: [PULL 11/20] migration: Clean up includes Date: Tue, 7 Feb 2023 07:45:14 +0100 Message-Id: <20230207064523.3968603-12-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752886004100003 Content-Type: text/plain; charset="utf-8" This commit was created with scripts/clean-includes. All .c should include qemu/osdep.h first. The script performs three related cleanups: * Ensure .c files include qemu/osdep.h first. * Including it in a .h is redundant, since the .c already includes it. Drop such inclusions. * Likewise, including headers qemu/osdep.h includes is redundant. Drop these, too. Signed-off-by: Markus Armbruster Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Michael S. Tsirkin Reviewed-by: Juan Quintela Message-Id: <20230202133830.2152150-12-armbru@redhat.com> --- include/qemu/userfaultfd.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/qemu/userfaultfd.h b/include/qemu/userfaultfd.h index 6b74f92792..55c95998e8 100644 --- a/include/qemu/userfaultfd.h +++ b/include/qemu/userfaultfd.h @@ -13,7 +13,6 @@ #ifndef USERFAULTFD_H #define USERFAULTFD_H =20 -#include "qemu/osdep.h" #include "exec/hwaddr.h" #include =20 --=20 2.39.0 From nobody Fri May 17 03:13:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675752536; cv=none; d=zohomail.com; s=zohoarc; b=R4+9yu31V3HqngqwgciWw9mVxumPBVYq/p9rjpGlwpUjNX8Ph1G/9XRgRaJeLcIFk/FyO+vFeDBxuhdhEmJ0N2LnhKPdcp9TGBtdwmo3syoAuC0Q8qGSzYfkpyN4rhRCTof5x3+eT5qcdAJPDZuvW85L9i1WhWEpQEx5H4akMH0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675752536; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+C6wV+P61LrLb2jloR7AjMfWpFMLNmpllPtxSRkkEdw=; b=IbnOtdzkRCQGCGwmE8TLBK/eHZivR94+5K/bP1wJGlmB6M/EXvJcw3Faq8+KzFOwxIcYXDM7/CbbYKfJCDsfDzxbjARm1pXBBMBGGxTDqlEIwPS7a6q0jbNVo1NVbzRbZKJ1DxcXAnFhDhtZiM7cMU6M8eUCCxlXzWLckugSrQ8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675752536426107.20625629868641; Mon, 6 Feb 2023 22:48:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHjs-0007IO-AC; Tue, 07 Feb 2023 01:46:00 -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 1pPHjV-00077p-4T for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjS-00041Q-FL for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:36 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-74-be4Al44fOdO1tmdo9tmc_Q-1; Tue, 07 Feb 2023 01:45:27 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AC44A858F0E; Tue, 7 Feb 2023 06:45:26 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8946AC15BA0; Tue, 7 Feb 2023 06:45:26 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 08DA421E6913; Tue, 7 Feb 2023 07:45:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+C6wV+P61LrLb2jloR7AjMfWpFMLNmpllPtxSRkkEdw=; b=S7TfXMVglwaXmjPDb2kCXdqldo13qLPWVmDGxlagrQIBdP40aLKFbGqb3kQiy4M0pQWWeU wWT6HtEM3z6jEb6kCnJgW4F0+zKv8OhPckYm38ESb9CO8MK3B/CC9+tT+rb9T9rcbsT8va X4dcYn7ncWl4D4kHIIw8M7G731oRIXg= X-MC-Unique: be4Al44fOdO1tmdo9tmc_Q-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S . Tsirkin" Subject: [PULL 12/20] net: Clean up includes Date: Tue, 7 Feb 2023 07:45:15 +0100 Message-Id: <20230207064523.3968603-13-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752538120100004 This commit was created with scripts/clean-includes. All .c should include qemu/osdep.h first. The script performs three related cleanups: * Ensure .c files include qemu/osdep.h first. * Including it in a .h is redundant, since the .c already includes it. Drop such inclusions. * Likewise, including headers qemu/osdep.h includes is redundant. Drop these, too. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael S. Tsirkin Message-Id: <20230202133830.2152150-13-armbru@redhat.com> --- net/vmnet_int.h | 1 - 1 file changed, 1 deletion(-) diff --git a/net/vmnet_int.h b/net/vmnet_int.h index adf6e8c20d..d0b90594f2 100644 --- a/net/vmnet_int.h +++ b/net/vmnet_int.h @@ -10,7 +10,6 @@ #ifndef VMNET_INT_H #define VMNET_INT_H =20 -#include "qemu/osdep.h" #include "vmnet_int.h" #include "clients.h" =20 --=20 2.39.0 From nobody Fri May 17 03:13:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675752400; cv=none; d=zohomail.com; s=zohoarc; b=CrH+vsMEldxE5i+RDdspmtTw5WNTY8FXbRXs6ETx3sD7+qQx4k99PucnFtb9owSu8mL05ZyddMwu1aoaBHOL9nDS+Was4ubGaVzp3bfgMOjqkitUvUrAEt7h3FH9aH46w1CyV7y25zM70Ux245DNHG9E5yC5wqGbans/Z7YS0kc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675752400; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0+vzG9psU6DnR2uT7ryMZ+h+3Ec3AhK/lm+UEgyc0G8=; b=nE3cU0hMxz7dpFLrRpiwE1kXFeK1iC+SZNPBIm3g1sHjHx6/iJ+S4jGzby4NFmuHa9QE90umZqP8durYNzd7Gm4dgAjBg4lEBiVuy7Hzo2sMxsIjXTt9FAyDVcXrgQfXCZcwr5kN/f0UbZqUJW8qvMPnHO8JYbZi3gT+imbf0HY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675752400315304.1620803097219; Mon, 6 Feb 2023 22:46:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHjw-0007Kd-7H; Tue, 07 Feb 2023 01:46:04 -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 1pPHjT-00077F-W7 for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjR-000417-L3 for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:35 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-74-raD_FFAYNG-LQH72hfPBKw-1; Tue, 07 Feb 2023 01:45:27 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AD52E802314; Tue, 7 Feb 2023 06:45:26 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 89E46492C3C; Tue, 7 Feb 2023 06:45:26 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0B46521E6914; Tue, 7 Feb 2023 07:45:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0+vzG9psU6DnR2uT7ryMZ+h+3Ec3AhK/lm+UEgyc0G8=; b=bofHUX6S6Yo3R7tP4ce7NLASDu+yzhvkg5xfDt5E3ClhXohNQYQGGToFF/sPUVWAr/AHiu P4ERQmvGtBDDqAA3yeNEanM8deLHreNF95DKZP85dE4byNkyDklqizo8/KlgG3FrQq3A6M oU61DkNYAFh4LyZ84I3qOl5fxvW1ZUY= X-MC-Unique: raD_FFAYNG-LQH72hfPBKw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Taylor Simpson , "Michael S . Tsirkin" Subject: [PULL 13/20] target/hexagon: Clean up includes Date: Tue, 7 Feb 2023 07:45:16 +0100 Message-Id: <20230207064523.3968603-14-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752401376100003 Content-Type: text/plain; charset="utf-8" This commit was created with scripts/clean-includes. All .c should include qemu/osdep.h first. The script performs three related cleanups: * Ensure .c files include qemu/osdep.h first. * Including it in a .h is redundant, since the .c already includes it. Drop such inclusions. * Likewise, including headers qemu/osdep.h includes is redundant. Drop these, too. Changes to standalone programs dropped, because these intentionally don't use qemu/osdep.h: target/hexagon/gen_dectree_import.c target/hexagon/gen_semantics.c target/hexagon/idef-parser/idef-parser.h target/hexagon/idef-parser/parser-helpers.c target/hexagon/idef-parser/parser-helpers.h Signed-off-by: Markus Armbruster Reviewed-by: Taylor Simpson Reviewed-by: Michael S. Tsirkin Message-Id: <20230202133830.2152150-14-armbru@redhat.com> --- target/hexagon/hex_arch_types.h | 1 - target/hexagon/mmvec/macros.h | 1 - 2 files changed, 2 deletions(-) diff --git a/target/hexagon/hex_arch_types.h b/target/hexagon/hex_arch_type= s.h index 885f68f760..52a7f2b2f3 100644 --- a/target/hexagon/hex_arch_types.h +++ b/target/hexagon/hex_arch_types.h @@ -18,7 +18,6 @@ #ifndef HEXAGON_HEX_ARCH_TYPES_H #define HEXAGON_HEX_ARCH_TYPES_H =20 -#include "qemu/osdep.h" #include "mmvec/mmvec.h" #include "qemu/int128.h" =20 diff --git a/target/hexagon/mmvec/macros.h b/target/hexagon/mmvec/macros.h index 8c864e8c68..1201d778d0 100644 --- a/target/hexagon/mmvec/macros.h +++ b/target/hexagon/mmvec/macros.h @@ -18,7 +18,6 @@ #ifndef HEXAGON_MMVEC_MACROS_H #define HEXAGON_MMVEC_MACROS_H =20 -#include "qemu/osdep.h" #include "qemu/host-utils.h" #include "arch.h" #include "mmvec/system_ext_mmvec.h" --=20 2.39.0 From nobody Fri May 17 03:13:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675752665; cv=none; d=zohomail.com; s=zohoarc; b=RaBoyNpLpnOanyouWf7+EtC4j6b2EXOcYgWZg9LG8x/BDZfAVuSfI9pxe14rmUAojFu2712Br0ulRNCPF/vCm2unuhbK3oZd4zEcTUZEE5y9nf0Cb1RopmMNQAOuM7WG2tqD8nB4KkYCU0unWKrUSOEWl+JLqM9x1zCz4noTZ6Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675752665; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dBwrVrWrRaXiDen4XCx2vG9pVdzOj+eyY5PQQaBQRcY=; b=H9CbzDkmGba78PE2939NI3LOWyDVHN+rFNHIAFwDRukT48rDMmBBLnorYjCOLyujZNhLPV4knjuEW2hgSAtPdXHjK7ysyixOx7uR+2CoAylRyynA1vv3icCW3zIpjd+v9mASsRS3OZObD3QGi+aztJUMxkCycCq8+mkVzxnwxDM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675752665031628.5815097371241; Mon, 6 Feb 2023 22:51:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHjr-0007Hn-EQ; Tue, 07 Feb 2023 01:45:59 -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 1pPHjU-00077G-5o for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjR-000414-S4 for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:35 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-609-PfK_384iNIavAGjXQgLFrQ-1; Tue, 07 Feb 2023 01:45:27 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BDF5E183B3C7; Tue, 7 Feb 2023 06:45:26 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8A0A61121314; Tue, 7 Feb 2023 06:45:26 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0DED521E6915; Tue, 7 Feb 2023 07:45:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dBwrVrWrRaXiDen4XCx2vG9pVdzOj+eyY5PQQaBQRcY=; b=RrOIynsuVVStz7zCHXOMneCF2WCXTTe2R0r5i7tu88xXUWKgz4PXT1iAcZ65yFALt2JYbz gs8HfrModkcKxVGotzJfd5BXj2CihLe+EKPWQBDX/cidqQKak8exWRMxGjEaeu+L6L/9Ru sYcXDtr+ENePSuAj5tt0YOlq4KbeKBU= X-MC-Unique: PfK_384iNIavAGjXQgLFrQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , "Michael S . Tsirkin" Subject: [PULL 14/20] riscv: Clean up includes Date: Tue, 7 Feb 2023 07:45:17 +0100 Message-Id: <20230207064523.3968603-15-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752666729100003 This commit was created with scripts/clean-includes. All .c should include qemu/osdep.h first. The script performs three related cleanups: * Ensure .c files include qemu/osdep.h first. * Including it in a .h is redundant, since the .c already includes it. Drop such inclusions. * Likewise, including headers qemu/osdep.h includes is redundant. Drop these, too. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Reviewed-by: Michael S. Tsirkin Message-Id: <20230202133830.2152150-15-armbru@redhat.com> --- target/riscv/pmu.h | 1 - 1 file changed, 1 deletion(-) diff --git a/target/riscv/pmu.h b/target/riscv/pmu.h index 3004ce37b6..0c819ca983 100644 --- a/target/riscv/pmu.h +++ b/target/riscv/pmu.h @@ -16,7 +16,6 @@ * this program. If not, see . */ =20 -#include "qemu/osdep.h" #include "qemu/log.h" #include "cpu.h" #include "qemu/main-loop.h" --=20 2.39.0 From nobody Fri May 17 03:13:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675752394; cv=none; d=zohomail.com; s=zohoarc; b=Y0tc6RUrAeYvbMal68znaupUFwP8mTX2WVsFT4Mbk9ER0wcLX0K2WupFqSeRq/oddG8ryoVoxtViAzMdhYK2I6GsO3z6YL6CgGZy1w25D6m4FBwozgr4FTNE+bkg9NzgHkcAqFbOeEA4qpdXcU5d7OKPpOnoYWpj7fDQa6ZKibI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675752394; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Eco68rI8qqvAIllmmgXKJXzNTpHnt91BwAWjJ+y8vKo=; b=LAWDNwFOAoekE0vsNKtZSLAFPpGaru1U7ZVCIYBJaFaKPwqCwGamL/tFF6wJ427fX0KrmqSTkDL68ZtKOk0knSG2UJRz1S4hFZ49+q9tUL91YKwsEWpSc/CK2HwhfVl5CEB4RNWjmIgqylnDkSwftmmXN/M+1BGauIDF7FVzZek= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675752394757703.9082259125462; Mon, 6 Feb 2023 22:46:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHk0-0007L5-L8; Tue, 07 Feb 2023 01:46:09 -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 1pPHjU-00077R-Q4 for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjS-00041K-0N for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:36 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-85-r9ewHpAzP-W0KwZURLmyNg-1; Tue, 07 Feb 2023 01:45:28 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 06971183B3C3; Tue, 7 Feb 2023 06:45:28 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D7EE01121314; Tue, 7 Feb 2023 06:45:27 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 107FC21E6916; Tue, 7 Feb 2023 07:45:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Eco68rI8qqvAIllmmgXKJXzNTpHnt91BwAWjJ+y8vKo=; b=Ab/AXwXDqMqxzMVwLZMxMqMTpOtuQIxTAnxLRmqLoKnaL3DtE9zw9TGnCc5iwBko6g69W3 y/ub1mmQZQdNIZj/Galxpf1Nhzt/XSTqGzTa6kwSwpmOW7iB1io396rqU9hZoOzCdmZMKm zEwIAL8K2gumnCo3dZmGXN2seWPA8Yk= X-MC-Unique: r9ewHpAzP-W0KwZURLmyNg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, "Michael S . Tsirkin" , Eric Blake Subject: [PULL 15/20] block: Clean up includes Date: Tue, 7 Feb 2023 07:45:18 +0100 Message-Id: <20230207064523.3968603-16-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752395099100003 Content-Type: text/plain; charset="utf-8" This commit was created with scripts/clean-includes. All .c should include qemu/osdep.h first. The script performs three related cleanups: * Ensure .c files include qemu/osdep.h first. * Including it in a .h is redundant, since the .c already includes it. Drop such inclusions. * Likewise, including headers qemu/osdep.h includes is redundant. Drop these, too. Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Reviewed-by: Eric Blake Message-Id: <20230202133830.2152150-16-armbru@redhat.com> --- include/block/graph-lock.h | 1 - include/block/write-threshold.h | 2 -- block/qapi.c | 1 - 3 files changed, 4 deletions(-) diff --git a/include/block/graph-lock.h b/include/block/graph-lock.h index 3ab924d5e2..18cc14de22 100644 --- a/include/block/graph-lock.h +++ b/include/block/graph-lock.h @@ -20,7 +20,6 @@ #ifndef GRAPH_LOCK_H #define GRAPH_LOCK_H =20 -#include "qemu/osdep.h" #include "qemu/clang-tsa.h" =20 /** diff --git a/include/block/write-threshold.h b/include/block/write-threshol= d.h index f50f923e7e..63d1583887 100644 --- a/include/block/write-threshold.h +++ b/include/block/write-threshold.h @@ -13,8 +13,6 @@ #ifndef BLOCK_WRITE_THRESHOLD_H #define BLOCK_WRITE_THRESHOLD_H =20 -#include "qemu/typedefs.h" - /* * bdrv_write_threshold_set: * diff --git a/block/qapi.c b/block/qapi.c index d52f1ab614..c84147849d 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -40,7 +40,6 @@ #include "qapi/qmp/qstring.h" #include "qemu/qemu-print.h" #include "sysemu/block-backend.h" -#include "qemu/cutils.h" =20 BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk, BlockDriverState *bs, --=20 2.39.0 From nobody Fri May 17 03:13:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675752899; cv=none; d=zohomail.com; s=zohoarc; b=hlUwXJAR7pY9mXiN9wFbKf/PAsREqtkXakTtYSfygald50mH/HCGHjXSUBQiWt7xQuB4B1OUXPGLoNazEkSet5AVjaAT/kSfoQMVxr9du29AbUYyBRPyWZKZG1/ZvIkr5iJE0j1LjQQ0dGSLx8Hz5b5tbxZ86lbJ7HFFc0jzXb8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675752899; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0tB8/zNwsiKlx6yp9BWyRF4M7P0D+4aWFxh6D2e+afs=; b=BapRfUdEb+wcfdlkkLTl0vlK8YBfhpPApKGxgUUMcC7LjEPSLuhRLODBcwhnKfsORlpJxNLZXiJlRuv9xFd+LotQItssTvK2s5CfpwS3L8114FAMzLpcAabP2cH+YxDnRRp2c7+wbbPvVuI0q0/2iyi8yw+39GH/9N1IvzEuNnQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675752899060774.6240439657926; Mon, 6 Feb 2023 22:54:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHjr-0007Ho-Ea; Tue, 07 Feb 2023 01:45:59 -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 1pPHjR-00075s-4H for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:33 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjO-0003zX-Mt for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:32 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-246-XIXyBjDvNZK_jKq7SNl39g-1; Tue, 07 Feb 2023 01:45:28 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 06D67183B3CC; Tue, 7 Feb 2023 06:45:28 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D79DA2026D37; Tue, 7 Feb 2023 06:45:27 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 134FF21E691A; Tue, 7 Feb 2023 07:45:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0tB8/zNwsiKlx6yp9BWyRF4M7P0D+4aWFxh6D2e+afs=; b=J/SsgyrB+y8X4V6M5kTcSe4W2yX5ZwcYs7NDGcDMesGsV7KacvwQyypaBL0KUZ2H5J4C2N ElhTz+6SmFY2MtVQP4/P3Rgg5SOnMMpRqKZ7isbXjvs5zqQs2Haw2yFmF4tLylxPkKdNAT NqU+XmQJa8/zhg5exrtmUgLq6vm1k5E= X-MC-Unique: XIXyBjDvNZK_jKq7SNl39g-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S . Tsirkin" Subject: [PULL 16/20] accel: Clean up includes Date: Tue, 7 Feb 2023 07:45:19 +0100 Message-Id: <20230207064523.3968603-17-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752899975100003 This commit was created with scripts/clean-includes. All .c should include qemu/osdep.h first. The script performs three related cleanups: * Ensure .c files include qemu/osdep.h first. * Including it in a .h is redundant, since the .c already includes it. Drop such inclusions. * Likewise, including headers qemu/osdep.h includes is redundant. Drop these, too. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael S. Tsirkin Message-Id: <20230202133830.2152150-17-armbru@redhat.com> --- include/sysemu/accel-blocker.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/sysemu/accel-blocker.h b/include/sysemu/accel-blocker.h index 72020529ef..0733783bcc 100644 --- a/include/sysemu/accel-blocker.h +++ b/include/sysemu/accel-blocker.h @@ -14,7 +14,6 @@ #ifndef ACCEL_BLOCKER_H #define ACCEL_BLOCKER_H =20 -#include "qemu/osdep.h" #include "sysemu/cpus.h" =20 extern void accel_blocker_init(void); --=20 2.39.0 From nobody Fri May 17 03:13:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675752483; cv=none; d=zohomail.com; s=zohoarc; b=kLY7bDQk5wh6rODXlCebydPdzBLEcmtVbCLe2TkjgwSCCR0hDM+wpZG0NrTkqBL2jwi9++IhB5BDpz9VI47aWfFbQf/ypBKYM5nPiW+Qse7LQK2OjAFhh4oL0KQ7H3z/ZtVsHouiXzMwEElmjucBGbIfNd2NhhOLMq+bcef9eYw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675752483; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D0OFGW4PFMfpK/AkeonM6KOgJD8UHdh86BMTHgLKgi4=; b=mgqHJNzZVG+5HVm7Hdybi1d/fvIetg1aoKgCvh2IkSptpeOocOq6MVMadB/UBtam3Rky1lGbfuoZRfbYxjvUH1DyWuok/rPaGcBmQkD1S50+ysWo0CMBoK9WBz7k+6Xov3ncSWdlZ5dcyQdVkZuHg82v59O8b7MwTqkJVSsxch4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675752483397663.6615560395547; Mon, 6 Feb 2023 22:48:03 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHjg-000788-FY; Tue, 07 Feb 2023 01:45:52 -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 1pPHjS-00076p-Kr for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:34 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjQ-00040P-R7 for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:34 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-99-gbkDqhDjNEuO_swaqFXmTQ-1; Tue, 07 Feb 2023 01:45:28 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0C582183B3CD; Tue, 7 Feb 2023 06:45:28 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D704F2166B2B; Tue, 7 Feb 2023 06:45:27 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 15DBD21E691B; Tue, 7 Feb 2023 07:45:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D0OFGW4PFMfpK/AkeonM6KOgJD8UHdh86BMTHgLKgi4=; b=Ug/Qf4D6vxC1HfLCuqMxT0UiVsc1j1U+Un1xQikSpQVsuznn6+8iaFirLG/0xzSDLtyjyv WOSTIOBWH0vNrWnS4w5sAOdTNf+AoGqM2OaOaxvy3qUPWnr2eQGUNX2K3BP4Sf+KQdBC4Y 1rQK50jXhc4SeWArE07tamSLsQllaDo= X-MC-Unique: gbkDqhDjNEuO_swaqFXmTQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S . Tsirkin" , Juan Quintela Subject: [PULL 17/20] Fix non-first inclusions of qemu/osdep.h Date: Tue, 7 Feb 2023 07:45:20 +0100 Message-Id: <20230207064523.3968603-18-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752483873100001 This commit was created with scripts/clean-includes. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael S. Tsirkin Reviewed-by: Juan Quintela Message-Id: <20230202133830.2152150-18-armbru@redhat.com> --- audio/sndioaudio.c | 2 +- backends/hostmem-epc.c | 2 +- block/export/vduse-blk.c | 2 +- hw/hyperv/syndbg.c | 2 +- util/async-teardown.c | 12 ++++-------- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/audio/sndioaudio.c b/audio/sndioaudio.c index 632b0e3825..3fde01fdbd 100644 --- a/audio/sndioaudio.c +++ b/audio/sndioaudio.c @@ -14,9 +14,9 @@ * to recording, which is what guest systems expect. */ =20 +#include "qemu/osdep.h" #include #include -#include "qemu/osdep.h" #include "qemu/main-loop.h" #include "audio.h" #include "trace.h" diff --git a/backends/hostmem-epc.c b/backends/hostmem-epc.c index 037292d267..4e162d6789 100644 --- a/backends/hostmem-epc.c +++ b/backends/hostmem-epc.c @@ -9,9 +9,9 @@ * This work is licensed under the terms of the GNU GPL, version 2 or late= r. * See the COPYING file in the top-level directory. */ -#include =20 #include "qemu/osdep.h" +#include #include "qom/object_interfaces.h" #include "qapi/error.h" #include "sysemu/hostmem.h" diff --git a/block/export/vduse-blk.c b/block/export/vduse-blk.c index 350d6fdaf0..f7ae44e3ce 100644 --- a/block/export/vduse-blk.c +++ b/block/export/vduse-blk.c @@ -10,9 +10,9 @@ * later. See the COPYING file in the top-level directory. */ =20 +#include "qemu/osdep.h" #include =20 -#include "qemu/osdep.h" #include "qapi/error.h" #include "block/export.h" #include "qemu/error-report.h" diff --git a/hw/hyperv/syndbg.c b/hw/hyperv/syndbg.c index 16d04cfdc6..94fe1b534b 100644 --- a/hw/hyperv/syndbg.c +++ b/hw/hyperv/syndbg.c @@ -5,8 +5,8 @@ * See the COPYING file in the top-level directory. */ =20 -#include "qemu/ctype.h" #include "qemu/osdep.h" +#include "qemu/ctype.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/sockets.h" diff --git a/util/async-teardown.c b/util/async-teardown.c index 62bfce1b3c..62cdeb0f20 100644 --- a/util/async-teardown.c +++ b/util/async-teardown.c @@ -10,16 +10,12 @@ * option) any later version. See the COPYING file in the top-level direc= tory. * */ -#include -#include -#include -#include -#include -#include -#include -#include =20 #include "qemu/osdep.h" +#include +#include +#include + #include "qemu/async-teardown.h" =20 #ifdef _SC_THREAD_STACK_MIN --=20 2.39.0 From nobody Fri May 17 03:13:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675752456; cv=none; d=zohomail.com; s=zohoarc; b=KXUWEg2A0GSlYKedM3GrC0K//TNHBVW8Z1Ls/weNOXHpsbs1tZId9zxrgx3W9TIq0fT96gkqrFdCplyuNuNi3WKiNQ9dX9tOEIMbym55XW0aOiY7t/IyxAQiSw+ukv6pjRgLUX90iT3RUwhlDnp86iMmf8MBi3vK/lpPHPuaBII= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675752456; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eGkH4w9MoalsJzIIZmPIL2JdKuHQ1PboFkEQzvJh5iA=; b=Vo+sjwphs8kf99qg03fEn/76/3emh70o+l3PlKA6re63fRJpjUNPjxBRAjrxZAeu8d4rKwSJvSgM3/P5rxNTh7QnC15pUXaKxdKW+eV6RpS19+NybEh7eT5y31qqNllnWwebbcsoCSJ9U8qMwfX1XXOH043oPnil5VoMu1MH5Ls= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675752456253819.0427434719201; Mon, 6 Feb 2023 22:47:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHk3-0007LY-JO; Tue, 07 Feb 2023 01:46:15 -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 1pPHjS-00076o-Jp for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:34 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjQ-00040J-93 for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:34 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-246-ZnqivKD1NkC4XnSx32wJOQ-1; Tue, 07 Feb 2023 01:45:28 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 56C653C02530; Tue, 7 Feb 2023 06:45:28 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1845540149B6; Tue, 7 Feb 2023 06:45:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1887021E691C; Tue, 7 Feb 2023 07:45:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eGkH4w9MoalsJzIIZmPIL2JdKuHQ1PboFkEQzvJh5iA=; b=L10Dll4DGAnD9hmqqzyKddgj+1cow1nF0p/Qe0khaILurJtK8hBhsR6N5yy6sqPE97Csas B2ZhSVsKYgbV3IVGrsuLjS3ovYUTPdokUFdmvbwaP6sDQZ8+GVk9eZQIpL9mUHxu5MFoOp M7CQSOvy0KY+qLKR2fyCgF9fku6+N8I= X-MC-Unique: ZnqivKD1NkC4XnSx32wJOQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Christian Schoenebeck , "Michael S . Tsirkin" Subject: [PULL 18/20] Don't include headers already included by qemu/osdep.h Date: Tue, 7 Feb 2023 07:45:21 +0100 Message-Id: <20230207064523.3968603-19-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752457860100001 Content-Type: text/plain; charset="utf-8" This commit was created with scripts/clean-includes. Signed-off-by: Markus Armbruster Acked-by: Christian Schoenebeck Reviewed-by: Michael S. Tsirkin Message-Id: <20230202133830.2152150-19-armbru@redhat.com> --- backends/tpm/tpm_ioctl.h | 2 -- fsdev/p9array.h | 2 -- include/hw/misc/aspeed_lpc.h | 2 -- include/hw/pci/pcie_doe.h | 1 - include/qemu/async-teardown.h | 2 -- include/qemu/dbus.h | 1 - include/qemu/host-utils.h | 1 - include/sysemu/event-loop-base.h | 1 - accel/tcg/cpu-exec.c | 1 - hw/9pfs/9p.c | 2 -- hw/display/virtio-gpu-udmabuf.c | 1 - hw/i2c/pmbus_device.c | 1 - hw/remote/proxy-memory-listener.c | 1 - hw/sensor/adm1272.c | 1 - hw/usb/dev-storage-bot.c | 1 - hw/usb/dev-storage-classic.c | 1 - softmmu/vl.c | 2 -- tcg/tci.c | 1 - tests/unit/test-seccomp.c | 1 - ui/udmabuf.c | 1 - util/main-loop.c | 1 - util/oslib-posix.c | 2 -- 22 files changed, 29 deletions(-) diff --git a/backends/tpm/tpm_ioctl.h b/backends/tpm/tpm_ioctl.h index e506ef5160..b1d31768a6 100644 --- a/backends/tpm/tpm_ioctl.h +++ b/backends/tpm/tpm_ioctl.h @@ -12,8 +12,6 @@ # define __USE_LINUX_IOCTL_DEFS #endif =20 -#include -#include #ifndef _WIN32 #include #include diff --git a/fsdev/p9array.h b/fsdev/p9array.h index 90e83a7c7b..50a1b15fe9 100644 --- a/fsdev/p9array.h +++ b/fsdev/p9array.h @@ -27,8 +27,6 @@ #ifndef QEMU_P9ARRAY_H #define QEMU_P9ARRAY_H =20 -#include "qemu/compiler.h" - /** * P9Array provides a mechanism to access arrays in common C-style (e.g. by * square bracket [] operator) in conjunction with reference variables that diff --git a/include/hw/misc/aspeed_lpc.h b/include/hw/misc/aspeed_lpc.h index fd228731d2..fa398959af 100644 --- a/include/hw/misc/aspeed_lpc.h +++ b/include/hw/misc/aspeed_lpc.h @@ -12,8 +12,6 @@ =20 #include "hw/sysbus.h" =20 -#include - #define TYPE_ASPEED_LPC "aspeed.lpc" #define ASPEED_LPC(obj) OBJECT_CHECK(AspeedLPCState, (obj), TYPE_ASPEED_LP= C) =20 diff --git a/include/hw/pci/pcie_doe.h b/include/hw/pci/pcie_doe.h index ba4d8b03bd..87dc17dcef 100644 --- a/include/hw/pci/pcie_doe.h +++ b/include/hw/pci/pcie_doe.h @@ -11,7 +11,6 @@ #define PCIE_DOE_H =20 #include "qemu/range.h" -#include "qemu/typedefs.h" #include "hw/register.h" =20 /* diff --git a/include/qemu/async-teardown.h b/include/qemu/async-teardown.h index 092e7a37e7..b281da005b 100644 --- a/include/qemu/async-teardown.h +++ b/include/qemu/async-teardown.h @@ -13,8 +13,6 @@ #ifndef QEMU_ASYNC_TEARDOWN_H #define QEMU_ASYNC_TEARDOWN_H =20 -#include "config-host.h" - #ifdef CONFIG_LINUX void init_async_teardown(void); #endif diff --git a/include/qemu/dbus.h b/include/qemu/dbus.h index 08f00dfd53..81d3de8a5a 100644 --- a/include/qemu/dbus.h +++ b/include/qemu/dbus.h @@ -15,7 +15,6 @@ #include "qom/object.h" #include "chardev/char.h" #include "qemu/notify.h" -#include "qemu/typedefs.h" =20 /* glib/gio 2.68 */ #define DBUS_METHOD_INVOCATION_HANDLED TRUE diff --git a/include/qemu/host-utils.h b/include/qemu/host-utils.h index 88d476161c..3ce62bf4a5 100644 --- a/include/qemu/host-utils.h +++ b/include/qemu/host-utils.h @@ -30,7 +30,6 @@ #ifndef HOST_UTILS_H #define HOST_UTILS_H =20 -#include "qemu/compiler.h" #include "qemu/bswap.h" #include "qemu/int128.h" =20 diff --git a/include/sysemu/event-loop-base.h b/include/sysemu/event-loop-b= ase.h index 2748bf6ae1..a6c24f1351 100644 --- a/include/sysemu/event-loop-base.h +++ b/include/sysemu/event-loop-base.h @@ -14,7 +14,6 @@ =20 #include "qom/object.h" #include "block/aio.h" -#include "qemu/typedefs.h" =20 #define TYPE_EVENT_LOOP_BASE "event-loop-base" OBJECT_DECLARE_TYPE(EventLoopBase, EventLoopBaseClass, diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 9c857eeb07..5357608b14 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -28,7 +28,6 @@ #include "exec/exec-all.h" #include "tcg/tcg.h" #include "qemu/atomic.h" -#include "qemu/compiler.h" #include "qemu/timer.h" #include "qemu/rcu.h" #include "exec/log.h" diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 072cf67956..9621ec1341 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -19,8 +19,6 @@ #include "qemu/osdep.h" #ifdef CONFIG_LINUX #include -#else -#include #endif #include #include "hw/virtio/virtio.h" diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabu= f.c index 8bdf4bac6e..847fa4c0cc 100644 --- a/hw/display/virtio-gpu-udmabuf.c +++ b/hw/display/virtio-gpu-udmabuf.c @@ -21,7 +21,6 @@ #include "exec/ramblock.h" #include "sysemu/hostmem.h" #include -#include #include #include "qemu/memfd.h" #include "standard-headers/linux/udmabuf.h" diff --git a/hw/i2c/pmbus_device.c b/hw/i2c/pmbus_device.c index 4071a88cfc..c3d6046784 100644 --- a/hw/i2c/pmbus_device.c +++ b/hw/i2c/pmbus_device.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include -#include #include "hw/i2c/pmbus_device.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/remote/proxy-memory-listener.c b/hw/remote/proxy-memory-lis= tener.c index eb9918fe72..18d96a1d04 100644 --- a/hw/remote/proxy-memory-listener.c +++ b/hw/remote/proxy-memory-listener.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" =20 -#include "qemu/compiler.h" #include "qemu/int128.h" #include "qemu/range.h" #include "exec/memory.h" diff --git a/hw/sensor/adm1272.c b/hw/sensor/adm1272.c index 7310c769be..8f4a1c2cd4 100644 --- a/hw/sensor/adm1272.c +++ b/hw/sensor/adm1272.c @@ -8,7 +8,6 @@ */ =20 #include "qemu/osdep.h" -#include #include "hw/i2c/pmbus_device.h" #include "hw/irq.h" #include "migration/vmstate.h" diff --git a/hw/usb/dev-storage-bot.c b/hw/usb/dev-storage-bot.c index b24b3148c2..1e5c5c711f 100644 --- a/hw/usb/dev-storage-bot.c +++ b/hw/usb/dev-storage-bot.c @@ -8,7 +8,6 @@ */ =20 #include "qemu/osdep.h" -#include "qemu/typedefs.h" #include "qapi/error.h" #include "hw/usb.h" #include "hw/usb/desc.h" diff --git a/hw/usb/dev-storage-classic.c b/hw/usb/dev-storage-classic.c index 00f25bade2..84d19752b5 100644 --- a/hw/usb/dev-storage-classic.c +++ b/hw/usb/dev-storage-classic.c @@ -8,7 +8,6 @@ */ =20 #include "qemu/osdep.h" -#include "qemu/typedefs.h" #include "qapi/error.h" #include "qapi/visitor.h" #include "hw/usb.h" diff --git a/softmmu/vl.c b/softmmu/vl.c index 9177d95d4e..5355a7fe5a 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -136,8 +136,6 @@ #include "qemu/guest-random.h" #include "qemu/keyval.h" =20 -#include "config-host.h" - #define MAX_VIRTIO_CONSOLES 1 =20 typedef struct BlockdevOptionsQueueEntry { diff --git a/tcg/tci.c b/tcg/tci.c index 022fe9d0f8..fc67e7e767 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -21,7 +21,6 @@ #include "exec/cpu_ldst.h" #include "tcg/tcg-op.h" #include "tcg/tcg-ldst.h" -#include "qemu/compiler.h" #include =20 =20 diff --git a/tests/unit/test-seccomp.c b/tests/unit/test-seccomp.c index 3d7771e46c..f02c79cafd 100644 --- a/tests/unit/test-seccomp.c +++ b/tests/unit/test-seccomp.c @@ -25,7 +25,6 @@ #include "qapi/error.h" #include "qemu/module.h" =20 -#include #include =20 static void test_seccomp_helper(const char *args, bool killed, diff --git a/ui/udmabuf.c b/ui/udmabuf.c index cebceb2610..cbf4357bb1 100644 --- a/ui/udmabuf.c +++ b/ui/udmabuf.c @@ -8,7 +8,6 @@ #include "qapi/error.h" #include "ui/console.h" =20 -#include #include =20 int udmabuf_fd(void) diff --git a/util/main-loop.c b/util/main-loop.c index 58f776a8c9..3c0f525192 100644 --- a/util/main-loop.c +++ b/util/main-loop.c @@ -33,7 +33,6 @@ #include "block/thread-pool.h" #include "qemu/error-report.h" #include "qemu/queue.h" -#include "qemu/compiler.h" #include "qom/object.h" =20 #ifndef _WIN32 diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 59a891b6a8..fd03fd32c8 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -40,7 +40,6 @@ #include "qemu/thread.h" #include #include "qemu/cutils.h" -#include "qemu/compiler.h" #include "qemu/units.h" #include "qemu/thread-context.h" =20 @@ -50,7 +49,6 @@ =20 #ifdef __FreeBSD__ #include -#include #include #include #endif --=20 2.39.0 From nobody Fri May 17 03:13:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675752529; cv=none; d=zohomail.com; s=zohoarc; b=DrcQFvYxbtrKaJH7/QXpCFQiqNI22lg5kTxEVog8LodZC0euodvq2kQjGVvfg2xeGJirQ0gNlWnFATBsZcDPax7h2e8MEWL/XmY1MskVDGCVKPTMf4rqHhY6Aldxjbzy5C3n4Za3NEmpfaLmuXwIN5sNvGnjUTx/GKM2le9CiBc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675752529; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5enOw48x4XlA0D1eO/KsNfm/7Eaff+n8vd/Vh7HNSxY=; b=E1qDcHdSE9Xf62OZqUFpdXTmFM82wG5PzU6xbWlwBu1jrrl1RdW1RL8jParaHN09BCJ+e5CAR6UbwbHwymQy+12E3XyGHXc0EwsG6aDqEMrvuRv4hDoG1DVinHV6OfRKIvkUn7jsZl/RzaykDAW4O6LTqQ1WxR9ck8llNqwaRvA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675752529007501.67557527570784; Mon, 6 Feb 2023 22:48:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHk5-0007LZ-Eu; Tue, 07 Feb 2023 01:46:22 -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 1pPHjQ-00075j-82 for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjO-0003zV-Gm for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:31 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-124-ndgEMMOkPSe2GJE9EPUHtQ-1; Tue, 07 Feb 2023 01:45:28 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1D377858F09; Tue, 7 Feb 2023 06:45:28 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EF19144037; Tue, 7 Feb 2023 06:45:27 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1AD5021E691F; Tue, 7 Feb 2023 07:45:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5enOw48x4XlA0D1eO/KsNfm/7Eaff+n8vd/Vh7HNSxY=; b=P6/Fb+/rrVsrxnxyEl/mxkBrlhELvz8cQ9RNOxI/5bdfFwkNrIcKEfHO2AyTex4cAi7Cc+ +4bFdtOjsqQ6Hpqc2mwRIYGJP6iP7w0QORIwqYRzA83hvvThtLyLi6LwqnWUhdBxtNkPMu ceh1gf1SHTfqG2lr8VPoLdB9o3RZwwc= X-MC-Unique: ndgEMMOkPSe2GJE9EPUHtQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Christian Schoenebeck , "Michael S . Tsirkin" Subject: [PULL 19/20] 9p: Drop superfluous include of linux/limits.h Date: Tue, 7 Feb 2023 07:45:22 +0100 Message-Id: <20230207064523.3968603-20-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752530061100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Christian Schoenebeck Reviewed-by: Michael S. Tsirkin Message-Id: <20230202133830.2152150-20-armbru@redhat.com> --- hw/9pfs/9p.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 9621ec1341..aa736af380 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -17,9 +17,6 @@ */ =20 #include "qemu/osdep.h" -#ifdef CONFIG_LINUX -#include -#endif #include #include "hw/virtio/virtio.h" #include "qapi/error.h" --=20 2.39.0 From nobody Fri May 17 03:13:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675752464; cv=none; d=zohomail.com; s=zohoarc; b=PXJ3Lob/nrZp35564+C4hHD/qYLXNqUbnIFCjuTdxmQ8cD+0ezDRYSHO2ICQsJd0FsAZVXt6Oi1jZHEnngHiKD7LQ/B0M4mXW4wh0TlaIIPpDYAwnDnFg+0xJzDw4yb+Lfqe//fAZg1cOMfL/8dcTwUoDYbie52CG/50AVNKXrQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675752464; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gUYc5wycJJSoXofa4UZKMNo38IWrWDescXM6M4+WTMk=; b=V7lclDgsaNZ3bwoI1uCZvi8s/NOwvBqM0ijz0bn2PYi8XDXBEN+Rl3JHLlaVtg0fqj/YgZO9SlLm6qqC7H7xMOgKo2Ux/H9r8sDNj/xfEvdj5DL5IFn2Znx9yymgjO54yaPH5NeuJMYgwC8erAOSqYzDwpl3AnPh51NFfxdanWk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675752464925569.4828447884078; Mon, 6 Feb 2023 22:47:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHju-0007KD-Dk; Tue, 07 Feb 2023 01:46:02 -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 1pPHjT-000773-58 for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjQ-00040S-Hc for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:45:34 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-124-xq8DxLLiOfeDuqHLpXiwdw-1; Tue, 07 Feb 2023 01:45:28 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 448E48027EB; Tue, 7 Feb 2023 06:45:28 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D788D401014C; Tue, 7 Feb 2023 06:45:27 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1DB0B21E6921; Tue, 7 Feb 2023 07:45:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gUYc5wycJJSoXofa4UZKMNo38IWrWDescXM6M4+WTMk=; b=IXtfcBa9K0Pz+EVV22o+Mp8WWWdyguKYb1Xwd4PB+TXdKgUjZNVebAOpYqntwTF2NKUENY iZQ5kKzL7xtjZonRqxj761xCrfXWlqmcP4Yd1jO+KqWAqeG4sbPZlRELaep0uMHJSoPIX2 W3foH/5A1V1o3PTVhIGKzy4UPnvSwb8= X-MC-Unique: xq8DxLLiOfeDuqHLpXiwdw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, "Dr . David Alan Gilbert" , Greg Kurz , "Michael S . Tsirkin" , Juan Quintela Subject: [PULL 20/20] Drop duplicate #include Date: Tue, 7 Feb 2023 07:45:23 +0100 Message-Id: <20230207064523.3968603-21-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752465923100001 Content-Type: text/plain; charset="utf-8" Tracked down with the help of scripts/clean-includes. Signed-off-by: Markus Armbruster Acked-by: Dr. David Alan Gilbert Reviewed-by: Greg Kurz Reviewed-by: Michael S. Tsirkin Reviewed-by: Juan Quintela Message-Id: <20230202133830.2152150-21-armbru@redhat.com> --- include/hw/arm/fsl-imx6ul.h | 1 - include/hw/arm/fsl-imx7.h | 1 - backends/tpm/tpm_emulator.c | 1 - hw/acpi/piix4.c | 1 - hw/alpha/dp264.c | 1 - hw/arm/virt.c | 1 - hw/arm/xlnx-versal.c | 1 - hw/block/pflash_cfi01.c | 1 - hw/core/machine.c | 1 - hw/hppa/machine.c | 1 - hw/i386/acpi-build.c | 1 - hw/loongarch/acpi-build.c | 1 - hw/misc/macio/cuda.c | 1 - hw/misc/macio/pmu.c | 1 - hw/net/xilinx_axienet.c | 1 - hw/ppc/ppc405_uc.c | 2 -- hw/ppc/ppc440_bamboo.c | 1 - hw/ppc/spapr_drc.c | 1 - hw/rdma/vmw/pvrdma_dev_ring.c | 1 - hw/remote/machine.c | 1 - hw/remote/remote-obj.c | 1 - hw/rtc/mc146818rtc.c | 1 - hw/s390x/virtio-ccw-serial.c | 1 - migration/postcopy-ram.c | 2 -- softmmu/dirtylimit.c | 1 - softmmu/runstate.c | 1 - softmmu/vl.c | 1 - target/loongarch/translate.c | 1 - target/mips/tcg/translate.c | 1 - target/nios2/translate.c | 2 -- tests/unit/test-cutils.c | 1 - ui/gtk.c | 1 - util/oslib-posix.c | 4 ---- 33 files changed, 39 deletions(-) diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h index 7812e516a5..1952cb984d 100644 --- a/include/hw/arm/fsl-imx6ul.h +++ b/include/hw/arm/fsl-imx6ul.h @@ -30,7 +30,6 @@ #include "hw/timer/imx_gpt.h" #include "hw/timer/imx_epit.h" #include "hw/i2c/imx_i2c.h" -#include "hw/gpio/imx_gpio.h" #include "hw/sd/sdhci.h" #include "hw/ssi/imx_spi.h" #include "hw/net/imx_fec.h" diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h index 4e5e071864..355bd8ea83 100644 --- a/include/hw/arm/fsl-imx7.h +++ b/include/hw/arm/fsl-imx7.h @@ -32,7 +32,6 @@ #include "hw/timer/imx_gpt.h" #include "hw/timer/imx_epit.h" #include "hw/i2c/imx_i2c.h" -#include "hw/gpio/imx_gpio.h" #include "hw/sd/sdhci.h" #include "hw/ssi/imx_spi.h" #include "hw/net/imx_fec.h" diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c index 67e7b212e3..d18144b92e 100644 --- a/backends/tpm/tpm_emulator.c +++ b/backends/tpm/tpm_emulator.c @@ -35,7 +35,6 @@ #include "sysemu/runstate.h" #include "sysemu/tpm_backend.h" #include "sysemu/tpm_util.h" -#include "sysemu/runstate.h" #include "tpm_int.h" #include "tpm_ioctl.h" #include "migration/blocker.h" diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 724294b378..eac2125abd 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -34,7 +34,6 @@ #include "sysemu/xen.h" #include "qapi/error.h" #include "qemu/range.h" -#include "hw/acpi/pcihp.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/acpi/cpu.h" #include "hw/hotplug.h" diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index c502c8c62a..4161f559a7 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -18,7 +18,6 @@ #include "net/net.h" #include "qemu/cutils.h" #include "qemu/datadir.h" -#include "net/net.h" =20 static uint64_t cpu_alpha_superpage_to_phys(void *opaque, uint64_t addr) { diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ba47728288..75f28947de 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -33,7 +33,6 @@ #include "qemu/units.h" #include "qemu/option.h" #include "monitor/qdev.h" -#include "qapi/error.h" #include "hw/sysbus.h" #include "hw/arm/boot.h" #include "hw/arm/primecell.h" diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index 57276e1506..69b1b99e93 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -22,7 +22,6 @@ #include "hw/misc/unimp.h" #include "hw/arm/xlnx-versal.h" #include "qemu/log.h" -#include "hw/sysbus.h" =20 #define XLNX_VERSAL_ACPU_TYPE ARM_CPU_TYPE_NAME("cortex-a72") #define XLNX_VERSAL_RCPU_TYPE ARM_CPU_TYPE_NAME("cortex-r5f") diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 36d68c70f6..3c066e3405 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -45,7 +45,6 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/bitops.h" -#include "qemu/error-report.h" #include "qemu/host-utils.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/core/machine.c b/hw/core/machine.c index f7761baab5..38953fe161 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -39,7 +39,6 @@ #include "exec/confidential-guest-support.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-pci.h" -#include "qom/object_interfaces.h" =20 GlobalProperty hw_compat_7_2[] =3D {}; const size_t hw_compat_7_2_len =3D G_N_ELEMENTS(hw_compat_7_2); diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index de1cc7ab71..7ac68c943f 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -28,7 +28,6 @@ #include "qapi/error.h" #include "net/net.h" #include "qemu/log.h" -#include "net/net.h" =20 #define MIN_SEABIOS_HPPA_VERSION 6 /* require at least this fw version */ =20 diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 145389aa58..b67dcbbb37 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -76,7 +76,6 @@ =20 #include "hw/acpi/hmat.h" #include "hw/acpi/viot.h" -#include "hw/acpi/cxl.h" =20 #include CONFIG_DEVICES =20 diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c index c2b237736d..f551296a0e 100644 --- a/hw/loongarch/acpi-build.c +++ b/hw/loongarch/acpi-build.c @@ -22,7 +22,6 @@ /* Supported chipsets: */ #include "hw/pci-host/ls7a.h" #include "hw/loongarch/virt.h" -#include "hw/acpi/aml-build.h" =20 #include "hw/acpi/utils.h" #include "hw/acpi/pci.h" diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c index 853e88bfed..29a8e5ed19 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -30,7 +30,6 @@ #include "hw/input/adb.h" #include "hw/misc/mos6522.h" #include "hw/misc/macio/cuda.h" -#include "qapi/error.h" #include "qemu/timer.h" #include "sysemu/runstate.h" #include "sysemu/rtc.h" diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c index 97ef8c771b..5a788e595a 100644 --- a/hw/misc/macio/pmu.c +++ b/hw/misc/macio/pmu.c @@ -36,7 +36,6 @@ #include "hw/misc/mos6522.h" #include "hw/misc/macio/gpio.h" #include "hw/misc/macio/pmu.h" -#include "qapi/error.h" #include "qemu/timer.h" #include "sysemu/runstate.h" #include "sysemu/rtc.h" diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index 7e00965323..5b19a01eaa 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -31,7 +31,6 @@ #include "net/net.h" #include "net/checksum.h" =20 -#include "hw/hw.h" #include "hw/irq.h" #include "hw/qdev-properties.h" #include "hw/stream.h" diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c index c973cfb04e..0cc68178ad 100644 --- a/hw/ppc/ppc405_uc.c +++ b/hw/ppc/ppc405_uc.c @@ -38,8 +38,6 @@ #include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "hw/intc/ppc-uic.h" -#include "hw/qdev-properties.h" -#include "qapi/error.h" #include "trace.h" =20 /*************************************************************************= ****/ diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 81d71adf34..2880c81cb1 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -13,7 +13,6 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" -#include "qemu/error-report.h" #include "qemu/datadir.h" #include "qemu/error-report.h" #include "net/net.h" diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 4923435a8b..b5c400a94d 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -17,7 +17,6 @@ #include "hw/ppc/spapr_drc.h" #include "qom/object.h" #include "migration/vmstate.h" -#include "qapi/error.h" #include "qapi/qapi-events-qdev.h" #include "qapi/visitor.h" #include "qemu/error-report.h" diff --git a/hw/rdma/vmw/pvrdma_dev_ring.c b/hw/rdma/vmw/pvrdma_dev_ring.c index 598e6adc5e..30ce22a5be 100644 --- a/hw/rdma/vmw/pvrdma_dev_ring.c +++ b/hw/rdma/vmw/pvrdma_dev_ring.c @@ -14,7 +14,6 @@ */ =20 #include "qemu/osdep.h" -#include "qemu/cutils.h" #include "hw/pci/pci.h" #include "cpu.h" #include "qemu/cutils.h" diff --git a/hw/remote/machine.c b/hw/remote/machine.c index 519f855ec1..fdc6c441bb 100644 --- a/hw/remote/machine.c +++ b/hw/remote/machine.c @@ -22,7 +22,6 @@ #include "hw/remote/iohub.h" #include "hw/remote/iommu.h" #include "hw/qdev-core.h" -#include "hw/remote/iommu.h" #include "hw/remote/vfio-user-obj.h" #include "hw/pci/msi.h" =20 diff --git a/hw/remote/remote-obj.c b/hw/remote/remote-obj.c index 333e5ac443..65b6f7cc86 100644 --- a/hw/remote/remote-obj.c +++ b/hw/remote/remote-obj.c @@ -12,7 +12,6 @@ #include "qemu/error-report.h" #include "qemu/notify.h" #include "qom/object_interfaces.h" -#include "hw/qdev-core.h" #include "io/channel.h" #include "hw/qdev-core.h" #include "hw/remote/machine.h" diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index bc1192b7ae..ba612a151d 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -43,7 +43,6 @@ #include "qapi/error.h" #include "qapi/qapi-events-misc.h" #include "qapi/visitor.h" -#include "hw/rtc/mc146818rtc_regs.h" =20 //#define DEBUG_CMOS //#define DEBUG_COALESCED diff --git a/hw/s390x/virtio-ccw-serial.c b/hw/s390x/virtio-ccw-serial.c index bf8057880f..8f8d2302f8 100644 --- a/hw/s390x/virtio-ccw-serial.c +++ b/hw/s390x/virtio-ccw-serial.c @@ -15,7 +15,6 @@ #include "hw/qdev-properties.h" #include "hw/virtio/virtio-serial.h" #include "virtio-ccw.h" -#include "hw/virtio/virtio-serial.h" =20 #define TYPE_VIRTIO_SERIAL_CCW "virtio-serial-ccw" OBJECT_DECLARE_SIMPLE_TYPE(VirtioSerialCcw, VIRTIO_SERIAL_CCW) diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index b9a37ef255..8b7d1af75d 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -17,7 +17,6 @@ */ =20 #include "qemu/osdep.h" -#include "qemu/rcu.h" #include "qemu/madvise.h" #include "exec/target_page.h" #include "migration.h" @@ -34,7 +33,6 @@ #include "hw/boards.h" #include "exec/ramblock.h" #include "socket.h" -#include "qemu-file.h" #include "yank_functions.h" #include "tls.h" =20 diff --git a/softmmu/dirtylimit.c b/softmmu/dirtylimit.c index 12668555f2..c56f0f58c8 100644 --- a/softmmu/dirtylimit.c +++ b/softmmu/dirtylimit.c @@ -11,7 +11,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/main-loop.h" #include "qapi/qapi-commands-migration.h" #include "qapi/qmp/qdict.h" diff --git a/softmmu/runstate.c b/softmmu/runstate.c index cab9f6fc07..f9ad88e6a7 100644 --- a/softmmu/runstate.c +++ b/softmmu/runstate.c @@ -41,7 +41,6 @@ #include "qapi/qapi-commands-run-state.h" #include "qapi/qapi-events-run-state.h" #include "qemu/error-report.h" -#include "qemu/log.h" #include "qemu/job.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/softmmu/vl.c b/softmmu/vl.c index 5355a7fe5a..b2ee3fee3f 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -129,7 +129,6 @@ #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-visit-qom.h" #include "qapi/qapi-commands-ui.h" -#include "qapi/qmp/qdict.h" #include "block/qdict.h" #include "qapi/qmp/qerror.h" #include "sysemu/iothread.h" diff --git a/target/loongarch/translate.c b/target/loongarch/translate.c index 38ced69803..72a6275665 100644 --- a/target/loongarch/translate.c +++ b/target/loongarch/translate.c @@ -12,7 +12,6 @@ #include "exec/helper-proto.h" #include "exec/helper-gen.h" =20 -#include "exec/translator.h" #include "exec/log.h" #include "qemu/qemu-print.h" #include "fpu/softfloat.h" diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 624e6b7786..aa12bb708a 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -32,7 +32,6 @@ #include "semihosting/semihost.h" =20 #include "trace.h" -#include "exec/translator.h" #include "exec/log.h" #include "qemu/qemu-print.h" #include "fpu_helper.h" diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 4db8b47744..7aee65a089 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -938,8 +938,6 @@ static const char * const cr_regnames[NUM_CR_REGS] =3D { }; #endif =20 -#include "exec/gen-icount.h" - /* generate intermediate code for basic block 'tb'. */ static void nios2_tr_init_disas_context(DisasContextBase *dcbase, CPUState= *cs) { diff --git a/tests/unit/test-cutils.c b/tests/unit/test-cutils.c index 2126b46391..3c4f875420 100644 --- a/tests/unit/test-cutils.c +++ b/tests/unit/test-cutils.c @@ -26,7 +26,6 @@ */ =20 #include "qemu/osdep.h" -#include "qemu/units.h" #include "qemu/cutils.h" #include "qemu/units.h" =20 diff --git a/ui/gtk.c b/ui/gtk.c index 4817623c8f..7f752d8b7d 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -53,7 +53,6 @@ #include =20 #include "trace.h" -#include "qemu/cutils.h" #include "ui/input.h" #include "sysemu/runstate.h" #include "sysemu/sysemu.h" diff --git a/util/oslib-posix.c b/util/oslib-posix.c index fd03fd32c8..77d882e681 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -59,10 +59,6 @@ =20 #include "qemu/mmap-alloc.h" =20 -#ifdef CONFIG_DEBUG_STACK_USAGE -#include "qemu/error-report.h" -#endif - #define MAX_MEM_PREALLOC_THREAD_COUNT 16 =20 struct MemsetThread; --=20 2.39.0