From patchwork Thu Nov 23 04:42:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 746468 Delivered-To: patch@linaro.org Received: by 2002:a5d:6706:0:b0:32d:baff:b0ca with SMTP id o6csp689418wru; Wed, 22 Nov 2023 20:49:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IEKaISj+DKCTQMswb68hR/IAtMqFOlPNLZH3k4dY7OWAycFdmXV4iJ6VVm7jQO3j5qvgR1e X-Received: by 2002:a05:622a:5a89:b0:423:8180:3896 with SMTP id fz9-20020a05622a5a8900b0042381803896mr3548356qtb.2.1700714944308; Wed, 22 Nov 2023 20:49:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700714944; cv=none; d=google.com; s=arc-20160816; b=qwccofp3hWd6T2KkBFgSIVlkNlI1mTjWSL6oRANYusWw7z/AYGQDnOYXRViWLyDOWA XBzNSFmWI1VvP0RKpy1nenIitSZZFzcTfT0D8iMduSIalYtC6D4oTnKP53hMF5hW+I0/ BTiMzRfVGGMID23QbXP7/EUjuB+hCd0RwZSMK0HHzKLq+aNOcPcA6tvdKuMaKDUxdKKA RpBhQfKgGhgI7Nfwy9cQjbiOlhByKom22+3QeQ2wEcwsoDsZJO7NLdZoWCA8L+qV4MFZ PNBVtTY+34HNXyLsfBj5rLCIY4XsVz9bpRkSdXvQkusAIPBVyWudeorrf44uIbL0kq8l GbMQ== 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=XoNhjamHa23uC1hFwLD47ZBDARlMJkpmLpzYJFJqrbI=; fh=9Ev+QBUhk6P6vR3LT1wYeDLexozsz44nqjfoyPajZCc=; b=WdTlLnNQmow0Sre7a/eYpaEpH6qU8gTm2XIQwEnXNgdAGTJY/uvufS4WqfiIEaUCoU 91qJMtF9ILq7jN5fDNNsf/PRA6ovh5kIZX8kjfZyYZKKuGC1AyaX4itf0Q21sm5DSp0Y Y+eOnK+m9A17tW7hSX23mr+c+AHKbcyGRnF/ovy3OcTks/XsKm2G+gP+f7eJvKlT0Ub2 dPPjTu6I3NWdaKFO8zSFV5hGygfVjKBI1dp1/sfEaBIjiYC2yKnr5MtruLq8P0m3nTZ4 Up4Jd2dLOdZ3Ze2FYk9Pb5eKJW2Bui0OV7+pXsUuVKk0fnycQjy/iwhdKpQNrroKWEKT pGZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ei+ILln1; 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 f12-20020ac87f0c000000b004237f530dc9si432671qtk.782.2023.11.22.20.49.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 22 Nov 2023 20:49:04 -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=ei+ILln1; 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 1r61YL-0006ck-JU; Wed, 22 Nov 2023 23:43:01 -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 1r61Y5-0006PX-2e for qemu-devel@nongnu.org; Wed, 22 Nov 2023 23:42:46 -0500 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 1r61Y0-0006Eq-Kq for qemu-devel@nongnu.org; Wed, 22 Nov 2023 23:42:44 -0500 Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-1ef36a04931so342164fac.2 for ; Wed, 22 Nov 2023 20:42:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700714558; x=1701319358; 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=XoNhjamHa23uC1hFwLD47ZBDARlMJkpmLpzYJFJqrbI=; b=ei+ILln1SJpymayDqmD50fVEU7Yxr+21oTx6JFJB3DWSnHd09em8ejKrpzuuC7brX3 dIrRrENXCshKDeGx+W6V8z+Owf44aiKGj70ip/XZH43COduCV/J41T5L1lh0k76bLSIL b3qoJ9CehkOJFJoPHoIo+AqtNuW+M0xfP0PiiCmZQXi7Tbfo+LI/KFb4jJnYe5qt+vNo 3HZLh45WKFQWykKkl8aRGzDbjkvKMl3/OTgZzLZSos+4nzzgS8unZ2085b6fxSLBOt8i p1hJzu/8ApWxkmyUwYofoerp+sRvFf5hOyEojDFv4cyrW4I9DDT/xvqElxs15wAigRal aOEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700714558; x=1701319358; 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=XoNhjamHa23uC1hFwLD47ZBDARlMJkpmLpzYJFJqrbI=; b=clYWrZPXu8OeVN16hJkRgBBsi4vdrnZ1kJmt3VEP61fjWV9RBFiHAAhP2wpNzDa6iC 3BTu8pNM+aqPHpsl3emnsGRXtN7w+n+VkOiJLUmO3rKb5WC6fQNio7Zq/FHLW4FoCguh cPIQQPp0O4MqazLar7t0q/nVK2+qSEQ3z5svrrBRotqi9Grby2udzl8dYQBHL+W95e4r MyCDlWfXw/xninJZYddKRZhqH4aMlnJ6vcyhd0MRWS31xl19KWc7vnQmJudDXaoKcjqk /jfVNInP9T+3G21k9LC0vSzM8wX03Ev+gpylNH7qWDm/+0U8SUespV7gRtoZrbf2OlYj klqQ== X-Gm-Message-State: AOJu0YzyPZEBLEUZDEdG/kLq/mAhuOs/vFjsbFLkcNbxn8fR/Ap+uyHe kPt6OPRn0LICnuTDMfGjnvwdzOSFrFrmhl0J2Xj4bJpr X-Received: by 2002:a05:6870:1f1a:b0:1f9:52e2:a8d7 with SMTP id pd26-20020a0568701f1a00b001f952e2a8d7mr4751694oab.43.1700714557955; Wed, 22 Nov 2023 20:42:37 -0800 (PST) Received: from stoup.. ([187.217.227.247]) by smtp.gmail.com with ESMTPSA id i7-20020a056808030700b003b8347de3c2sm73888oie.19.2023.11.22.20.42.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 20:42:37 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 16/21] target/arm/kvm: Unexport kvm_arm_vcpu_finalize Date: Wed, 22 Nov 2023 22:42:14 -0600 Message-Id: <20231123044219.896776-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231123044219.896776-1-richard.henderson@linaro.org> References: <20231123044219.896776-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2001:4860:4864:20::32; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x32.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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 Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Gavin Shan --- 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 b96ff35e34..9b630a1631 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 a864d0852f..20d8c81667 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -79,7 +79,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); }