From patchwork Tue Dec 19 19:12:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 755972 Delivered-To: patch@linaro.org Received: by 2002:adf:b181:0:b0:336:6142:bf13 with SMTP id q1csp1602246wra; Tue, 19 Dec 2023 11:18:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IEnDLkOvhEud+BcS80odfcTY/VQ43sKDu3lLWSJyhgEUUsxKsFQ6Qeu6LptxqNIsar8NFF2 X-Received: by 2002:ad4:5aaf:0:b0:67f:3a14:2e62 with SMTP id u15-20020ad45aaf000000b0067f3a142e62mr7050622qvg.39.1703013499618; Tue, 19 Dec 2023 11:18:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703013499; cv=none; d=google.com; s=arc-20160816; b=k+lTTLuRsgDelT9hVTf+l2Te1Q2o89e6NerspC/NqNRXCxUh+/HLUJ/EdIYbqJOD1O LVW6T0eakP0KsilAGRSJ52+e+4z+a/J6DlaXbVUmZ6AuqLWAD0Zns/qlri21hkDyFG9G GwwND62YwJkVqD8AhAlDAI340hZt2qildgrD3Z3pee3tzX0UgungFe2w/dWBboz9+iFX UZ1fZOBQ97ZPdsw8Fm5M7M6r0LALxFdsx7K7FiArpXXa/6QUALsYYnN8YW4DYWoGOh12 no9T8sOI6rzahuiwcHOAIGvUvON2qOdQi9mlMqxZWAMMkR2HsPxoN8mINxDhzkLn/O2g TfNg== 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=Lk12mN4qFsWUyce/FrUNcsWdUn084yu7ANskjsNphT8=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=CSpt9JPLyysPiUSd4ulP+zycVmSwU6KYgNSO36SkxApn0Bygwq5jTMUmhZnkIHtbFr 8WUlGDofINs/22wiKSiAwFx0v0SlDzvRv7n2eTgoE8RbWhh/jBJ+v/KwWdY5VpdPX4aM 4LXy5kS8l0IAzkJ5oaiKtxwGod9zoudzb5G8AFr0yvPH0KWCGNqUTOeoJz1zMMTYUIVC a9HrwQfen5AlAnMTjBBVa9GCE2r8wyIgrV8u9OfJQKxfqexHdOPalWvPcBnwDStLWoaB 6GfUVZSpghApewamDhKReh8OhjsvSItebeV8Z9UR2OPGNld3tu82ZFnrgpvxeHdhONaL P97g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=V0DnHg+J; 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 k20-20020a0cf294000000b0067ee8dcfe2asi11264039qvl.456.2023.12.19.11.18.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Dec 2023 11:18:19 -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=V0DnHg+J; 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-0001y7-B5; 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 1rFfWq-0001pV-MJ for qemu-devel@nongnu.org; Tue, 19 Dec 2023 14:13:20 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rFfWo-0001nj-L6 for qemu-devel@nongnu.org; Tue, 19 Dec 2023 14:13:20 -0500 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-33664b6d6d5so2378554f8f.0 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=Lk12mN4qFsWUyce/FrUNcsWdUn084yu7ANskjsNphT8=; b=V0DnHg+Jy9iND0/rFUNj2Y4D1Py1ILfzZOCZwwwqMr7bM0Biw5M6693PNeO+Kjcx14 fZBLM7s/bH7TQwKNMnRQkNmLS8C275ZtiIjfJfo14qZvSd+e587T+X8SSWpKfrd11AD8 vpR7jKq6xuGxWutWluyMlfn/wMaUcIYupcEbt1tJ4jazBOgg3BPKzoETwONp1qK/nd/d rWcN9d3MBIcmaoimLhW0P9V+9HkdChCLX+GavI9G4cGNimX33MhApeTz10tSV5dDeTMd +2BqlOM0hrSPCoGVmKMrjNWq1q5iDuhwUQie14h5bZlzhU8UE/pu8f3giKO9wCVVXmBa /Vrg== 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=Lk12mN4qFsWUyce/FrUNcsWdUn084yu7ANskjsNphT8=; b=uSOeMDbIs3bFtR7jU1GMfHwdMxfM7l1jqDjU87To95kORv50MxPkH2dx1WbvU1WWzX IOa8lm8uqVYzFaotENcoha2bFGoA2D7eIirNLIly0yWVwJwUmaO1DopFHwFfc/5NQe9i mIqU36oj7P+0eT7Dk19dvmzrQUN2v0Zcu5daMtplfSfp1WZm/HEqo1sE//rhel0C5nl7 fnykdvnYJMBmsse6fsiU/TMt515SQixXirAnoEQKiKJSs1b9z7scLunorqN/Ib9bwYYM RVsB84j2/tIg7UOeNI35ga9xJ09A5/3lmcxjZaRPmO1PG56zuqYrhyBqpfOhYEzphxzv C8nQ== X-Gm-Message-State: AOJu0YySbKFpVxo/215p+PBoAhBwFvXBJoMxLmhVkHeejikPxu8QazJh PM1HcazHiYm4xj0KEUNThPK/Vm6csAq1hOtnQ60= X-Received: by 2002:adf:f708:0:b0:336:780e:b2e3 with SMTP id r8-20020adff708000000b00336780eb2e3mr187503wrp.38.1703013197183; 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.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 11:13:16 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 16/43] target/arm/kvm: Unexport kvm_arm_vcpu_finalize Date: Tue, 19 Dec 2023 19:12:40 +0000 Message-Id: <20231219191307.2895919-17-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::431; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x431.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 | 14 -------------- target/arm/kvm.c | 14 +++++++++++++- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index b96ff35e34a..9b630a1631e 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -18,20 +18,6 @@ #define KVM_ARM_VGIC_V2 (1 << 0) #define KVM_ARM_VGIC_V3 (1 << 1) -/** - * kvm_arm_vcpu_finalize: - * @cs: CPUState - * @feature: feature to finalize - * - * Finalizes the configuration of the specified VCPU feature by - * invoking the KVM_ARM_VCPU_FINALIZE ioctl. Features requiring - * this are documented in the "KVM_ARM_VCPU_FINALIZE" section of - * KVM's API documentation. - * - * Returns: 0 if success else < 0 error code - */ -int kvm_arm_vcpu_finalize(CPUState *cs, int feature); - /** * kvm_arm_register_device: * @mr: memory region for this device diff --git a/target/arm/kvm.c b/target/arm/kvm.c index d1edb9bd67c..5bc96f469e1 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -81,7 +81,19 @@ static int kvm_arm_vcpu_init(CPUState *cs) return kvm_vcpu_ioctl(cs, KVM_ARM_VCPU_INIT, &init); } -int kvm_arm_vcpu_finalize(CPUState *cs, int feature) +/** + * kvm_arm_vcpu_finalize: + * @cs: CPUState + * @feature: feature to finalize + * + * Finalizes the configuration of the specified VCPU feature by + * invoking the KVM_ARM_VCPU_FINALIZE ioctl. Features requiring + * this are documented in the "KVM_ARM_VCPU_FINALIZE" section of + * KVM's API documentation. + * + * Returns: 0 if success else < 0 error code + */ +static int kvm_arm_vcpu_finalize(CPUState *cs, int feature) { return kvm_vcpu_ioctl(cs, KVM_ARM_VCPU_FINALIZE, &feature); }