From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 545E1C433DF for ; Tue, 23 Jun 2020 10:51:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2DC3F20768 for ; Tue, 23 Jun 2020 10:51:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="D39R8s1I" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732353AbgFWKvf (ORCPT ); Tue, 23 Jun 2020 06:51:35 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:44046 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1732376AbgFWKvd (ORCPT ); Tue, 23 Jun 2020 06:51:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592909491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oZQ1iXj/Bq+YaBfUtLyYjvldkQlNyk/VkfsOF9orImA=; b=D39R8s1IUWCty/X4Twljt9sshDY57KLhQKF+YJm4v/N88MOGD7JR4oelXthWbVyVRem9aq N030MGVXO8GOF4kXnOkZxJM8kG4MJAgRRYagPjS/sIrBku89sOPGicy2Oz1WGThenH2GEZ 2o3t24C44kBgv6NAgk1aHLcajR8Pu/I= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-449-ap_0rFKiMhSWTzLkyCz2QQ-1; Tue, 23 Jun 2020 06:51:30 -0400 X-MC-Unique: ap_0rFKiMhSWTzLkyCz2QQ-1 Received: by mail-wm1-f72.google.com with SMTP id h6so3452117wmb.7 for ; Tue, 23 Jun 2020 03:51:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oZQ1iXj/Bq+YaBfUtLyYjvldkQlNyk/VkfsOF9orImA=; b=lDM2Q5VSywL1veIQKQ5ZTJOhKVgH/MUQ/PQysSPEJ5/L6ImjmmO978II6qimLDqpKh J2hXJXUBb7f9tEdCw30fYUEsyS0GzmJmTnwRATiTkZsNhdIBhlQshIMMpl3LFHw1PwqP 4BJ4CPapKknmxpeWTEwOvGP3OqMKBqjhACK0R3gkU1VR/zVlN0ydVyqTNTw27x/BuJJ+ uJAW13S2Wo8gtcRNTMBnOHfJGNOs8VfCdZ7roRPgk/M0gKcnbmDNek1F5Jc+nsJZQZOz 6u26qUsJCPRrRZMYPaFES4x93RbQKNKBbrjsrjwYepRADfPiDYUCWzAyRPAG4DxAnRbF Ot4A== X-Gm-Message-State: AOAM531cKmZhVqndd6c6oQJn4xhF54vLBBWKSl5GDs/vLyw9e2iXSvWl dxmTEv8wRx/GJsRzr9jjlUdw1N2ivL0CQVBMizL+07fhcBuEkrZzQgmg7VXQmVRk+U6ADSjmg8k K8nPZtTyQr5tu X-Received: by 2002:adf:e50a:: with SMTP id j10mr26012265wrm.71.1592909489435; Tue, 23 Jun 2020 03:51:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxyuS/JbnpSn9OgQJWh9mW9to5y+6XJc1jU0fAPSPVWArLyfs8W2ovPuZhWk97kfUtl8tfn0Q== X-Received: by 2002:adf:e50a:: with SMTP id j10mr26012236wrm.71.1592909489238; Tue, 23 Jun 2020 03:51:29 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id v4sm6965597wro.26.2020.06.23.03.51.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 03:51:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Markovic , Aurelien Jarno , David Hildenbrand , Christian Borntraeger , Aleksandar Rikalo , Richard Henderson , qemu-s390x@nongnu.org, David Gibson , Peter Maydell , Eduardo Habkost , kvm@vger.kernel.org, "Michael S. Tsirkin" , Halil Pasic , qemu-arm@nongnu.org, Cornelia Huck , qemu-ppc@nongnu.org, Marcel Apfelbaum , Paolo Bonzini , Marcelo Tosatti , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 6/7] target/i386/kvm: Simplify kvm_get_mce_cap_supported() Date: Tue, 23 Jun 2020 12:50:51 +0200 Message-Id: <20200623105052.1700-7-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200623105052.1700-1-philmd@redhat.com> References: <20200623105052.1700-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org As the MCE supported capabilities should be the same for all VMs, it is safe to directly use the global kvm_state. Remove the unnecessary KVMState* argument. Signed-off-by: Philippe Mathieu-Daudé --- target/i386/kvm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 19d3db657a..626cb04d88 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -536,7 +536,7 @@ uint64_t kvm_arch_get_supported_msr_feature(KVMState *s, uint32_t index) } } -static int kvm_get_mce_cap_supported(KVMState *s, uint64_t *mce_cap, +static int kvm_get_mce_cap_supported(uint64_t *mce_cap, int *max_banks) { int r; @@ -544,7 +544,7 @@ static int kvm_get_mce_cap_supported(KVMState *s, uint64_t *mce_cap, r = kvm_check_extension(KVM_CAP_MCE); if (r > 0) { *max_banks = r; - return kvm_ioctl(s, KVM_X86_GET_MCE_CAP_SUPPORTED, mce_cap); + return kvm_ioctl(kvm_state, KVM_X86_GET_MCE_CAP_SUPPORTED, mce_cap); } return -ENOSYS; } @@ -1707,7 +1707,7 @@ int kvm_arch_init_vcpu(CPUState *cs) int banks; int ret; - ret = kvm_get_mce_cap_supported(cs->kvm_state, &mcg_cap, &banks); + ret = kvm_get_mce_cap_supported(&mcg_cap, &banks); if (ret < 0) { fprintf(stderr, "kvm_get_mce_cap_supported: %s", strerror(-ret)); return ret; -- 2.21.3