From patchwork Tue Dec 19 19:12:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 755955 Delivered-To: patch@linaro.org Received: by 2002:adf:b181:0:b0:336:6142:bf13 with SMTP id q1csp1601545wra; Tue, 19 Dec 2023 11:16:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IFrfxSEAAzIORYG6tOGXjE7/T58HC504o5gUmLz0RuMUdcxDIIdGcpwCgvCqeSsv4Gs/HB2 X-Received: by 2002:a05:6358:7254:b0:170:1be0:34b0 with SMTP id i20-20020a056358725400b001701be034b0mr19019075rwa.55.1703013416680; Tue, 19 Dec 2023 11:16:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703013416; cv=none; d=google.com; s=arc-20160816; b=ypm0jZH/4fiaVxF6aRPjhEl65PE+/pqh2NdXE+v7iebFgAaYSDKJzK2BNhNv1YGakX J8Sui8rnM5q2oaP/efP3JoIxAu/VuGHfWsobE4rkkjQqg86c1vLSYoZMuz/vgsvAv8lE vT2kDIH/0hSelaYO+d3HLa/E3qJKeh5LZkFwO9ZxVwHbRVRo6f/NRdBPu2B5UUSmuAcL tuSy+dQj1wbDHmt6aybQDlQdj2XVpGsLBbaHXnW0XhGCeH8mJD+wGsxBZ3afBZt17Gq3 gOvYfova66gkQXFVCOcAzaBwgpJE5bV2gz0vboUI+7Z2v7t9NUWuXU1CYj/kpDDhTGt6 HPIg== 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:to:from :dkim-signature; bh=Q+JqI01nncfSjIKYc0Twd9PO0mRP3lelRgIHx6yJ+Vs=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=w3c2eEcaUI5x8InOHYeBXAHCQLmK3Oo6uyFhNA47UKQFImcrNOwFjDC8L4OdhKFbPh j/NavEFtArwchfl0kUyfS2Z+AqmPdQFjJFn1OB4sJWQLtJIZ4GNq383gUakOBQYPCYM8 7clRYJU1zllr0Okw0R9LrHsvmUc/F2KBYiyO0OmVe9aHMDLRzbSz2A61svStkt+JDoDV +FOIIAULMzjev8ajmaPDu28O+08EZqcbTv5c9yKt1lMXRG1Sop7OuznUL3Y3aa62GdWc BVu8x9D7npxM/ODi7aMFkkFjdgDW54Xk2ZCVM4tStRm2pM4md0RCz9AHILwRW1sr5C9l LTzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M1thYfq1; 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 f7-20020ac85d07000000b00417d9feaba9si15500216qtx.214.2023.12.19.11.16.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Dec 2023 11:16:56 -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=M1thYfq1; 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 1rFfWy-0001xL-1i; Tue, 19 Dec 2023 14:13:28 -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 1rFfWs-0001st-0a for qemu-devel@nongnu.org; Tue, 19 Dec 2023 14:13:22 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rFfWp-0001o5-5v for qemu-devel@nongnu.org; Tue, 19 Dec 2023 14:13:21 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40d2764c0f2so13007205e9.2 for ; Tue, 19 Dec 2023 11:13:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703013197; x=1703617997; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Q+JqI01nncfSjIKYc0Twd9PO0mRP3lelRgIHx6yJ+Vs=; b=M1thYfq17LZ5IdGjTbcizyBqzNCGxLSZNdDa6BOvB7nMsVpSZdF8vNI4PgQvn+jDqj zh3/V9YIAPDlE2LDkE0ou0RnTuIw/pnDJ+Amu2pmRzkCGPl623fTYdn/4IFYMDtZSe91 nGzrGA3TzWqIWZHNKcaRYAp61gMLUV6S5rhorDS/jdGiARhsqXR0U4m7WvK5QeRqTljJ OoshCWrRN0z5fjVaDbu9GWmRTfv6hjtUfSKpqvM4NFoSfWj3ZBN7n9wQQWN+RrzOFF2q fF4KxY67B7XU5mXGntEuyTdQKVFw8aIBhPt1MURZlz0FTphfcUwxHSXSWFhXxFNWQFem d9dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703013197; x=1703617997; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q+JqI01nncfSjIKYc0Twd9PO0mRP3lelRgIHx6yJ+Vs=; b=GGNhZC0gBl3reXbp6QiqkvBYy5fKYJ1Vbm7Q7Ib+5Ap7twnZtz70gpbDkB1ik+GMY2 J2KuUwy9kHYC0tEluDCfNYf78bzpPS68l2MEUjDPg3XCnoAm2mvAM1GJuL6Kj4SMDjSn 3M0JLBYMPQrLSXKQZEtMe7UYdOuSpypxSYNWfdvZlsz8TyDmtIFsizga1dxelwLWp1yJ vf1ybt85rzChRjKweMQ9XD4prXGR/GHBzxItS1Z4Gr5tiyg6TWiAuB19S1KQJJ2bG3rh JZhDWTJ1ijFZ6SfXZ7KpnBNQss/5a04JEIF/IJ7QnEPsBdA4/qtcP4vhE648Sz05kbx6 HYpA== X-Gm-Message-State: AOJu0Yy/vADRT8KGcJDtNHcpPuXNNOpf88D/Ew+s045VWwR5F+1JL/4E 7akWwYFpw2c5cji6Aej4InDUyrb3mG1kMGvBjR8= X-Received: by 2002:a05:600c:1503:b0:40c:38ae:928d with SMTP id b3-20020a05600c150300b0040c38ae928dmr9367611wmg.29.1703013197605; Tue, 19 Dec 2023 11:13:17 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id f5-20020a5d5685000000b0033657376b62sm12007754wrv.105.2023.12.19.11.13.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 11:13:17 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 17/43] target/arm/kvm: Unexport kvm_arm_init_cpreg_list Date: Tue, 19 Dec 2023 19:12:41 +0000 Message-Id: <20231219191307.2895919-18-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231219191307.2895919-1-peter.maydell@linaro.org> References: <20231219191307.2895919-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.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, 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: Richard Henderson Signed-off-by: Richard Henderson Reviewed-by: Gavin Shan Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Peter Maydell --- target/arm/kvm_arm.h | 12 ------------ target/arm/kvm.c | 10 ++++++++-- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 9b630a1631e..350ba6cb967 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -39,18 +39,6 @@ void kvm_arm_register_device(MemoryRegion *mr, uint64_t devid, uint64_t group, uint64_t attr, int dev_fd, uint64_t addr_ormask); -/** - * kvm_arm_init_cpreg_list: - * @cpu: ARMCPU - * - * Initialize the ARMCPU cpreg list according to the kernel's - * definition of what CPU registers it knows about (and throw away - * the previous TCG-created cpreg list). - * - * Returns: 0 if success, else < 0 error code - */ -int kvm_arm_init_cpreg_list(ARMCPU *cpu); - /** * write_list_to_kvmstate: * @cpu: ARMCPU diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 5bc96f469e1..d87d3e53e02 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -787,11 +787,17 @@ static bool kvm_arm_reg_syncs_via_cpreg_list(uint64_t regidx) } } -/* Initialize the ARMCPU cpreg list according to the kernel's +/** + * kvm_arm_init_cpreg_list: + * @cpu: ARMCPU + * + * Initialize the ARMCPU cpreg list according to the kernel's * definition of what CPU registers it knows about (and throw away * the previous TCG-created cpreg list). + * + * Returns: 0 if success, else < 0 error code */ -int kvm_arm_init_cpreg_list(ARMCPU *cpu) +static int kvm_arm_init_cpreg_list(ARMCPU *cpu) { struct kvm_reg_list rl; struct kvm_reg_list *rlp;