From patchwork Wed Nov 30 13:56:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 629484 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp874318pvb; Wed, 30 Nov 2022 05:57:29 -0800 (PST) X-Google-Smtp-Source: AA0mqf7CSmKIsoZGFHE1kl7c5M5nIMs2cJT0yEl4A/uxbRRg3hC9xS+9wyE4T4zi130/8jHkLDL4 X-Received: by 2002:ae9:f80e:0:b0:6fa:ffd4:d7d8 with SMTP id x14-20020ae9f80e000000b006faffd4d7d8mr41012248qkh.696.1669816649815; Wed, 30 Nov 2022 05:57:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669816649; cv=none; d=google.com; s=arc-20160816; b=tT4zGGD43ylggHOeRClUwlxSNGPPoypMx8Pnd4YXldJSl0ec3Pc6CoVMmBZIjSA57w U/+gRML8UP7vgf6iXs8vIsMRhuf3mcafF/mNL79UCWMwZVg14k9+K0WE5FfAxintCoFO xoEE1SbB9S/kScJTk9H+gNmVo3DMebmeHueDYiu9bJn3cLwIG5dnfDVXZzhn1ZXWxPB7 k0IMV5C1kF9cznyCS8M5OB+0b+n/BVHHqD4VKEy9NRL2PXBmENhopfQeIvEm89lrThg+ o3YgYo3X3HaGqMKh/fcGi6bohqtFzJUVnCuQZOKPQjbNuv0GlatDGZW3yXI6eMG+CBin 8/tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=aBdBv82UGKe7lpbkxdfAYLFcJnkb42yafjZ/CJWDlQw=; b=Vc1TfpnHaZEYwGb+FFRh3ruXupXWT2d2gp6UwkDtRuy8wJiLOTJg6YfQv/+DZYVUVR wfMj2jYBZB7ospfs4Ct6WsC236J6YmO5t4+oK+fdYoR6Xbu2pk6Z3nPMCuJesG37INYX ZUjlhmkBjbI4o0eN7ngRnw2lxG/CCjEpItOjsvKcW6AmiBKPg3KtdRhtRfn91uDGeG8F 7sXyPylqqp0KnOMp1RzjLnEhG4lhTfrK6uMUZDIYP4Rr1wb/HRbFTOirYNHRxDgnfBQh NJDH1UdsGlUJu3C4G4xp7h5XMhhqzKI0q08gCIcKYu8fCEPpLM1Zl2eGU8A3e1z6K8P/ d7Ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DnWVCEd3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bw16-20020a05622a099000b00397a47f88e4si834166qtb.783.2022.11.30.05.57.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Nov 2022 05:57:29 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DnWVCEd3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0NaC-0001u1-7J; Wed, 30 Nov 2022 08:57: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 1p0Na8-0001r2-J7 for qemu-devel@nongnu.org; Wed, 30 Nov 2022 08:57:01 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p0Na1-0004Qk-G8 for qemu-devel@nongnu.org; Wed, 30 Nov 2022 08:56:58 -0500 Received: by mail-wm1-x331.google.com with SMTP id h4-20020a1c2104000000b003d0760654d3so47459wmh.4 for ; Wed, 30 Nov 2022 05:56:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aBdBv82UGKe7lpbkxdfAYLFcJnkb42yafjZ/CJWDlQw=; b=DnWVCEd36Pwgn0clhpGFlxpVZvUJ3kiDclFVU6NWzUtB8T4IUg3cy9g0rh3PdCTY+g 0mLMxQeAJzry8qNDjDek8yW/ou233XtHF2U+udpsj9hwPAU+juBnA9Qr/51GpG6vm1nB c3A37oKpQ0CDRIpr0sDMaGAl/+EX+EfqkZFcz/rzhaxxDPuFC8N0LjxGbSPYdM9sYq9o /36NZ13uh09ybVEBicC3ThQOo2SXVwTqCPXBKrgQtwVadPM2Yq9HgLxeCaMyoknuwMb4 xKPVW2+J6IU8z4vHbZgKmf6qlWrkbSw1vJxqm94SjUzLyC0N8S5r6cMO45Ld7nh48aVn IKtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aBdBv82UGKe7lpbkxdfAYLFcJnkb42yafjZ/CJWDlQw=; b=sAlJAJ/GYpai6BTfJFhL8vFjSXjHAlKdE/Kg4X5CU7XOxmpjbrf+Wtc3T+6BEue9AN rcLWJGPqWVU4MGDmfdPhqSIG1u7v1KO0nIIMp60ZGDlxAnlkabEoNNDhu93SOQETQJI+ Th1UxgZdFsaIJVfQQtRZWwUIClIrxK0A66CSDOBedhDuozuhzejb9GgTMsZywnB1QZUz pv+XTDzKB21VgjStfiQ1dQZkUNhh74gfbV3Sw5zjEWwNTftT+MNs3KLefP2z72sHvpWd qdmIDxv8wR9iX6rERGBUidFaHpXZmdBgBfLpjp14t3gECMvVBjafEZcNS78BOSMQYQfY 2bEw== X-Gm-Message-State: ANoB5plbvr4uCXbIDTAvBPW2zDLMebiaaO39iG+HAle77tNKAMVI+nrp NTDm7hjrviNgkCVY1CExp57mT4j5Al5cQNOl X-Received: by 2002:a05:600c:5254:b0:3d0:75d5:c64b with SMTP id fc20-20020a05600c525400b003d075d5c64bmr1549819wmb.12.1669816608332; Wed, 30 Nov 2022 05:56:48 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id y13-20020a5d614d000000b00241727795c4sm1968825wrt.63.2022.11.30.05.56.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 30 Nov 2022 05:56:47 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Yanan Wang , Paolo Bonzini , Marcel Apfelbaum Subject: [PATCH-for-8.0 1/2] typedefs: Forward-declare AccelState Date: Wed, 30 Nov 2022 14:56:40 +0100 Message-Id: <20221130135641.85328-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221130135641.85328-1-philmd@linaro.org> References: <20221130135641.85328-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Forward-declare AccelState in "qemu/typedefs.h" so structures using a reference of it (like MachineState in "hw/boards.h") don't have to include "qemu/accel.h". Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Fabiano Rosas Reviewed-by: Richard Henderson --- include/qemu/accel.h | 4 ++-- include/qemu/typedefs.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/qemu/accel.h b/include/qemu/accel.h index ce4747634a..e84db2e3e5 100644 --- a/include/qemu/accel.h +++ b/include/qemu/accel.h @@ -26,10 +26,10 @@ #include "qom/object.h" #include "exec/hwaddr.h" -typedef struct AccelState { +struct AccelState { /*< private >*/ Object parent_obj; -} AccelState; +}; typedef struct AccelClass { /*< private >*/ diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 688408e048..073abab998 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -21,6 +21,7 @@ * Incomplete struct types * Please keep this list in case-insensitive alphabetical order. */ +typedef struct AccelState AccelState; typedef struct AdapterInfo AdapterInfo; typedef struct AddressSpace AddressSpace; typedef struct AioContext AioContext; From patchwork Wed Nov 30 13:56:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 629485 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp874341pvb; Wed, 30 Nov 2022 05:57:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf4tetJQ7t0qrcjpUVGhRZCdN78R2Pw96wdg8sUaKjffezBI0hr0aJcyYikQI3oyATrAIpRS X-Received: by 2002:a0c:9c41:0:b0:4b8:65b8:134d with SMTP id w1-20020a0c9c41000000b004b865b8134dmr39878965qve.51.1669816653178; Wed, 30 Nov 2022 05:57:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669816653; cv=none; d=google.com; s=arc-20160816; b=hRxu8sYA9rnWBDMU5mvtLTpx2fg8XayKC6PJveYVDcs/ZSH6SHU/AYWxtKNFcxHhEw xwD65QHAFSXefuIPKWmFVvAI8Ta3t7emt8egT6NoyuPxnLm+OxSIQFVFmfS+xRYevmRC k1AJ2KMMJwDicnT943KZmsZic+TcP5fA6Ldp2H+3k0m7cWJGfjetkfRG8NVQo3KerzKp eA9jdzwmKOBVeEgSp9MhqxvCPtxoTk89jm6zko8kLeraAHNXO18LDRW0Wb2bA1b13YJx IMldrMeSWhGe2AyAZksL/UAQ+Q8vku5/cNPDE+rNmIdWziLfc0mHlLA/IpROVL81Laib bemg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=k4Dma3IuLzhJAgv9Db5pItElfrffkxrejAOnuwFruKw=; b=cPXtPBJHuo4HQbod770R5R9F/wtS4hpv1bd21GrVuT+gYM9umRM/QfZTG2cufJUxaT hGWikQVNTPjgmYl09CwIIqTHvMXXALT6Zn2otixbAJgHNC1riIio6bx0A1mPaKA2O4kJ fyw4khrTzHxqZMng87TlKx0d2jpT1SekFEK025hu5KiPM6Iz0goQ5o8yQzPi/gCmtlMO BZXOmeQUPBNbBewIXQkVRrYvfDirg7a3MuqUksUADSFBhctjTNp+S7jHJNyQzcyvb7JE XbNODkeHtPajTISY/HO1uag6crMcEvhAd4OOTxDWZj6oSdaGuHRMv4tGCDjw+rH6Robw nWxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r0gV8yMB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 2-20020a0562140dc200b004bb70e44f6dsi917386qvt.188.2022.11.30.05.57.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Nov 2022 05:57:33 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r0gV8yMB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0NaD-0001uf-Oh; Wed, 30 Nov 2022 08:57:05 -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 1p0NaC-0001u3-CM for qemu-devel@nongnu.org; Wed, 30 Nov 2022 08:57:04 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p0Na6-0004S2-EO for qemu-devel@nongnu.org; Wed, 30 Nov 2022 08:57:02 -0500 Received: by mail-wm1-x329.google.com with SMTP id h4-20020a1c2104000000b003d0760654d3so47623wmh.4 for ; Wed, 30 Nov 2022 05:56:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=k4Dma3IuLzhJAgv9Db5pItElfrffkxrejAOnuwFruKw=; b=r0gV8yMBWmSokUsyf1zL/4TCnTIOruhYS25aOx+DaGu5NwODAVIdHCGPhn5iiVPNe4 fu6Hhh0oHITfGxnure6D01AGIzaWcyvL4hgJ5JqvffcfYhJPfUhQCNsHqMhS4yTC7eCY idJnHkZeNxS2uCNAk0+vTLrowDceXmue2kYbuMBH/KkPTAf3sHm2NATvWCeD5rMPicH8 9MuxUzKS3iiEiZ1sA3yNVur4/MyUV5myxWzb9C5eRlZi53Y/D0EwtbrKC4wbdA191yra 15CoxLD+aMg8saptHnXSBcJFaIb/ODxKFkMZPxrnx9LUbfwnLsC30XpxgdApwWB/6mnj Oywg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k4Dma3IuLzhJAgv9Db5pItElfrffkxrejAOnuwFruKw=; b=oicZkmHL+2JNPP6mEioAzjRiN9u07QrIIID9TPoPmBzWismOpKC5Pus/NdAvBP7Oh+ T88CV1sN94B643q3WC8kYgWVLUqB8VFxTQqEF0kGOd6KQzVS4pO/pqxaCDSWhylbzleg KYlRpxercwXF6RizOjHn4aVqZmMl1Trz/nLmuyEgSNnjcSR0EWSgMsS3gNeHJrGN3gIk dXowKqixwiWSe1UunRa1i7UvVmKwhbd4nrePZJ8RowNjXYO6I0xTtQIJTVDdYmIhYhGP 14XlQxqeTK5NBGXScG1nQwoqoK5uihdIlF7AhAtIQ/JGCGLUBE6HtXYZY9LsVzvLX1SH WWhQ== X-Gm-Message-State: ANoB5pm5IVsaDJ3Of/qKy99EJ3oJIgF8tU092lBdFy5b27hp1XUAJmyd smeacwQdG3aVEtVmLvoTJAUMVbKTiRj1r5Q/ X-Received: by 2002:a05:600c:a56:b0:3cf:77a6:2c2e with SMTP id c22-20020a05600c0a5600b003cf77a62c2emr30471502wmq.179.1669816615816; Wed, 30 Nov 2022 05:56:55 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id iv16-20020a05600c549000b003cf87623c16sm6396204wmb.4.2022.11.30.05.56.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 30 Nov 2022 05:56:55 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Yanan Wang , Paolo Bonzini , Marcel Apfelbaum Subject: [PATCH-for-8.0 2/2] hw: Reduce "qemu/accel.h" inclusion Date: Wed, 30 Nov 2022 14:56:41 +0100 Message-Id: <20221130135641.85328-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221130135641.85328-1-philmd@linaro.org> References: <20221130135641.85328-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Move "qemu/accel.h" include from the heavily included "hw/boards.h" to hw/core/machine.c, the single file using the AccelState definition. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Fabiano Rosas Reviewed-by: Wilfred Mallawa --- hw/core/machine.c | 1 + include/hw/boards.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 8d34caa31d..42fc6f1e84 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "qemu/option.h" +#include "qemu/accel.h" #include "qapi/qmp/qerror.h" #include "sysemu/replay.h" #include "qemu/units.h" diff --git a/include/hw/boards.h b/include/hw/boards.h index 90f1dd3aeb..f00f74c5f4 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -6,7 +6,6 @@ #include "exec/memory.h" #include "sysemu/hostmem.h" #include "sysemu/blockdev.h" -#include "qemu/accel.h" #include "qapi/qapi-types-machine.h" #include "qemu/module.h" #include "qom/object.h"