From nobody Mon May 13 04:29:57 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1694518270; cv=none; d=zohomail.com; s=zohoarc; b=nmXP/ohTAzgpK2rjT4JezJHW00JVLqKOb+/13uuD4SocOWcYD4gu9h3ttG+DopAAilxsfqSxeWNYYYYE/cIYAjb0QRKuDeQGtn0WBO2eBPqUinCEbbc5mUTJw+fNvN0FrAhAcqGX6jtqt50YyVRrwwk2qeXjT3XcHxKrKT0/Jrk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694518270; 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=21QMJ7GGkeglUQqOfSInY5x1p67Ji2fztTn3JUMzTjQ=; b=ZZhOORausVWOyB9325/1EpwMi2VzGuEJ/DEQDo5Y+CYzQDaakMKoGzKC8WN3ZfRGdWekhUR3ZRt8tOXkUGQRe1TKZeGmLpucA1VeSQb6eFX679vGK9AgwNohBYc14iWEbRHBIgYydU/cYOTY92SGLiop3G1KOoX2ubcwiNTsaVU= 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 1694518270594308.1994946260793; Tue, 12 Sep 2023 04:31:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qg1bb-0004FN-9a; Tue, 12 Sep 2023 07:30:55 -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 1qg1bR-00042W-1x for qemu-devel@nongnu.org; Tue, 12 Sep 2023 07:30:45 -0400 Received: from mail-lj1-x230.google.com ([2a00:1450:4864:20::230]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qg1bM-0000qd-8q for qemu-devel@nongnu.org; Tue, 12 Sep 2023 07:30:44 -0400 Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2bcb89b4767so90374531fa.3 for ; Tue, 12 Sep 2023 04:30:39 -0700 (PDT) Received: from m1x-phil.lan (cou50-h01-176-172-50-150.dsl.sta.abo.bbox.fr. [176.172.50.150]) by smtp.gmail.com with ESMTPSA id l26-20020a1709061c5a00b009894b476310sm6628964ejg.163.2023.09.12.04.30.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 12 Sep 2023 04:30:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694518237; x=1695123037; darn=nongnu.org; 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=21QMJ7GGkeglUQqOfSInY5x1p67Ji2fztTn3JUMzTjQ=; b=FGy2CaNExXOnWrwlzVyh2dju8m1DjwILrSqhsp4HLo2EC0rUvrislOEsf0EyyqTqOa 1Zdruf5inIiiXzOSP0kzwLBr5ZWfKbGQfo0AozpoQIpdyqxxuSmUKO7TKT+Lcou9LDSK wyV/u4XEPQ7bYPJiUU81N0ecyD/dbiBOJFVtXE+5A3iOzVrXpeZXqFHBZ/tmNVTzrE+g hdQePJwg86TJhBlvLqD1s1vxI4h79rsei8PHqlyzDhVKOEUZO5WnScQbSa4vb6MZ7+MR ayM+1HO67qQ4eIszJNDLwUTHmRLgmL8XHosxm5OkKHUk//10y7A/g6s3t1pdB1fVTPT6 oS2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694518237; x=1695123037; 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=21QMJ7GGkeglUQqOfSInY5x1p67Ji2fztTn3JUMzTjQ=; b=VZn2qJSEPsr7bd/qfpYpAsYCoKziynG5KSk0FWmb2JJVisZaqLv4AYQpyqdjw+Bg3Y HCuEFkfjRmiBOyS1lA+CTgyAwUQDkMES9jx58H+RDUvmbESV+lmKVT1xoet2zS4bK66y Xq0yOd8RzU0QM/iekjB+J3IJeNKFBB3QdcaJvhS1DcRT4SyXrkXadk/GW/63JsT4sIsA tQhWILRliwRIn/LmpQh9H/edHxdaQLICG0U72Gk4+hf9X4wO0x2cgrqRsprHxZOQwrOl SoDgbD0sdZaTxDzB0YYCJXEnNDEC/sPM+EwXUiOBbFablj5CBUI9iBKjre1wkfWyxenP SMeQ== X-Gm-Message-State: AOJu0YyZwd+SVhceYmT5FWiLfh+H09fKgPNqouiOwcc+nHarsa1QcNDJ wQaXxNMbhFbV8is8UgT5bevhysnfTBpStUQ3blU= X-Google-Smtp-Source: AGHT+IGrmkxUF4fF6+bNXffo8F8gG9e/Ung4GKdfh9dcnF2dShXSPiBar0HZ/5nMx033pCom6oSwBw== X-Received: by 2002:a2e:7c1a:0:b0:2bc:c846:aa17 with SMTP id x26-20020a2e7c1a000000b002bcc846aa17mr10295292ljc.41.1694518236658; Tue, 12 Sep 2023 04:30:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Daniel Henrique Barboza , Daniel Henrique Barboza , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, Paolo Bonzini , Kevin Wolf , David Gibson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Michael Tokarev , Greg Kurz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/4] sysemu/kvm: Restrict kvmppc_get_radix_page_info() to ppc targets Date: Tue, 12 Sep 2023 13:30:23 +0200 Message-ID: <20230912113027.63941-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230912113027.63941-1-philmd@linaro.org> References: <20230912113027.63941-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::230; envelope-from=philmd@linaro.org; helo=mail-lj1-x230.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1694518272256100001 kvm_get_radix_page_info() is only defined for ppc targets (in target/ppc/kvm.c). The declaration is not useful in other targets. Rename using the 'kvmppc_' prefix following other declarations from target/ppc/kvm_ppc.h. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/sysemu/kvm.h | 1 - target/ppc/kvm_ppc.h | 2 ++ target/ppc/kvm.c | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index ee9025f8e9..3bcd8f45be 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -551,7 +551,6 @@ int kvm_set_one_reg(CPUState *cs, uint64_t id, void *so= urce); * Returns: 0 on success, or a negative errno on failure. */ int kvm_get_one_reg(CPUState *cs, uint64_t id, void *target); -struct ppc_radix_page_info *kvm_get_radix_page_info(void); int kvm_get_max_memslots(void); =20 /* Notify resamplefd for EOI of specific interrupts. */ diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h index 6a4dd9c560..440e93f923 100644 --- a/target/ppc/kvm_ppc.h +++ b/target/ppc/kvm_ppc.h @@ -89,6 +89,8 @@ void kvmppc_set_reg_tb_offset(PowerPCCPU *cpu, int64_t tb= _offset); =20 int kvm_handle_nmi(PowerPCCPU *cpu, struct kvm_run *run); =20 +struct ppc_radix_page_info *kvmppc_get_radix_page_info(void); + #define kvmppc_eieio() \ do { \ if (kvm_enabled()) { \ diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 51112bd367..a58708cdfc 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -268,7 +268,7 @@ static void kvm_get_smmu_info(struct kvm_ppc_smmu_info = *info, Error **errp) "KVM failed to provide the MMU features it supports"); } =20 -struct ppc_radix_page_info *kvm_get_radix_page_info(void) +struct ppc_radix_page_info *kvmppc_get_radix_page_info(void) { KVMState *s =3D KVM_STATE(current_accel()); struct ppc_radix_page_info *radix_page_info; @@ -2372,7 +2372,7 @@ static void kvmppc_host_cpu_class_init(ObjectClass *o= c, void *data) } =20 #if defined(TARGET_PPC64) - pcc->radix_page_info =3D kvm_get_radix_page_info(); + pcc->radix_page_info =3D kvmppc_get_radix_page_info(); =20 if ((pcc->pvr & 0xffffff00) =3D=3D CPU_POWERPC_POWER9_DD1) { /* --=20 2.41.0 From nobody Mon May 13 04:29:57 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1694518406; cv=none; d=zohomail.com; s=zohoarc; b=cVJg/dM43qyQyeMlb7CT+JSWaa4xSarwMgYjeGakUZRPNFb0h58qUH4DIbVC9ClzSwTMzFnYVToTh1s1lzjCReiHYQ9ZN+rS34AvRHpcTFbVSJ7SyW3YGnqWDAzMEqdo3reqKTkkO90e9vGcjwW0CCxRIS9hVV3RnxBd9uvRRqM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694518406; 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=EJDcYGi9xkj6QKbqo3iNcw77O78wB7Hq6Jj/+q8EmC0=; b=IKkRLHCiw/ro/qrBz/QM4KfxJGA8nptR5OtyVYc27r25U6nM+lAhRPYHGcmeRayxqg2APSyOfoGJHtdxSJNf9xTqXtoWhF9mEVsmW0jj4Tteyuu/jvYreL4ps3iMdcC7CRsPVg96ApzB3H/+BteLwp4VTdAb1YUPfsb238cHpbA= 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 1694518405782994.8287998282445; Tue, 12 Sep 2023 04:33:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qg1bb-0004G5-AQ; Tue, 12 Sep 2023 07:30:55 -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 1qg1bU-00042i-HP for qemu-devel@nongnu.org; Tue, 12 Sep 2023 07:30:49 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qg1bQ-0000rN-Tx for qemu-devel@nongnu.org; Tue, 12 Sep 2023 07:30:47 -0400 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-99bcc0adab4so696978666b.2 for ; Tue, 12 Sep 2023 04:30:44 -0700 (PDT) Received: from m1x-phil.lan (cou50-h01-176-172-50-150.dsl.sta.abo.bbox.fr. [176.172.50.150]) by smtp.gmail.com with ESMTPSA id ld10-20020a1709079c0a00b009ad829ed144sm953504ejc.130.2023.09.12.04.30.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 12 Sep 2023 04:30:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694518243; x=1695123043; darn=nongnu.org; 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=EJDcYGi9xkj6QKbqo3iNcw77O78wB7Hq6Jj/+q8EmC0=; b=yW5lewStDd//iABYoGkiNWmTAUWKTsI5QBpRc9tDw3blWT8hGKn3vDR7sWCGDeExJl 0tNv2sHtdHYnwsL1lt6LAmbw2MUNut2pdNLodtBCwc/W3zRPn5aXKQpPkviM4vCuNq/8 CAt1nZk/eLTxl7H6NsAjL5M/7zeRnVWD04VIILlnBHxAimDNwBXeS3PlxvhLNluiX8Sf bzDd0EfQ/qPGUyvtWtI59Kl+ZwUCvp+5u3vn+2Voii4nrHHKTHgfTCBYFjkGsTJpRSu8 2NfUp9CL3Wbpno6t/Vf76bueX2z1j0mzapE44T7DPrgNK7lfJdn/1rZKq5E+7/y9vomL 2Bxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694518243; x=1695123043; 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=EJDcYGi9xkj6QKbqo3iNcw77O78wB7Hq6Jj/+q8EmC0=; b=r/Zpif/37qcpf5l+V2BBr/S/gXes9CjyrajagRa7CXJ45LvZaQ/f8aHML5ZWO9jW76 Hd33uSNGiS1iOln2INxEeM/y3dQC1zrGS9lB78LVNLh0b2FM8n220chhHhhzi655odYN o7ti4x3gIoKrHNYOgaAB3PPAnGg+OjdueKfehe2ZfwZ3frx6uruoltpV/Y0PLAW/d6ub IAQ80PoYFmUGZlBiv/mLI57vKklsrvvJQ/QJM7JW3VIpx4rCfjAgzGW6+bWwp9TkyPHM tb8x9F2W8Oi3rJY2bTecNXJw1YxuUaDb3XJbwCD+IRpvtygG5X3pJc9Kb3Q0Oy1KrPOx sOPw== X-Gm-Message-State: AOJu0YyTX+TKLmEgZMXX5DmuNTPdCv+JZb+RcwBNdApOzMRbvZGpwuGg KC0ub6LPxzmsicjvZ2lmO/8HVIkjFCYNGfmJwpk= X-Google-Smtp-Source: AGHT+IFGR/hGUK+MotInaJDLHL5KTJ51jW0Vv1cuFdKWsf08M8zQ6ICYJzMY0WFbfe/ZeqQConVujA== X-Received: by 2002:a17:906:1da9:b0:9a1:d79a:418e with SMTP id u9-20020a1709061da900b009a1d79a418emr10080318ejh.40.1694518243093; Tue, 12 Sep 2023 04:30:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Daniel Henrique Barboza , Daniel Henrique Barboza , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, Paolo Bonzini , Kevin Wolf , David Gibson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Michael Tokarev , Greg Kurz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/4] target/ppc: Restrict KVM objects to system emulation Date: Tue, 12 Sep 2023 13:30:24 +0200 Message-ID: <20230912113027.63941-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230912113027.63941-1-philmd@linaro.org> References: <20230912113027.63941-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::635; envelope-from=philmd@linaro.org; helo=mail-ej1-x635.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1694518407279100003 kvm-stub.c only defines kvm_openpic_connect_vcpu(), which is clearly not used by user emulation. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael Tokarev --- 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 4c2635039e..bf1c9319fa 100644 --- a/target/ppc/meson.build +++ b/target/ppc/meson.build @@ -30,7 +30,6 @@ gen =3D [ ] ppc_ss.add(when: 'CONFIG_TCG', if_true: gen) =20 -ppc_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files('k= vm-stub.c')) ppc_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user_only_helper.c')) =20 ppc_system_ss =3D ss.source_set() @@ -46,6 +45,7 @@ ppc_system_ss.add(when: 'CONFIG_TCG', if_true: files( ), if_false: files( 'tcg-stub.c', )) +ppc_system_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: f= iles('kvm-stub.c')) =20 ppc_system_ss.add(when: 'TARGET_PPC64', if_true: files( 'compat.c', --=20 2.41.0 From nobody Mon May 13 04:29:57 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1694518668; cv=none; d=zohomail.com; s=zohoarc; b=MdX3SDHBB/5SmqSPYmcPsLrIXnTMM6ZHwxRzAJSbqSDimNLnfSD8BnPzNsypDmQs2uBL6em+PG7QZLpIuSk69DhMLxhdnxvGWT4GLrwdCzXjJXJCga50Qyu0rctQKalxkD8nZgjXUTJLVHR/Df1824VfWVHa/l4FkdqbQvv5uxw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694518668; 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=/aSlGFqA9ubhB7ZC5gHBqxQU1rcWLkqloVAzPG4iLCg=; b=Q07iWe0ERqWqSkgFszmLmvahierqFpWUJsYoPSsAywbToVuQ5Pw3ELs3LCyFHGKtyScuQqGYIuMo8i/Y41g0JwIFtLZX2OjWrE589v+NCkPcXNke9YlQrR3JgDheuSaTHJn0llkh+WrjGwB+B3jaP3zg4P88VJ8nfPZ1hKT6NDU= 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 1694518668536436.6317910259445; Tue, 12 Sep 2023 04:37:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qg1bf-0004N2-N8; Tue, 12 Sep 2023 07:30:59 -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 1qg1bc-0004M2-5J for qemu-devel@nongnu.org; Tue, 12 Sep 2023 07:30:57 -0400 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qg1bY-0000tS-2k for qemu-devel@nongnu.org; Tue, 12 Sep 2023 07:30:55 -0400 Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-501cba1ec0aso9065609e87.2 for ; Tue, 12 Sep 2023 04:30:51 -0700 (PDT) Received: from m1x-phil.lan (cou50-h01-176-172-50-150.dsl.sta.abo.bbox.fr. [176.172.50.150]) by smtp.gmail.com with ESMTPSA id m16-20020aa7c490000000b005236410a16bsm5839285edq.35.2023.09.12.04.30.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 12 Sep 2023 04:30:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694518250; x=1695123050; darn=nongnu.org; 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=/aSlGFqA9ubhB7ZC5gHBqxQU1rcWLkqloVAzPG4iLCg=; b=f/UwKA3kemM72cVDiT+KeUcY2sJtPXAtf4cxQvs+bb+0OesP4L9bz5LLF3uBYJRHbR ZsN46VjhkeOLep94WXvL9I2L7Fw895r/ZW7PyQFd3waeJuSqU8G6XzZcqEKDLyb/Z/vH CkWp2UH9JYWVMOXaqi+QRuBYI8jOkmMdHOVpimvR+u6k3xOVATVUrg1mlE/OrNgdeX0z MMxK+N7O6tffYhi4WBtHERZUdjLn/qrYifJIgxzhJ0uJJ/PIalBC0is556aY6PO5An9G cuUsSO3WFCbTpuVEWMm+W2+PCFZMhFGJu5l1XhUoTcyKmQ9twVNBsEJkhUi2hutNujNm UTuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694518250; x=1695123050; 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=/aSlGFqA9ubhB7ZC5gHBqxQU1rcWLkqloVAzPG4iLCg=; b=EhIbU7AcMrlVWPQe/D9/592UFHj9oBmVYlqldYoogNWHW2X04H3tT/lEsvfrlSRxHC D/zSnCeM+FLfkBi/VmILSxIpRFzn+eXJwewDY7DbWUgb65reDGeBFmcV8BddJ3sw9evJ xDj4L+Mj5Rv/GZmAlx4NhqXVI+IaBgKUA0Q0AU9t3tzJ8WItY36xlwe1IjTEFFExBF0c QGumTSwCTkeyX75tAoM+Q1+sYqfB1wUcuPLumKt3idAZwY6dc+ntEYz1Vi7AQ5ZGyM3G RnSAuiHDGmDn98bAN0aYjFqxs04DzejIlfCDwDyRKW4OM6HjpZdaYaCOMsBMRJe2F92A ZdQg== X-Gm-Message-State: AOJu0YyO6teqNO6r9KfYZVukDTSEK3cpNbPzlGCsC0BrNPAqTXMGMhRe 3ZWBVSw3WGWw8YkTvcrsKI/h+Cjd/3vSnB+7vq0= X-Google-Smtp-Source: AGHT+IH1nDDr93QicJYxAxgnTc7nY/JwU0DHitp5fHJtl0TRbIOcDKW6MuHF8lvcCHq4T8Tl9fsYHA== X-Received: by 2002:a05:6512:32d0:b0:4fb:7675:1ff9 with SMTP id f16-20020a05651232d000b004fb76751ff9mr11429892lfg.9.1694518250011; Tue, 12 Sep 2023 04:30:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Daniel Henrique Barboza , Daniel Henrique Barboza , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, Paolo Bonzini , Kevin Wolf , David Gibson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Michael Tokarev , Greg Kurz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/4] hw/ppc/e500: Restrict ppce500_init_mpic_kvm() to KVM Date: Tue, 12 Sep 2023 13:30:25 +0200 Message-ID: <20230912113027.63941-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230912113027.63941-1-philmd@linaro.org> References: <20230912113027.63941-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::12f; envelope-from=philmd@linaro.org; helo=mail-lf1-x12f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1694518669097100002 Inline and guard the single call to kvm_openpic_connect_vcpu() allows to remove kvm-stub.c. While it seems some code churn, it allows forbidding user emulation to include "kvm_ppc.h" in the next commit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael Tokarev --- hw/ppc/e500.c | 4 ++++ target/ppc/kvm-stub.c | 19 ------------------- target/ppc/meson.build | 2 +- 3 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 target/ppc/kvm-stub.c diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index d5b6820d1d..d0e199fb2c 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -834,6 +834,7 @@ static DeviceState *ppce500_init_mpic_qemu(PPCE500Machi= neState *pms, static DeviceState *ppce500_init_mpic_kvm(const PPCE500MachineClass *pmc, IrqLines *irqs, Error **errp) { +#ifdef CONFIG_KVM DeviceState *dev; CPUState *cs; =20 @@ -854,6 +855,9 @@ static DeviceState *ppce500_init_mpic_kvm(const PPCE500= MachineClass *pmc, } =20 return dev; +#else + g_assert_not_reached(); +#endif } =20 static DeviceState *ppce500_init_mpic(PPCE500MachineState *pms, diff --git a/target/ppc/kvm-stub.c b/target/ppc/kvm-stub.c deleted file mode 100644 index b98e1d404f..0000000000 --- a/target/ppc/kvm-stub.c +++ /dev/null @@ -1,19 +0,0 @@ -/* - * QEMU KVM PPC specific function stubs - * - * Copyright Freescale Inc. 2013 - * - * Author: Alexander Graf - * - * 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 "qemu/osdep.h" -#include "cpu.h" -#include "hw/ppc/openpic_kvm.h" - -int kvm_openpic_connect_vcpu(DeviceState *d, CPUState *cs) -{ - return -EINVAL; -} diff --git a/target/ppc/meson.build b/target/ppc/meson.build index bf1c9319fa..44462f95cd 100644 --- a/target/ppc/meson.build +++ b/target/ppc/meson.build @@ -45,7 +45,7 @@ ppc_system_ss.add(when: 'CONFIG_TCG', if_true: files( ), if_false: files( 'tcg-stub.c', )) -ppc_system_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: f= iles('kvm-stub.c')) +ppc_system_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c')) =20 ppc_system_ss.add(when: 'TARGET_PPC64', if_true: files( 'compat.c', --=20 2.41.0 From nobody Mon May 13 04:29:57 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1694518656; cv=none; d=zohomail.com; s=zohoarc; b=V2elpwR/Np3sVekQ+HCoI5+2OGItZN9hARaiYVDdjNcuqszCFWqR+InDJQn6j0YrrMTgZh7HnMeSpRWnd/v5TauO7nXh57yJtJY5fA7U5w0RB8LyjVYiMOEl2oMeKKuzPMp3d3Kzx8aRJdPeuZlN2wl3EOVciwz/xG30P3zfUuw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694518656; 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=Qjw2XAQ6HKVx9Z3EPaWrG+b3gjC37zBrk2Sv1nlYmYs=; b=HDfq3Pj9uJHYHhm9x4GKNk2YKyvzrMvAzWGyykK/5J+BRlnaguFtQhUMkdPBgEuXL1a0GXwct5+Xsxe2FotLzB/XCN0oFpogy1DsKjSUhD5dIwrs1F36VWIM4SHX3tERdF6d0tpWhGrJTsZ6LZibxUF2zsYQVzZYoyrBrm2kF8I= 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 1694518656029459.86187174740564; Tue, 12 Sep 2023 04:37:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qg1bi-0004Ou-Ev; Tue, 12 Sep 2023 07:31:02 -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 1qg1bg-0004NK-BR for qemu-devel@nongnu.org; Tue, 12 Sep 2023 07:31:00 -0400 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qg1be-0000uY-6O for qemu-devel@nongnu.org; Tue, 12 Sep 2023 07:31:00 -0400 Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-52a4737a08fso6930210a12.3 for ; Tue, 12 Sep 2023 04:30:57 -0700 (PDT) Received: from m1x-phil.lan (cou50-h01-176-172-50-150.dsl.sta.abo.bbox.fr. [176.172.50.150]) by smtp.gmail.com with ESMTPSA id o6-20020a17090637c600b00991e2b5a27dsm6698164ejc.37.2023.09.12.04.30.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 12 Sep 2023 04:30:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694518256; x=1695123056; darn=nongnu.org; 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=Qjw2XAQ6HKVx9Z3EPaWrG+b3gjC37zBrk2Sv1nlYmYs=; b=Egw/iGjY/DgpRE5PDdVkqV1q9BZPIO1okohP3wN3KUyyrTrM9DGsjMnvNhxiUrNmVw xM+aAxjsNuDjOJXrjzlnae3UorV87mhWK6HajIRJjDN7WM6zY/WaNMtrIaC7piOcGM10 jmZctYL19qtG8tXSuH43Bj1AB07a3vYDT2NAEXALJlSCvwTU13kmnnCBK+bFoKme7FG/ Fs0WVPjBTBz9eqz2x2OR+8kWZ+RLDUWH+6RMFW7wPwHwx6jdxVpZkKYdFBkKPp2qvaxw xgBp5+Mq+kO6RXpRjK52hb7LQ/B+kPp9LI3zyiPf/9yb14DS1lTmzyBTrNofkt8IEWFq jRvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694518256; x=1695123056; 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=Qjw2XAQ6HKVx9Z3EPaWrG+b3gjC37zBrk2Sv1nlYmYs=; b=tfeibj6EFI83PX0zkJ9tJxx8a+OKA+v4T0Lty9smN0KNApTr+RVWwO2AfcH9wq0fe0 JN5f/qyCWuqjCTYNi8vv7EASx6uyGrFmWSbWSkTNL5fUlZVk/TLTwNWUg90B0N87IzNJ AdppzSjSRQilCm5WgW1FpyRC3PBMOrrFwSqrYmslL1wpyiJPsSal+sMCd2pvBsgOrJQ8 GY8qB7eBtakDlQ4210KH03Rvc93KkujPKhkWJTa/mnWlsa6VtxwAdVxTijl9sJYjcbBG Av8CaJQH4EqZrlI9CCXN9UBEB7Zt3AjgkeVIShFB+M+qpLr0IFQ4YYYoMvTLzg4EvgPy SelQ== X-Gm-Message-State: AOJu0Yx43p9bIJ+x3P1MrKdf9WKvOYmVCgm9jYCc4nNeOExn0M7fjjht PDGUzUbf9gNqFDkG/pgusdane2Kkn66uTyHGgi0= X-Google-Smtp-Source: AGHT+IGiO5Y1ImU0e5NPiApxvVuGIaqglPuHqf13s/S2DHwx1SaXcvGhb+gpSsNwSY48HsTaLRHqKw== X-Received: by 2002:a17:906:10c:b0:9ad:805d:70da with SMTP id 12-20020a170906010c00b009ad805d70damr1647683eje.12.1694518256600; Tue, 12 Sep 2023 04:30:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Daniel Henrique Barboza , Daniel Henrique Barboza , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, Paolo Bonzini , Kevin Wolf , David Gibson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Michael Tokarev , Greg Kurz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 4/4] target/ppc: Prohibit target specific KVM prototypes on user emulation Date: Tue, 12 Sep 2023 13:30:26 +0200 Message-ID: <20230912113027.63941-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230912113027.63941-1-philmd@linaro.org> References: <20230912113027.63941-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::52f; envelope-from=philmd@linaro.org; helo=mail-ed1-x52f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1694518656670100002 None of these target-specific prototypes should be used by user emulation. Remove their declaration there, so we get a compile failure if ever used (instead of having to deal with linker and its possible optimizations, such dead code removal). Suggested-by: Kevin Wolf Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel Henrique Barboza --- target/ppc/kvm_ppc.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h index 440e93f923..ffda8054b2 100644 --- a/target/ppc/kvm_ppc.h +++ b/target/ppc/kvm_ppc.h @@ -13,6 +13,10 @@ #include "exec/hwaddr.h" #include "cpu.h" =20 +#ifdef CONFIG_USER_ONLY +#error Cannot include kvm_ppc.h from user emulation +#endif + #ifdef CONFIG_KVM =20 uint32_t kvmppc_get_tbfreq(void); --=20 2.41.0