From patchwork Fri Jul 7 11:30:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 700022 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp3819231wrs; Fri, 7 Jul 2023 04:33:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlERb9RJzbuWkDginLS48o+5spNDDWKp5oT4c2UPz2yZ/X9Ek1xAdOGanUY0ZAmnbJqgNRPF X-Received: by 2002:a05:6358:4407:b0:134:ed9b:15a7 with SMTP id z7-20020a056358440700b00134ed9b15a7mr4925152rwc.30.1688729586794; Fri, 07 Jul 2023 04:33:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688729586; cv=none; d=google.com; s=arc-20160816; b=F3gFPZkeVSi4ROCjPK14Ej7vrUXthC4xlG3kyRZgu2Z7kq6Hx7dk5fVCAHkUuQ6ozE lcDKybCKWPbj/2kP88PBZyterb93g1Kwxd8PPT8ynC0+fj94BlaxPlSb9tHMcOWhFj9y 5B3rDkrRtTyDfPe5lLDtnbkgJxTNwaUEQoyeiblRz66I3EKxMEkKI8uAJr6QcRu/OSPk hq04cnfGRUc8UhO7yevdo4aB+bD/34Sc4RtuOCIiueMYlLRpsdNPm+Q1vgln8nxTEDGS 2UvFxLmieecE1ERhAjHDzKK2vKjTo9VYKxXYzA7v+A1P/KTJE1Njzgkz32/w5YqmfwO3 yooA== 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=U1HJUmepcou8YNKRL7zfbfphizzPHWU+xLkX0u2RLvI=; fh=PhyTjWA6JxDunRxvcn4SgdK3IMENWumMKzlBkgmot6o=; b=wiEIQ30VfNmYcVWYoFQYEIXCrYt8ojBKiUJGrWiL0GyRzmRQ/8KsD11VWFqtYrD/UP vsurkG88bS7SFj9KfV3QUWgd2b6kcc3bVq1gMtWlXqrCA6GKVpns7gq8D2nCBjFP2uBe FEz8KRWLWL/8CSltEB1lG9t7PpfzK6VLp1mLSyHaSzTlXUq+eGbDTAkIJ0HKgtQTCPV4 FagPyqjfEMTDWfqZt5pjyEwQ0tE+r2muZjynWYv02iprbIAVGm7xAD6iGqHmfS/3pCj8 cc5u6O7+2G13qFO+nR5ih2grQ5biCLCQRULfZjaHEnEEPwS1xTfWu8fYLIlh/zJ8FiCh I4iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b="osrH/ptx"; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m6-20020a0cdb86000000b0062388040b4csi2476300qvk.203.2023.07.07.04.33.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Jul 2023 04:33:06 -0700 (PDT) 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=@gmail.com header.s=20221208 header.b="osrH/ptx"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qHjge-0001t1-0L; Fri, 07 Jul 2023 07:31:44 -0400 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 1qHjga-0001qJ-EK; Fri, 07 Jul 2023 07:31:41 -0400 Received: from mail-ot1-x334.google.com ([2607:f8b0:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qHjgV-0006Ur-8w; Fri, 07 Jul 2023 07:31:40 -0400 Received: by mail-ot1-x334.google.com with SMTP id 46e09a7af769-6b8baa72c71so1619261a34.2; Fri, 07 Jul 2023 04:31:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688729493; x=1691321493; 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=U1HJUmepcou8YNKRL7zfbfphizzPHWU+xLkX0u2RLvI=; b=osrH/ptxXM+lrtsnfQ37YciVTNyamSTe0vvQLTyGiDLc66KQAsYObaRJhYglLfJ15u KLE59QyStI3yLAgcECmAvZgetNmxe2FqLINoggBjy21l+v8ijD0lshnqikRihG47sAqZ EefH6Jgrd8nkaWo99hnzahS6MQa6LnseeRusFUxdncHPdqR2ZWfLLMFJ9PxACDCq76dn ztf03p9LG9ab0nUePkgtb4a4jZX1WwhfVZSx54uNK0fmqQ3mgQtkdWK8X8b3laIhzs1v cbwJjjRKugoL7A5JFyFWNr/gHlS+sVaB+quqPTZKPs7iSOd/GbLhMEVfsE8w1ET9m99o KuSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688729493; x=1691321493; 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=U1HJUmepcou8YNKRL7zfbfphizzPHWU+xLkX0u2RLvI=; b=T7AWIG24dGZLNVx7oZNDxpo+MFCZ7XLgx7yc5y+dGG1og9TPOHMW0RLJtSLx36Bl7c sjBJod54M3OLdDGFbaalZ7a6DnI3PT2ShuE3tLVXCCxgFvOSiMIBxvLxWGjt25myuC/j LAKcqW6VdV5OlxDgiSXR/zTiQfFGPycYevhIiXu2sEubycsEcrkg5XnLUp5yjxRFH4QL w9peqdZATy8V68Xf/XPO4+MUKucjhdjYB5oeH4/B2gxq6B9bwy35kALZhr9XjJJJZi/i +TwXp6H6DgKDdhrMjLfCQ4bsZl5byqj3qdTM9M6SILPKZjHZEeiBROFLyhmXlGAWXp+I M75A== X-Gm-Message-State: ABy/qLZ3x/QP4fi0he9qKAfNkypRo7XkroTI+NhqIgIhK3vn+kwQ+G7e +l48k65IecIENZFWa5k/dbiLrzkdCmo= X-Received: by 2002:a05:6871:b2b:b0:1b4:56ed:eb88 with SMTP id fq43-20020a0568710b2b00b001b456edeb88mr1588690oab.45.1688729493689; Fri, 07 Jul 2023 04:31:33 -0700 (PDT) Received: from grind.. ([2804:14c:f435:9162::1002]) by smtp.gmail.com with ESMTPSA id g17-20020a9d6c51000000b006b74b37f5e5sm1574859otq.20.2023.07.07.04.31.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 04:31:33 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, richard.henderson@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Greg Kurz Subject: [PULL 04/60] target/ppc: Only generate decodetree files when TCG is enabled Date: Fri, 7 Jul 2023 08:30:12 -0300 Message-ID: <20230707113108.7145-5-danielhb413@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230707113108.7145-1-danielhb413@gmail.com> References: <20230707113108.7145-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::334; envelope-from=danielhb413@gmail.com; helo=mail-ot1-x334.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 From: Philippe Mathieu-Daudé No need to generate TCG-specific decodetree files when TCG is disabled. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Greg Kurz Reviewed-by: Richard Henderson Message-ID: <20230626140100.67941-1-philmd@linaro.org> Signed-off-by: Daniel Henrique Barboza --- target/ppc/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/ppc/meson.build b/target/ppc/meson.build index a69f174f41..4c2635039e 100644 --- a/target/ppc/meson.build +++ b/target/ppc/meson.build @@ -28,7 +28,7 @@ gen = [ extra_args: ['--static-decode=decode_insn64', '--insnwidth=64']), ] -ppc_ss.add(gen) +ppc_ss.add(when: 'CONFIG_TCG', if_true: gen) ppc_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files('kvm-stub.c')) ppc_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user_only_helper.c')) From patchwork Fri Jul 7 11:31:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 700024 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp3821134wrs; Fri, 7 Jul 2023 04:37:56 -0700 (PDT) X-Google-Smtp-Source: APBJJlHXIdDcsdPtvSPnBhpWDFVJWqjHd5xezVSXPQczd/dyooCG8FSRH10Ny+iGUV/kthsBScsK X-Received: by 2002:a05:620a:44c3:b0:765:890b:7586 with SMTP id y3-20020a05620a44c300b00765890b7586mr9962542qkp.29.1688729875826; Fri, 07 Jul 2023 04:37:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688729875; cv=none; d=google.com; s=arc-20160816; b=GK9OHQdGBi2s/myv0I9UkF18tMU1o1pX9GUnZv1/w3OzvnOzATW9OFTgvl63TFsSLy tnGXCqMjZdRb9nYltlvWA1YlCaaUkvWV05NpKYvRl5Txo05MLgj4Bl9HOcQPOWWTn8GS QFWnfXu6wJZ0m1E/Dx2IC9WrS9UH+zc7p5un4bBPz/ETmipJmtloVJG66tPEouTlY9SO xp28T8/0oDhCWbQKy9+a2hfgOJmLLd1daVfiklyXdIQR08zsvv8GgQhYqRyBX0F/Ef4Q bjHVbNxij4eSLtYcllvwYCqIxJtrtAqJEz5/vv4YD8lSl+XQvNPY+ZYl/w+BgW68rnZh m8Ig== 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=KeLn95Ux33FFhuaR0eKb0nd/D54OxxvXqQiZdIS6F0w=; fh=J657/pPYZa3TeMvukxkRCNUmCqwUeahUTwbejI5EJBo=; b=D5hDVJM4WFw1YdKzT76n3Hk1HPZxC1AS3DpPeCUKM9S8AaAmiMqfkLQeVHhzoQYOIH VAz0wDHe3wXVqu0wUGPu5JcAUm8c/FlCaJDOasxb2HapC/ELkfvD3Y1xY3Jh+xGFXg1H cu9l0CGTEVyMEt0GA2X84jymkRJHmgKjS85WXH5zrZudMpPJPfSz6O00GrbugKfXG+FR yTxiJTLidTxAeCUtp82z1/IizoUA0eSsArsbMe94UIchPlG6G8oYuGE3IGw/KObvYsco bqjENg6YArGwd4oaIZmwEokvjZNRYaHq2WYz5VPzgPVWd7bdVs2IAUfgszdf8lXYqcRQ 9wTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=SZu4IW1d; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id pa38-20020a05620a832600b0076760b69bcfsi2395673qkn.593.2023.07.07.04.37.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Jul 2023 04:37:55 -0700 (PDT) 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=@gmail.com header.s=20221208 header.b=SZu4IW1d; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qHjiW-00074T-Sr; Fri, 07 Jul 2023 07:33:40 -0400 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 1qHjiV-0006uV-Ce; Fri, 07 Jul 2023 07:33:39 -0400 Received: from mail-oa1-x32.google.com ([2001:4860:4864:20::32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qHjiT-0006zf-Kr; Fri, 07 Jul 2023 07:33:39 -0400 Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-1b055511f8bso1087313fac.1; Fri, 07 Jul 2023 04:33:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688729616; x=1691321616; 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=KeLn95Ux33FFhuaR0eKb0nd/D54OxxvXqQiZdIS6F0w=; b=SZu4IW1d94Z0Xql7CzBMTxqGBgRysO4oZpS2gzY01qfFUukLHuDt59OiWvcvgnaaOv BJeke+/oA/OA30i4b/Ap31rYBzJ5tZm0VXkpoQAH+1cOHRQnP8QDjHaFNmqPkq5DQyId 58AyDDKjdgQm6DeC8Zs7DrDTzBXzt7YOWA6+n9iDsU9EjL9/5I2fhBsizpOYaUKlwKBb V+N6q5r4lE/ff1SYr0/yPvG4UGyjMtiojf1viRdMsUmVmmWcctcblJChWjp5WkNU6IZH jxiJ/svumFVXDeOthKEe03SDxMrinC5gIz/pruk6cKFlQNzj8xWiEXo4vCMJ0JH/gJje W79A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688729616; x=1691321616; 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=KeLn95Ux33FFhuaR0eKb0nd/D54OxxvXqQiZdIS6F0w=; b=Y3xGw/YPGko2FYltHIhXW1wCiOhRvnDgOSOyPCYtHBQnibPP7STHmW2B2J6yetsySD 0bNMGU33AY98VDnMhtW9g17lZrY2rHtANfif50NnQM4ZSobX3z6Oeh0Z1cCGc+E7ROSl j5CH4tePn+a0q0Io+fCrF7xeoVKb6wijOPKqr2PeOfEXzkIMjBjcx0AFZKA+bVPsd7nQ aGEuatHL1UgahFNj2mvhvTtF+De+Faa2zd/iflWQa7Z7/N+nB81yUVOTtIn2Dx0dirHp KqWabfkZUqbbfnm1yWsutMym38I67z4NfRTYTGDVqMGCaK1JCnHjfKYZwOIA7i41bqaF zv9A== X-Gm-Message-State: ABy/qLYEiYBeSbJRfJ+MM7ljtuXrA6GKxw11j24M0yr20D9sOJ+R22O7 KG9x4Vm95dGG9Nqr5hMJGbFat09SLl4= X-Received: by 2002:a05:6870:c34e:b0:19e:b8e0:143f with SMTP id e14-20020a056870c34e00b0019eb8e0143fmr2449159oak.9.1688729615933; Fri, 07 Jul 2023 04:33:35 -0700 (PDT) Received: from grind.. ([2804:14c:f435:9162::1002]) by smtp.gmail.com with ESMTPSA id g17-20020a9d6c51000000b006b74b37f5e5sm1574859otq.20.2023.07.07.04.33.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 04:33:35 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, richard.henderson@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Greg Kurz , =?utf-8?q?C=C3=A9dric_Le_Goater?= Subject: [PULL 53/60] target/ppc: Have 'kvm_ppc.h' include 'sysemu/kvm.h' Date: Fri, 7 Jul 2023 08:31:01 -0300 Message-ID: <20230707113108.7145-54-danielhb413@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230707113108.7145-1-danielhb413@gmail.com> References: <20230707113108.7145-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2001:4860:4864:20::32; envelope-from=danielhb413@gmail.com; helo=mail-oa1-x32.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 From: Philippe Mathieu-Daudé "kvm_ppc.h" declares: int kvm_handle_nmi(PowerPCCPU *cpu, struct kvm_run *run); 'struct kvm_run' is declared in "sysemu/kvm.h", include it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Greg Kurz Reviewed-by: Cédric Le Goater Message-ID: <20230627115124.19632-2-philmd@linaro.org> Signed-off-by: Daniel Henrique Barboza --- target/ppc/kvm_ppc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h index 611debc3ce..2e395416f0 100644 --- a/target/ppc/kvm_ppc.h +++ b/target/ppc/kvm_ppc.h @@ -9,6 +9,7 @@ #ifndef KVM_PPC_H #define KVM_PPC_H +#include "sysemu/kvm.h" #include "exec/hwaddr.h" #include "cpu.h" From patchwork Fri Jul 7 11:31:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 700025 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp3821629wrs; Fri, 7 Jul 2023 04:39:13 -0700 (PDT) X-Google-Smtp-Source: APBJJlH+HOmxYCoNEIzkzaYRcGNjcOnF06RxgTPrqp3M6OnpNKYM7fiNPwCsEyCV1QKs0rbOlhYb X-Received: by 2002:a05:622a:1897:b0:3f6:af5f:29a6 with SMTP id v23-20020a05622a189700b003f6af5f29a6mr6450756qtc.33.1688729953358; Fri, 07 Jul 2023 04:39:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688729953; cv=none; d=google.com; s=arc-20160816; b=TCZbNEJXbGK5SElFZQEJyWX3a2FLvpLZ8gWHH0JeBtblohlnWaI2bfsRzmc67xUjGE RKM0v6YFCIYiCnREBGnD4xHyLdCjOr1/em0TI8aFePnFHmQLoSb+fMzw4WtmZYCJ7zJS nr5ENTJGQXL/+h1nPoC6OmAhboVYoQhPfBpIdmPW7pmqlUlHhUOub/ZI+Q//ywRG+iN5 yQy/TJdP/0+Le7d8g1BJrph20op8D8h0kBxgszIk1RwpDxjpCRi+wRC/+yN9wgt8Vfvd bgYjAo2fYt5QSittrtEd0/R4xyz3J5xB21iKplzIBMeshR6Ru5EvYm4SISGn+PcUQvhB KzCg== 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=vyRl/W7ZNZqVgECRppBCmUJyOD4zjvRr0STjlJCdpG0=; fh=52YY/OuLkLNjvSoAPE9Ire0sLQcF4l+B9WKlPNKG8ko=; b=XOK3ER23GRqS5Ebyuy7MuF+r724+wd+Uw44gKJjcSKMa12OVuPZnB7ghI28uwvVPmt CP8y0Q3wRRaxVj73hd4Qwrg5WeSuUTuBFVLvMQM/SWbn5ElRyBw3UFHmVA2lFl+t/VOY ywWi+sTfMNRXfGS2GSV0qzEmVTou8e+AgR6vwIsuOaqE3OoDotUVVR+l9cBzAMa6ycjU KCoaXViQ2WqVQki3AnzxsxwMqbJFW+O3H5wTw7ucnGlwl8nzRbOvMRimI7H18jYtZ7Ho jSw3RhW3cVawMstkQvwQ3tv649tE0jhaG60qWwTOg8HByS5tJXAxvbefvifGG67Sex1Q FFOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=ocBbeUdv; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z4-20020ac87f84000000b003f4f522dd90si2384849qtj.457.2023.07.07.04.39.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Jul 2023 04:39:13 -0700 (PDT) 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=@gmail.com header.s=20221208 header.b=ocBbeUdv; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qHjiZ-0007DA-Kd; Fri, 07 Jul 2023 07:33:43 -0400 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 1qHjiX-00078E-K1; Fri, 07 Jul 2023 07:33:41 -0400 Received: from mail-oa1-x2c.google.com ([2001:4860:4864:20::2c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qHjiW-00072a-0P; Fri, 07 Jul 2023 07:33:41 -0400 Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-19fa4346498so1678630fac.1; Fri, 07 Jul 2023 04:33:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688729618; x=1691321618; 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=vyRl/W7ZNZqVgECRppBCmUJyOD4zjvRr0STjlJCdpG0=; b=ocBbeUdv/ZXn0vgVUDNw0gJ7buGeZIBxp/nOufRXXAtFmJPA1O5LaETQ3uNjjhQZkQ P4l9QIcg7yYu8M0SkDDIoYWzLMbCicNY5Psrzc8pbLwedisRIsPnLPY9DbSVEKJuu1fp ssVQVhVjLAd+xvyjhoJYpDX7MkMFiWyTryv5TTeh8w6DSfd8+MvZplRUAtFHAhiMHc7P uiUpc1Sm4NhcOzB9B7vwt8PJznqXXFHYavGO4nj9ujJESDxEcNS1gZ4WmsQM1gvdevE7 JY81RByiZlQiJ6l0nrecq7AV5upMIxeHC9yByz2HhKsElTWxhLbZinTZk8gUW8SuTI0H 9vYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688729618; x=1691321618; 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=vyRl/W7ZNZqVgECRppBCmUJyOD4zjvRr0STjlJCdpG0=; b=bboWGCWXLW6jPWtf3na+tS40LkGZ5vRpxduomAzgFH3eW1XAnsiIEJCB0gxb67P7qt mDInDXZyHaxYwb7m53PUMpsLLuoWQQH1HcHMdbvrAg+++GRGarS54oBpqgiq7gnI6bAC 5H/0l7E8CX8VwlT008sfpy2VvzimawRtXyLsD1BPagfBZAepERnRLMcTBOcobgDSqkR+ lHSNiy7IK6tfVbQMh7fT9k4TzG8ndy+86PkeRZtc4LPmDFBDXdQQj8S637kW/zpAT7O0 i7f4EHwhEbZw+aSvy0poIXbM2gtBNFgJCm2lejByZcYCZpdRJucbElYlraZT2AjWc56T th/g== X-Gm-Message-State: ABy/qLZRsYXG0q0iyOtKZDTsNoAdByY4MKx2tzZjbPYS5ocbm42orgtj t62Z/MKX5aQQrPo+nUtVOAT+Cvnn2qs= X-Received: by 2002:a05:6870:fba7:b0:1b0:3075:2f9d with SMTP id kv39-20020a056870fba700b001b030752f9dmr5400269oab.34.1688729618282; Fri, 07 Jul 2023 04:33:38 -0700 (PDT) Received: from grind.. ([2804:14c:f435:9162::1002]) by smtp.gmail.com with ESMTPSA id g17-20020a9d6c51000000b006b74b37f5e5sm1574859otq.20.2023.07.07.04.33.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 04:33:38 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, richard.henderson@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?C?= =?utf-8?q?=C3=A9dric_Le_Goater?= Subject: [PULL 54/60] target/ppc: Reorder #ifdef'ry in kvm_ppc.h Date: Fri, 7 Jul 2023 08:31:02 -0300 Message-ID: <20230707113108.7145-55-danielhb413@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230707113108.7145-1-danielhb413@gmail.com> References: <20230707113108.7145-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2001:4860:4864:20::2c; envelope-from=danielhb413@gmail.com; helo=mail-oa1-x2c.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 From: Philippe Mathieu-Daudé Keep a single if/else/endif block checking CONFIG_KVM. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cédric Le Goater Message-ID: <20230627115124.19632-3-philmd@linaro.org> Signed-off-by: Daniel Henrique Barboza --- target/ppc/kvm_ppc.h | 62 ++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 34 deletions(-) diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h index 2e395416f0..49954a300b 100644 --- a/target/ppc/kvm_ppc.h +++ b/target/ppc/kvm_ppc.h @@ -93,7 +93,34 @@ void kvmppc_set_reg_tb_offset(PowerPCCPU *cpu, int64_t tb_offset); int kvm_handle_nmi(PowerPCCPU *cpu, struct kvm_run *run); -#else +#define kvmppc_eieio() \ + do { \ + if (kvm_enabled()) { \ + asm volatile("eieio" : : : "memory"); \ + } \ + } while (0) + +/* Store data cache blocks back to memory */ +static inline void kvmppc_dcbst_range(PowerPCCPU *cpu, uint8_t *addr, int len) +{ + uint8_t *p; + + for (p = addr; p < addr + len; p += cpu->env.dcache_line_size) { + asm volatile("dcbst 0,%0" : : "r"(p) : "memory"); + } +} + +/* Invalidate instruction cache blocks */ +static inline void kvmppc_icbi_range(PowerPCCPU *cpu, uint8_t *addr, int len) +{ + uint8_t *p; + + for (p = addr; p < addr + len; p += cpu->env.icache_line_size) { + asm volatile("icbi 0,%0" : : "r"(p)); + } +} + +#else /* !CONFIG_KVM */ static inline uint32_t kvmppc_get_tbfreq(void) { @@ -440,10 +467,6 @@ static inline bool kvmppc_pvr_workaround_required(PowerPCCPU *cpu) return false; } -#endif - -#ifndef CONFIG_KVM - #define kvmppc_eieio() do { } while (0) static inline void kvmppc_dcbst_range(PowerPCCPU *cpu, uint8_t *addr, int len) @@ -454,35 +477,6 @@ static inline void kvmppc_icbi_range(PowerPCCPU *cpu, uint8_t *addr, int len) { } -#else /* CONFIG_KVM */ - -#define kvmppc_eieio() \ - do { \ - if (kvm_enabled()) { \ - asm volatile("eieio" : : : "memory"); \ - } \ - } while (0) - -/* Store data cache blocks back to memory */ -static inline void kvmppc_dcbst_range(PowerPCCPU *cpu, uint8_t *addr, int len) -{ - uint8_t *p; - - for (p = addr; p < addr + len; p += cpu->env.dcache_line_size) { - asm volatile("dcbst 0,%0" : : "r"(p) : "memory"); - } -} - -/* Invalidate instruction cache blocks */ -static inline void kvmppc_icbi_range(PowerPCCPU *cpu, uint8_t *addr, int len) -{ - uint8_t *p; - - for (p = addr; p < addr + len; p += cpu->env.icache_line_size) { - asm volatile("icbi 0,%0" : : "r"(p)); - } -} - #endif /* CONFIG_KVM */ #endif /* KVM_PPC_H */ From patchwork Fri Jul 7 11:31:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 700026 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp3821843wrs; Fri, 7 Jul 2023 04:39:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlG67iYrcYMlwK3GPeDEDG1boxJxc6ZBchnQnUe0b1pOR1rbo8Hu4wtydvtppsI/btwXGBcN X-Received: by 2002:a05:620a:45a1:b0:767:3771:f770 with SMTP id bp33-20020a05620a45a100b007673771f770mr4619466qkb.40.1688729980553; Fri, 07 Jul 2023 04:39:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688729980; cv=none; d=google.com; s=arc-20160816; b=FdoLS10o+6bz0cBIsDep7bVRKm2hscTtRwf1kmK26Eaqa0BfkkI9NDUxX57sYlbTS8 CJy5qAyXGGfrzqycOlOxMOobljUiIzlczfWijOq+RFe5wyLsSP1WDjlFybH6dEMGpkma uiYH27YBs3Pt4dZqakX6auY+HGTADR2bxID4DRlWbCaijpQwQu1KcTTW9RXdijbecKXd b6vnQX7Rk4yYiYcB+so3F+BjnKxWdRHMVGlqFF2YkoY2vsjZKrn9r6yh+5uXB3HDIjmU w6fZdKROaZM+VfuIRaic1mpfAQwoo+ZYgpQib5meqUlg0va6CZFp2qf6OUoqpx31f8XG lcvw== 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=WDKExs6NtxIsCQTLBz0+Bcsnjt4SIwcZ12J5QEQKJfE=; fh=52YY/OuLkLNjvSoAPE9Ire0sLQcF4l+B9WKlPNKG8ko=; b=xgfaCn3S6bY5JrwKRVNa8OYdevftwDAWneXdoZneJkJaebkSRCe+RpToiZkgcuemWP isuQKJzm7FsEGLktVN/DOTHgO4wJ7bCp0KmsYcmo5IGgOLiRPWcU7s5p8LH4fBTTAKqC 8pDoxJ+xvTaw5Poy0GpvPttTMBMuJWDRN4cd7koVCz48YGikIFuocRqzZhN+98HF/wwO 69Fnp/nMcBEaW0B0IaZ6y9RdpT5A9/kUGmhpyWdYubJCOiFdJehhMn4Q/lElPthgfaPe M+BnOnTwegNdkmXwrI+EhtccD1yCH3e3vJCuKidkeafEwrnQ3l3z2ovNif1ApZdbtmv5 iRbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=DsKv+nPR; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d18-20020a05620a167200b007621274eb5bsi2572712qko.177.2023.07.07.04.39.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Jul 2023 04:39:40 -0700 (PDT) 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=@gmail.com header.s=20221208 header.b=DsKv+nPR; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qHjif-0007Sl-Kn; Fri, 07 Jul 2023 07:33:49 -0400 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 1qHjie-0007IK-1D; Fri, 07 Jul 2023 07:33:48 -0400 Received: from mail-ot1-x336.google.com ([2607:f8b0:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qHjiY-00072y-DK; Fri, 07 Jul 2023 07:33:47 -0400 Received: by mail-ot1-x336.google.com with SMTP id 46e09a7af769-6b7206f106cso1570111a34.1; Fri, 07 Jul 2023 04:33:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688729621; x=1691321621; 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=WDKExs6NtxIsCQTLBz0+Bcsnjt4SIwcZ12J5QEQKJfE=; b=DsKv+nPRfXaXnd5GB6U8m9uSFvC3Bqjl7RkV+6cw3dpsltuXQXORtBCyqGJpGKz/2y wXiZyCtOCs97Fwm1gbDMjF63qanMsDWXB7z1ME6OUJofcDV00IqtsDNCrxNBcNoCYzCS A02D1dTzioonljVzdLlXLxYKtr2zI/jhLHJIrXV7Bt2q2lUe3jA01Vz7kQmi6bSHnlFW G+fUH0kURZQVV+olcs2HD+2mkONWlGtbsEXowyXu0XIBbLbCnmK1MZbXDoTIwdLCvSje cuD/d8N1FfhE2u+zoY7TUc9hcBD3zwRO1KESOghZ4FzLbhFHRh/62Y/wc/r7UazH+fE7 J4Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688729621; x=1691321621; 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=WDKExs6NtxIsCQTLBz0+Bcsnjt4SIwcZ12J5QEQKJfE=; b=E8nuULl/ds6iDVrqjs8EU5BdWSm2rIc4xbFBZHLqpcpa9gEj2/xTk+uFN5yt4Wbp80 ut6wIOeQf+PV/ePLYY3NP1T5qu98x0PEBcTjrUYJ/5VNDV3ifa98/nvQJooCPI7nxMAa 8Zod3+pnBwsFzLaInXn9cM1xrZuO2Ewg6cVAFLql3LF4RIPfdez1aZS9ll+mSx45mtP9 /5Cz7NoNnPj4MzbBDdf9WlP67ERfD2Wf36QmzQBYwJhNSEBtGCDzdzWczvaaS2jfBrfC +2YsFmUwMI7hi6R9Tf9xMHvJG/mcYd9/tPbuidzvtS9MVwxTx8YhO1Vs6WmPXMngOQUx sl9w== X-Gm-Message-State: ABy/qLZ6UaeuA82yY/lMso/jW2dcbUtut4SA7XJ4/PdUwG/n5QrXTr34 CudMUHbKHIm9Qtxhg7fUyRGA6ZmUWAI= X-Received: by 2002:a05:6830:1d5b:b0:6b8:9a14:91f5 with SMTP id p27-20020a0568301d5b00b006b89a1491f5mr4971172oth.21.1688729620845; Fri, 07 Jul 2023 04:33:40 -0700 (PDT) Received: from grind.. ([2804:14c:f435:9162::1002]) by smtp.gmail.com with ESMTPSA id g17-20020a9d6c51000000b006b74b37f5e5sm1574859otq.20.2023.07.07.04.33.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 04:33:40 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, richard.henderson@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?C?= =?utf-8?q?=C3=A9dric_Le_Goater?= Subject: [PULL 55/60] target/ppc: Move CPU QOM definitions to cpu-qom.h Date: Fri, 7 Jul 2023 08:31:03 -0300 Message-ID: <20230707113108.7145-56-danielhb413@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230707113108.7145-1-danielhb413@gmail.com> References: <20230707113108.7145-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::336; envelope-from=danielhb413@gmail.com; helo=mail-ot1-x336.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=0.01 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 From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cédric Le Goater Message-ID: <20230627115124.19632-4-philmd@linaro.org> [dhb: keep cpu_list define in target/ppc/cpu.h] Signed-off-by: Daniel Henrique Barboza --- target/ppc/cpu-qom.h | 4 ++++ target/ppc/cpu.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h index 9666f54f65..c2a66a90f7 100644 --- a/target/ppc/cpu-qom.h +++ b/target/ppc/cpu-qom.h @@ -31,6 +31,10 @@ OBJECT_DECLARE_CPU_TYPE(PowerPCCPU, PowerPCCPUClass, POWERPC_CPU) +#define POWERPC_CPU_TYPE_SUFFIX "-" TYPE_POWERPC_CPU +#define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX +#define CPU_RESOLVING_TYPE TYPE_POWERPC_CPU + ObjectClass *ppc_cpu_class_by_name(const char *name); typedef struct CPUArchState CPUPPCState; diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index b269b0d090..25fac9577a 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1471,10 +1471,6 @@ static inline uint64_t ppc_dump_gpr(CPUPPCState *env, int gprn) int ppc_dcr_read(ppc_dcr_t *dcr_env, int dcrn, uint32_t *valp); int ppc_dcr_write(ppc_dcr_t *dcr_env, int dcrn, uint32_t val); -#define POWERPC_CPU_TYPE_SUFFIX "-" TYPE_POWERPC_CPU -#define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX -#define CPU_RESOLVING_TYPE TYPE_POWERPC_CPU - #define cpu_list ppc_cpu_list /* MMU modes definitions */ From patchwork Fri Jul 7 11:31:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 700028 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp3824292wrs; Fri, 7 Jul 2023 04:46:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlH0I/GEOBi0Ok/p49OM46uDMyXt7xnq0ueioufn0YTWBvXk9V/NEK1l1QmC+Ho3qmkJr9sc X-Received: by 2002:a05:6512:10cf:b0:4f3:d682:7b1c with SMTP id k15-20020a05651210cf00b004f3d6827b1cmr4518933lfg.45.1688730386210; Fri, 07 Jul 2023 04:46:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688730386; cv=none; d=google.com; s=arc-20160816; b=PJZVdpYy95RR8BdGA2SkGBW8BKZmOEweByJUmv4E9PfB2rG/P7p9Op+DeAgErIOJdH 63zX12NxCL2JOIVrpl4z3vm+S0BBBX0hZau3c1PTrIGdn8Hz1nrpVSjBZH6OIOxMlXjw 4xYasFgAPvscYuSmcrmyz/MIk6+LHFKW9V4u3zMT65OI/d6Z8kvYo5wLzR4hbZv5mPP2 ZDxB+8ITWiyf8BYYHbX2mQdXoLbCD25fHZvCKHkCoBqAEaKG/DIPAJVNUEkbY6p53abX sH+vOv4zZ75bOZnmmQMHwAPLwZoZUfc407NuK3dtcvWh5Xs7+8dKEZpZHwbEvCLXOV6q NU4g== 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=tOjAEOyitW8En/gKHjIOGm/jesZx5icwf+MIpZ7SZwI=; fh=orPKfBnBb1BT0TNwwWZflb/ySS4/REUg/E7LW8jo6rg=; b=k/TuYkZhxW5T/OjmE4aa4cyWL3Nl02Dcfk68aH/DFJvtlzvwIYwMxO6CpsbGyN8o5A 0dN/IxkBd13vx4WIKix5zBfh07AOtFq9trQDvUTvPKJQxIA9kwOQdMs1aiHAMjk24+M8 nhR2TfC7aqI9HRbdExL1dfY3+3gIRR0gde4xiCHrSzUvPaIRUe7iUeY0kQMeXiDyHimd PpcDj7bSvS9yfxS8t4dQlo6zD127+f6Yls2KSwBKUhDTKWqzUayE+lyAI7F2bvCvBhfQ 00MVqhXZ30kfcDEELZm5xDMrehwIYBeBGu01l6TZbFUoIZBEhr8jCXllponGILrXn9ir Fudg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=s4SvdQ7F; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l14-20020a5d526e000000b003144cb13ba1si2426994wrc.966.2023.07.07.04.46.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Jul 2023 04:46:26 -0700 (PDT) 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=@gmail.com header.s=20221208 header.b=s4SvdQ7F; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qHjie-0007IR-73; Fri, 07 Jul 2023 07:33:48 -0400 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 1qHjid-0007Gv-2j; Fri, 07 Jul 2023 07:33:47 -0400 Received: from mail-oo1-xc36.google.com ([2607:f8b0:4864:20::c36]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qHjib-00073F-2s; Fri, 07 Jul 2023 07:33:46 -0400 Received: by mail-oo1-xc36.google.com with SMTP id 006d021491bc7-5634d8d1db0so1348486eaf.0; Fri, 07 Jul 2023 04:33:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688729623; x=1691321623; 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=tOjAEOyitW8En/gKHjIOGm/jesZx5icwf+MIpZ7SZwI=; b=s4SvdQ7FWgKDDql7/W1/yavoXGoEf9P5+Z689MLRRrF+vGDMy9Yveh1FCjKobmmMPz Z0h6kwtsE5Yqj4jeYumI4vesUEeqB08DixuBVXzapdgZb/8kXTDuMcFCoT6Yj8uWXdMu QhWyCqWyE4HsNAB0HexmDKVHykIB9/jnMThb/jhLbY04vAhtRRzSMYH6ocYhLaQW+RHw 40E/64f/5mwAKBXknUeHA3x3XnTW/fv0txSWgNam9WrQcsm9KrlgbkRNUdNgqRumw97Z ypdPoM1EDMqfgs0U3vc4CXTfdE5XMIolDEjUCJ+JPhLY0hRVpdA8BTJ0ADs6aVOwNTau EgHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688729623; x=1691321623; 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=tOjAEOyitW8En/gKHjIOGm/jesZx5icwf+MIpZ7SZwI=; b=CWv1veZ5bV1U7WIJ6nTTHFYxnoj3to5Mn7Tx78Ksop7OaK3S6xtbz2zJ2Rkq1iPQPM PYsCdMKbsXPkT6FeJWhDIfnhEP1erdPfIZBSdd9cUsjilqTQIMXza700zLn+vLqv6p7y 9zjfTzjjA0L0XqWplb+I8UQ0vgJSXo+PV3Z72KErgDi2Nf9GHGAK9ecJFCJcKT8tDhlX tEpf3XJ56xC4jCAOe4vUh34GYDhdl+ABYNCVp04vT0mlQ5yXYFZQWySG2boqWzh0z9/G wB5nIHwI2oR1tATpPbGBJvmBkwvyythLYehg2D/lGGr4M5PLLZIRTT7FfSMY17ezjZjA jOZg== X-Gm-Message-State: ABy/qLZoI6gx1E6UtlMEUKKb6TNr86AXBIw3X5i7hQ0Mquj5D5HRqnvH ySyTftHFy7GSoJ5pO0W+EEaBkr3cIsA= X-Received: by 2002:a4a:2c89:0:b0:563:2489:dfe6 with SMTP id o131-20020a4a2c89000000b005632489dfe6mr3870477ooo.5.1688729623431; Fri, 07 Jul 2023 04:33:43 -0700 (PDT) Received: from grind.. ([2804:14c:f435:9162::1002]) by smtp.gmail.com with ESMTPSA id g17-20020a9d6c51000000b006b74b37f5e5sm1574859otq.20.2023.07.07.04.33.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 04:33:43 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, richard.henderson@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?C?= =?utf-8?q?=C3=A9dric_Le_Goater?= , Greg Kurz Subject: [PULL 56/60] target/ppc: Define TYPE_HOST_POWERPC_CPU in cpu-qom.h Date: Fri, 7 Jul 2023 08:31:04 -0300 Message-ID: <20230707113108.7145-57-danielhb413@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230707113108.7145-1-danielhb413@gmail.com> References: <20230707113108.7145-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::c36; envelope-from=danielhb413@gmail.com; helo=mail-oo1-xc36.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 From: Philippe Mathieu-Daudé TYPE_HOST_POWERPC_CPU is used in various places of cpu_init.c, in order to restrict "kvm_ppc.h" to sysemu, move this QOM-related definition to cpu-qom.h. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cédric Le Goater Reviewed-by: Greg Kurz Message-ID: <20230627115124.19632-5-philmd@linaro.org> Signed-off-by: Daniel Henrique Barboza --- target/ppc/cpu-qom.h | 2 ++ target/ppc/kvm_ppc.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h index c2a66a90f7..be33786bd8 100644 --- a/target/ppc/cpu-qom.h +++ b/target/ppc/cpu-qom.h @@ -35,6 +35,8 @@ OBJECT_DECLARE_CPU_TYPE(PowerPCCPU, PowerPCCPUClass, POWERPC_CPU) #define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX #define CPU_RESOLVING_TYPE TYPE_POWERPC_CPU +#define TYPE_HOST_POWERPC_CPU POWERPC_CPU_TYPE_NAME("host") + ObjectClass *ppc_cpu_class_by_name(const char *name); typedef struct CPUArchState CPUPPCState; diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h index 49954a300b..901e188c9a 100644 --- a/target/ppc/kvm_ppc.h +++ b/target/ppc/kvm_ppc.h @@ -13,8 +13,6 @@ #include "exec/hwaddr.h" #include "cpu.h" -#define TYPE_HOST_POWERPC_CPU POWERPC_CPU_TYPE_NAME("host") - #ifdef CONFIG_KVM uint32_t kvmppc_get_tbfreq(void); From patchwork Fri Jul 7 11:31:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 700023 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp3820287wrs; Fri, 7 Jul 2023 04:35:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlFQijNHLJapQLP57t4qa6Je1tNwVpn74KdT3jKQklC4tfgokngjJhFj7rRCWJITpvMjhF9H X-Received: by 2002:a0d:d555:0:b0:57a:6ce:aff3 with SMTP id x82-20020a0dd555000000b0057a06ceaff3mr5863747ywd.47.1688729742110; Fri, 07 Jul 2023 04:35:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688729742; cv=none; d=google.com; s=arc-20160816; b=tiuEPsPbGlOQo95IbirUWTxbzgXVmhpDVzk02bltQiCrKCQHt8dtl+wa036b+fpT3Q Jkl3G31xc29PZZkkGFpsaO23tTJ3MlN7mmilCCSRKqMO75fv/sb+urb878clROcVZeZN mC06p6IKr4g5Rsdk0ZJ4Um6CVK8BpcatfUU+XlZ/lNO9ku4kgum5JAKM+FtO3p8nmkSh Ic6vVJjbczVohplnKY6p0zT4GNEYyhIaypZw9AWYdRXuDPd8flemZHG39E/cKNJ/cPoV Zspu4p0J+E4M61tjZ0UNNUnDUScswCHE/iAZtkMKl+JdoPoTwEKd6O3P9gA8IN0FuOAw guVA== 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=kCkdRPqEQAxVr0sy/Rwt/MUSqIIx/LRBpxLUD+vaQdM=; fh=orPKfBnBb1BT0TNwwWZflb/ySS4/REUg/E7LW8jo6rg=; b=XXkLWXGlEfh2v+oF5cVwqZ+Vhr5ca2TveuiQy6QhZNAxnJYlK1FeZSgv67NChAW1w4 Xp7LWVecT7iqni7jepriLkm0dwRuG/IvemzjpSLPQEOHgSRj8CmmHZqWGtmVcZwp9qQ9 IlVsVwggvjWICjeQGsdv9WaJhIfdP6UCC7l5OFwbCJbcDGrqgcLKM1SnWKYdoWLlOZQG Th1MRekfP8RdIZBOue0E2Oo+yohclCfusV5//tWNXYuNuGXagIIiH9mk58cqZLFCKrx/ Ic5/KUgqP8tHLTonoyAOC9/EJZL8BHrJlqlbKrRjGKwfMVhXBrrT6elzP7mb4C3nm5Tk EPJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=rkj2TyiF; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a10-20020ac85b8a000000b003f7d719855esi2417425qta.281.2023.07.07.04.35.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Jul 2023 04:35:42 -0700 (PDT) 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=@gmail.com header.s=20221208 header.b=rkj2TyiF; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qHjih-0007gZ-Rm; Fri, 07 Jul 2023 07:33:51 -0400 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 1qHjif-0007SU-Ij; Fri, 07 Jul 2023 07:33:49 -0400 Received: from mail-ot1-x32c.google.com ([2607:f8b0:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qHjid-000755-W9; Fri, 07 Jul 2023 07:33:49 -0400 Received: by mail-ot1-x32c.google.com with SMTP id 46e09a7af769-6b5d7e60015so1679805a34.0; Fri, 07 Jul 2023 04:33:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688729626; x=1691321626; 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=kCkdRPqEQAxVr0sy/Rwt/MUSqIIx/LRBpxLUD+vaQdM=; b=rkj2TyiFNZO/2Vv1H5XdTPzGg5/XhIplcXjArMCj8u2AANTwmcFMN3t/wDewfAT3Gn 5nvn45d5wbv+cdidVYY8uGISzFZZ4A/rvyLDGjDbjvBAmphNsBvEXzKglerKYL0ekdHT 7L6/vHFoGHJs8/8xZ/EXqZ2ufT70iVoy2bd0lzXLL4BI5K2G2p18ZiDWGqyua2SL+0n9 tNEvC0nVs2aILq0pvad3pLt9kx2py8ujkx9DcV0uI5lQDgB5vb7rl+r4rm2a5oU7ZTkS 6C1ext0Vh5ceUzzo7C88L+vk1y643zh4qbxKtbfbtrn4ZmpXbrpmVbeasGUqtBdZ+2al ZVug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688729626; x=1691321626; 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=kCkdRPqEQAxVr0sy/Rwt/MUSqIIx/LRBpxLUD+vaQdM=; b=THMQQH8fenBMe/kAUfm94LaZfOWGt2z8ll3SoybnJLXxUg6os/WIHK0Be4LXWX/n1N 8J+DpLEm7mXL7XUnQHDXuhuQFWMAh7HCZm7FLplDYcHgZD7Z94CdJDoxbKD/87Lg21EY KiIW26hpUWnRzallhvcoJRBfl+pk1Sieb4/uKJfgQ8lFpvmIdEROYF3NOZh4gEdDQMJU QeLr1W6uLD+VRpDSVs+/4tGkuWQRBjaPXglIeWdeujyacTJGG6aMFUQJlHjc1UHybihv MVMRny0dWr1rtWBq9G8q5rYOBHPjuuSKzhhrKwUFt+n6dW8mXYpkTj+5NYmJAYHUZ2Pt SMTw== X-Gm-Message-State: ABy/qLbiTh+OBtqR2xjvyF6i8o0I1zYd6fY9nxI6xKCGPSmieEvAryF8 pjHm0Qhl1N3Gxa/XoAN8JR3J3/HPA8c= X-Received: by 2002:a9d:7515:0:b0:6b8:6b70:4848 with SMTP id r21-20020a9d7515000000b006b86b704848mr5810116otk.29.1688729625958; Fri, 07 Jul 2023 04:33:45 -0700 (PDT) Received: from grind.. ([2804:14c:f435:9162::1002]) by smtp.gmail.com with ESMTPSA id g17-20020a9d6c51000000b006b74b37f5e5sm1574859otq.20.2023.07.07.04.33.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 04:33:45 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, richard.henderson@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?C?= =?utf-8?q?=C3=A9dric_Le_Goater?= , Greg Kurz Subject: [PULL 57/60] target/ppc: Restrict 'kvm_ppc.h' to sysemu in cpu_init.c Date: Fri, 7 Jul 2023 08:31:05 -0300 Message-ID: <20230707113108.7145-58-danielhb413@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230707113108.7145-1-danielhb413@gmail.com> References: <20230707113108.7145-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::32c; envelope-from=danielhb413@gmail.com; helo=mail-ot1-x32c.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 From: Philippe Mathieu-Daudé User emulation shouldn't need any of the KVM prototypes declared in "kvm_ppc.h". Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cédric Le Goater Reviewed-by: Greg Kurz Message-ID: <20230627115124.19632-6-philmd@linaro.org> Signed-off-by: Daniel Henrique Barboza --- target/ppc/cpu_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 6ac1765a8d..02b7aad9b0 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "disas/dis-asm.h" #include "gdbstub/helpers.h" -#include "kvm_ppc.h" #include "sysemu/cpus.h" #include "sysemu/hw_accel.h" #include "sysemu/tcg.h" @@ -49,6 +48,7 @@ #ifndef CONFIG_USER_ONLY #include "hw/boards.h" #include "hw/intc/intc.h" +#include "kvm_ppc.h" #endif /* #define PPC_DEBUG_SPR */ From patchwork Fri Jul 7 11:31:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 700027 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp3823605wrs; Fri, 7 Jul 2023 04:44:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlGvzh6PWytgi0PqTflHdjxIeVNo1XNX9XqF0INqYd3J5MrLt7vlChyURWVAGC63zSH88CrY X-Received: by 2002:a05:600c:2193:b0:3fb:ff8f:2db0 with SMTP id e19-20020a05600c219300b003fbff8f2db0mr1749062wme.39.1688730280855; Fri, 07 Jul 2023 04:44:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688730280; cv=none; d=google.com; s=arc-20160816; b=l6qAv+UXbrh+whOc2XloHlidXm2UDB08I3yAYXMblcfp88FDUCpgXzFXPvpieBre8W aQduYor1Ux2DM8uFBNdcuXQv8vjIHAAqgI8oepROcXzN8rZR0Rd1KiX61TdJGgXo9MmV TM+rOpW6V1TKLaOZRVkADjKngdg2SC/j/QvxBf79FYCxuLkVjMkQRtOCMn7TK/iyrKX8 C4kbQAbbkh3NMEcKUijVnM/DnDuPMJFQKuIvQVwk0fE+LxKl6NwKi8qlPqsI7m7nw5el ovg7jgfOYir/RZm52QctcVffy6v1y5GYSL3XyCzrS56OoNMOhqXSlPdcnnjQSjnOCDVS vokQ== 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=QkjDD2MyIJf1W+5sZdfrx7JqdlOzHwifJlixrav+Tr8=; fh=orPKfBnBb1BT0TNwwWZflb/ySS4/REUg/E7LW8jo6rg=; b=xBUzuyuK6T33Yn/IdPVed5yZ4LLYUNtl0AxtrK+/IrxEnQn4AtYygHOcPOUTkv4QRr jXvLItiOHLamnL+AKuMcoK1oxoRF6xsQF+SPawmGVvx9ia93ytK5mXILYTzEiJOLlC3D QxCga5MxxO1bP8jii9V+1H2JZQF9mG8KSPUQR0vmiIyCO6luTfG+Xfm+g2/KNMg9WtAx u1uKWr00w36C2LdScDwR7+iD+0zMDdOSop7BVtohTFuIsxQBsG0LHqPuYIf4j9Ajk1NN 7gZwQ2Lv1qsaObbYZr3OYqC6kkvDIg3E/7hkRMnQGYao3u19e+HJSKbSYKimjgfKUGRo gZuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=dQyKtjvK; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p6-20020a5d6386000000b0031115f189aasi2458105wru.214.2023.07.07.04.44.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Jul 2023 04:44:40 -0700 (PDT) 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=@gmail.com header.s=20221208 header.b=dQyKtjvK; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qHjii-0007k5-Ir; Fri, 07 Jul 2023 07:33:52 -0400 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 1qHjih-0007ee-DY; Fri, 07 Jul 2023 07:33:51 -0400 Received: from mail-ot1-x335.google.com ([2607:f8b0:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qHjif-00075z-UV; Fri, 07 Jul 2023 07:33:51 -0400 Received: by mail-ot1-x335.google.com with SMTP id 46e09a7af769-6b5ef64bca6so1625248a34.3; Fri, 07 Jul 2023 04:33:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688729628; x=1691321628; 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=QkjDD2MyIJf1W+5sZdfrx7JqdlOzHwifJlixrav+Tr8=; b=dQyKtjvKEcFGqWzBWIZD9lhfBZYeck+bO9PxtEv6fqGCcYkSIBXAC6h1FT0ipEO8O0 vHd61JMgcy8x6dRRtSjFNmtpujrk8n0xU/T1b4+sKOMQsPYhIo5hbZAna1EUZHGlhYkw 3vztgGbQiK7sIODC8M2WUxdBNfuMGa2xUaf8bZ4skiWxrhLLBNrPd9Xi5zXazhRdHuQK n57rHd3v8HD3zBuzFjLeGxI8mNJe331qlaskTooSaRCHINX2wqkDVPQDIJDk/JIh7rux DemJAQXkhUFJ8b4vs/lb9npy5rgcudXdgIms5dEE8eEwOsbY2XySJybqM9aHPlDBmKp9 1Mhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688729628; x=1691321628; 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=QkjDD2MyIJf1W+5sZdfrx7JqdlOzHwifJlixrav+Tr8=; b=NyvGpjaasBkjoquB0P7Kx3zpksMqoLCdMVA521C6VLgJiGWTxdsK7K3X4S36kvNSRN fif6/hDBJbNq9edHbOrmKKbel3i4rny8sViJSzU/Sx6jxcVa9k2gF20H/4cnWsbUdHFE R9yV6/XRWc0aLL9rtRQLj8Lh4pEmHLSgy8MEIxmf/bq7lyC/J5kEeWeySwYMR7mO+zfU 1MJKs8UwUKECx0KhFEZJXL4GwTo1aHtfsB/vFDe3am1vvlqAp6dQgfVbVQ2JA2Lwis9O OCWMjMZKrtAPSHrZFMsEpFLsnSFrbiQVtzDGmElNgaKZy5MEkR1XHpLLHSWVEyHpD2ly Am3w== X-Gm-Message-State: ABy/qLahRx5+w9ZYwtaPeRrGjtft6avbDuKFBspi4DizkKY8RK/xYoAt hf/1AKvnYtTklFzhs6lRGIKm85Zwy6M= X-Received: by 2002:a05:6830:1314:b0:6b7:3dab:dbd6 with SMTP id p20-20020a056830131400b006b73dabdbd6mr1305234otq.15.1688729628451; Fri, 07 Jul 2023 04:33:48 -0700 (PDT) Received: from grind.. ([2804:14c:f435:9162::1002]) by smtp.gmail.com with ESMTPSA id g17-20020a9d6c51000000b006b74b37f5e5sm1574859otq.20.2023.07.07.04.33.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 04:33:48 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, richard.henderson@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?C?= =?utf-8?q?=C3=A9dric_Le_Goater?= , Greg Kurz Subject: [PULL 58/60] target/ppc: Remove pointless checks of CONFIG_USER_ONLY in 'kvm_ppc.h' Date: Fri, 7 Jul 2023 08:31:06 -0300 Message-ID: <20230707113108.7145-59-danielhb413@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230707113108.7145-1-danielhb413@gmail.com> References: <20230707113108.7145-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::335; envelope-from=danielhb413@gmail.com; helo=mail-ot1-x335.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cédric Le Goater Reviewed-by: Greg Kurz Message-ID: <20230627115124.19632-7-philmd@linaro.org> Signed-off-by: Daniel Henrique Barboza --- target/ppc/kvm_ppc.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h index 901e188c9a..6a4dd9c560 100644 --- a/target/ppc/kvm_ppc.h +++ b/target/ppc/kvm_ppc.h @@ -42,7 +42,6 @@ int kvmppc_booke_watchdog_enable(PowerPCCPU *cpu); target_ulong kvmppc_configure_v3_mmu(PowerPCCPU *cpu, bool radix, bool gtse, uint64_t proc_tbl); -#ifndef CONFIG_USER_ONLY bool kvmppc_spapr_use_multitce(void); int kvmppc_spapr_enable_inkernel_multitce(void); void *kvmppc_create_spapr_tce(uint32_t liobn, uint32_t page_shift, @@ -52,7 +51,6 @@ int kvmppc_remove_spapr_tce(void *table, int pfd, uint32_t window_size); int kvmppc_reset_htab(int shift_hint); uint64_t kvmppc_vrma_limit(unsigned int hash_shift); bool kvmppc_has_cap_spapr_vfio(void); -#endif /* !CONFIG_USER_ONLY */ bool kvmppc_has_cap_epr(void); int kvmppc_define_rtas_kernel_token(uint32_t token, const char *function); int kvmppc_get_htab_fd(bool write, uint64_t index, Error **errp); @@ -262,7 +260,6 @@ static inline void kvmppc_set_reg_tb_offset(PowerPCCPU *cpu, int64_t tb_offset) { } -#ifndef CONFIG_USER_ONLY static inline bool kvmppc_spapr_use_multitce(void) { return false; @@ -322,8 +319,6 @@ static inline void kvmppc_write_hpte(hwaddr ptex, uint64_t pte0, uint64_t pte1) abort(); } -#endif /* !CONFIG_USER_ONLY */ - static inline bool kvmppc_has_cap_epr(void) { return false;