From patchwork Tue Dec 19 19:12:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 755974 Delivered-To: patch@linaro.org Received: by 2002:adf:b181:0:b0:336:6142:bf13 with SMTP id q1csp1602332wra; Tue, 19 Dec 2023 11:18:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IED3yuBvzl+e9dNIGPdl+fYNwhrU7oK1KPCkFgxCQwXro0sR5xYw9v/eN/3izZTgMJ65/rh X-Received: by 2002:ac8:7f0d:0:b0:423:a495:e9c5 with SMTP id f13-20020ac87f0d000000b00423a495e9c5mr26247259qtk.11.1703013511824; Tue, 19 Dec 2023 11:18:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703013511; cv=none; d=google.com; s=arc-20160816; b=dD3cDi0qnC/ULzwBdozjAZ+cvDFZBujoKWfmSwPfo0cfdXyQOZKxiF4WXn5EIeg1vr U7Pi3tQFh904Fh+U0Q0GxIxz7tijd9h6ChaMYGddXe3gXXT95twO5ouUpelBWnji4h0F x3YlrVNO4+k3VrquAfadXbV+ToYV4Y40dZTcutfjl3pyqe7JePP9Fn+DXeZ0lQ5J+47H PrzV17/siuZD8dOsVUxm8qiNx6BLyUC4ymmaLatBO+H8HND/BaY3g/LsGuqK9Ra9iMDT Y3o3/TJx+EHOqm6cQfAU8DBpN8Tk3Q3WREra7ZZIfGHKPN6g/3Jj/rZ3Xkhnitfzt1Z/ Hlyg== 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=UUOmNDqY3LeEXA9yEVWqeU26I9B7AoztRHl6/x/doeU=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=Fi2dK3P4dUE/rZNwNRcqCejJfsSNb5GVN8SUwKI6P4MpDm2AGE06HgscNtS1y6Wa3w tmQog9HxPLOAv/2SY0mr7YAI09o5WmzW76OpKk18Zbi/Mb/9nwFV2vgNSCOKWrN35g+A e34uUo1d2OruXajwVoGYGCRjAjSxWeqfG6FGR4x220TZtWUR6fJaypiwhcD3n6WIPkxu Q2htCAMNRHVJg9K7JKwO9zxIh3paRyc+La6Seo69QnxuxpDo//ZBut7NEOvvB4iZ6hKG X5H+FWaNO+ksQ5s5/FB8yI+WwSIPxpDJ94NoAG5fjIUT0vYjWhdn9QT19hQerjb3z3CD uu+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nEpdFvTd; 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 s4-20020a05622a1a8400b0042784efd303si261773qtc.162.2023.12.19.11.18.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Dec 2023 11:18:31 -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=nEpdFvTd; 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 1rFfX4-00020f-LN; Tue, 19 Dec 2023 14:13:34 -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-0001tK-Bv for qemu-devel@nongnu.org; Tue, 19 Dec 2023 14:13:22 -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 1rFfWq-0001oT-8v for qemu-devel@nongnu.org; Tue, 19 Dec 2023 14:13:22 -0500 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-336672406f0so2327770f8f.2 for ; Tue, 19 Dec 2023 11:13:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703013199; x=1703617999; 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=UUOmNDqY3LeEXA9yEVWqeU26I9B7AoztRHl6/x/doeU=; b=nEpdFvTd0HFI0VPBorSuT3HwbC5G8QbuOm2HJg2clGQAacuxzdoPKuqJZCowTAVauW A645dD0HEHNG6SoaeR/f+mwQD/ZU75Z0KTqAiEoWSPiEa4MLqph+tU+X3iahQZLrGdaA CJv7+4V19bp2MhlGnoe6XobYK/k2AVrEsSYaB/nI6bwUvEgiRFIgHJLBj7K02icn7aNQ dOY7BNj0A+Gf90lgrtN+2SN8/ZT8YBSQxSMGCHt5KWDMj4tXB7eccIeJd4/4sl7iukbL 1xDxL+WISRHAX+Yz4v3YoyzXd1Vj8kxiJ8NbeRsn0JQTg2Fre9RcP7cDOhkg1syrWMfA yzBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703013199; x=1703617999; 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=UUOmNDqY3LeEXA9yEVWqeU26I9B7AoztRHl6/x/doeU=; b=TXJ39MD2kpcm5L8BRiiJVNsX0dv3JZCOqgqAFCNcB/zaNw+elz39wGmgPIWt8Y9jrP 6i4kOPogAUxb+tBNsANg3oPqdSjWOLeSAMJiAmr6vnrctElptI5dNVSFAuA8zOEFDfLb eVMCTpfATKyfPtZfdSa7L1eu/tamRuElKGeNGKdiygRDnslDa4DFxjNx8mTWgEq0/yDk kN4CGT6uCo9/RQPmeMwAgY5lZojrMbOeNdbumh3HTl0iEn4auP0EPumUkBH5mIlnH/Vq d0dvEnvQJRpRu3c+TEWUO+2nfvmpFC7uDjeSEC4eyXhUqZL2RqxK5vO89T1dO3BRep3G FzTw== X-Gm-Message-State: AOJu0YwmkKvSnTFrcrYy1QfjCVkydaIqW+yOfiQYUy5yhhyv2jdHcN8W y7x4xYprDErNtWXXHgTHMBtvdmKvZsQw0r5Zz0Y= X-Received: by 2002:adf:b301:0:b0:336:782b:ab8b with SMTP id j1-20020adfb301000000b00336782bab8bmr114238wrd.61.1703013198825; Tue, 19 Dec 2023 11:13:18 -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.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 11:13:18 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 20/43] target/arm/kvm: Unexport and tidy kvm_arm_sync_mpstate_to_{kvm, qemu} Date: Tue, 19 Dec 2023 19:12:44 +0000 Message-Id: <20231219191307.2895919-21-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 Drop fprintfs and actually use the return values in the callers. This is OK to do since commit 7191f24c7fcf which added the error-check to the generic accel/kvm functions that eventually call into these ones. Signed-off-by: Richard Henderson Reviewed-by: Gavin Shan Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé [PMM: tweak commit message] Signed-off-by: Peter Maydell --- target/arm/kvm_arm.h | 20 -------------------- target/arm/kvm.c | 23 ++++++----------------- 2 files changed, 6 insertions(+), 37 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index b4339d49d11..8a44a6b762f 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -200,26 +200,6 @@ bool kvm_arm_sve_supported(void); */ int kvm_arm_get_max_vm_ipa_size(MachineState *ms, bool *fixed_ipa); -/** - * kvm_arm_sync_mpstate_to_kvm: - * @cpu: ARMCPU - * - * If supported set the KVM MP_STATE based on QEMU's model. - * - * Returns 0 on success and -1 on failure. - */ -int kvm_arm_sync_mpstate_to_kvm(ARMCPU *cpu); - -/** - * kvm_arm_sync_mpstate_to_qemu: - * @cpu: ARMCPU - * - * If supported get the MP_STATE from KVM and store in QEMU's model. - * - * Returns 0 on success and aborts on failure. - */ -int kvm_arm_sync_mpstate_to_qemu(ARMCPU *cpu); - void kvm_arm_vm_state_change(void *opaque, bool running, RunState state); int kvm_arm_vgic_probe(void); diff --git a/target/arm/kvm.c b/target/arm/kvm.c index b8923fe1776..db6d208cf03 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -1004,41 +1004,32 @@ void kvm_arm_reset_vcpu(ARMCPU *cpu) /* * Update KVM's MP_STATE based on what QEMU thinks it is */ -int kvm_arm_sync_mpstate_to_kvm(ARMCPU *cpu) +static int kvm_arm_sync_mpstate_to_kvm(ARMCPU *cpu) { if (cap_has_mp_state) { struct kvm_mp_state mp_state = { .mp_state = (cpu->power_state == PSCI_OFF) ? KVM_MP_STATE_STOPPED : KVM_MP_STATE_RUNNABLE }; - int ret = kvm_vcpu_ioctl(CPU(cpu), KVM_SET_MP_STATE, &mp_state); - if (ret) { - fprintf(stderr, "%s: failed to set MP_STATE %d/%s\n", - __func__, ret, strerror(-ret)); - return -1; - } + return kvm_vcpu_ioctl(CPU(cpu), KVM_SET_MP_STATE, &mp_state); } - return 0; } /* * Sync the KVM MP_STATE into QEMU */ -int kvm_arm_sync_mpstate_to_qemu(ARMCPU *cpu) +static int kvm_arm_sync_mpstate_to_qemu(ARMCPU *cpu) { if (cap_has_mp_state) { struct kvm_mp_state mp_state; int ret = kvm_vcpu_ioctl(CPU(cpu), KVM_GET_MP_STATE, &mp_state); if (ret) { - fprintf(stderr, "%s: failed to get MP_STATE %d/%s\n", - __func__, ret, strerror(-ret)); - abort(); + return ret; } cpu->power_state = (mp_state.mp_state == KVM_MP_STATE_STOPPED) ? PSCI_OFF : PSCI_ON; } - return 0; } @@ -2182,9 +2173,7 @@ int kvm_arch_put_registers(CPUState *cs, int level) return ret; } - kvm_arm_sync_mpstate_to_kvm(cpu); - - return ret; + return kvm_arm_sync_mpstate_to_kvm(cpu); } static int kvm_arch_get_fpsimd(CPUState *cs) @@ -2365,7 +2354,7 @@ int kvm_arch_get_registers(CPUState *cs) */ write_list_to_cpustate(cpu); - kvm_arm_sync_mpstate_to_qemu(cpu); + ret = kvm_arm_sync_mpstate_to_qemu(cpu); /* TODO: other registers */ return ret;