From patchwork Tue Sep 8 08:13:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haibo Xu X-Patchwork-Id: 249286 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp4336537ilg; Tue, 8 Sep 2020 01:14:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzetLv9OdfS8Q2yPJPtVUgfkIT+yNjD/R+tGeO4tlLis9Q+Zs0BDfFqvu4RECrEMKy/HXCJ X-Received: by 2002:a25:70c6:: with SMTP id l189mr33059819ybc.263.1599552874605; Tue, 08 Sep 2020 01:14:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599552874; cv=none; d=google.com; s=arc-20160816; b=ZvnOouo/mE4JhNwTJr27ydbSx6je15wo/+5ekd07Ecvs3O/681dQFQJU4LyCo75+nl XWoWhc2u0019Eib8uKagWdS39JPtbbQ08nOI0I6SNuR6sdIcE1jyXpIuXYD8v9MRFcZ5 pp/LZMAHMXkFG8XqBgCDM+X1MONraIBQSMplMg3w2FQyEk+C7Al5uYtAOTLpB6Ee4/5V wGe0xu8chPgIp2YmBzNSbLZvcsPJH4ijF61CvCQ07HKuQNccpFtBEi+r8XycCcTrKJmA Ywfe90alG9cIbbJhOLo5rAvqL3pME8EQI9EkXBvvVYMCJhd5NJ4kJ5pBpbiJLoPtxfl9 900g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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=bjXqJB5fZDovb5keozBFqhrjyKCJ3LE/1kjYNOFtg8s=; b=w81at22kyIpr9NOwcMbYIeyVnA1p6z9b3hBClUwLKC852H0INj+EEJLOnrNyqVSRVZ sERNynj+swo9pOxLotlSDj35V266UaJAv/mBlyeY9dd+RbpvySjHwG8z0xeADSVqUwHd YgOYISPN24kSlbADghjGazamjahIwtWpQv6/h5m8wZeW/4yGpCDDLi4LRTQTvhrW7dqQ 5Abz5LzWnfTdmt4coKWFl6QYA45WqalX6SncBKCnFe3EFrN+8yoA4IalClcyUDN/Tbks atwTyIq0cOVNtcfT9AJWHzsivFrRlCq4X9QYW37i3TaoCQ1cuw11vp7Z2KVgoNR0SM3c WzHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=lsduiPeW; 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=fail (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 l18si782154ybq.344.2020.09.08.01.14.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Sep 2020 01:14:34 -0700 (PDT) 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=fail header.i=@linaro.org header.s=google header.b=lsduiPeW; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFYlt-00068b-VY for patch@linaro.org; Tue, 08 Sep 2020 04:14:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFYlD-0005in-LG for qemu-devel@nongnu.org; Tue, 08 Sep 2020 04:13:51 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:42765) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kFYlB-0000Ri-OE for qemu-devel@nongnu.org; Tue, 08 Sep 2020 04:13:51 -0400 Received: by mail-pg1-x543.google.com with SMTP id m5so9504319pgj.9 for ; Tue, 08 Sep 2020 01:13:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bjXqJB5fZDovb5keozBFqhrjyKCJ3LE/1kjYNOFtg8s=; b=lsduiPeW2KAAqBLIvyI/8FZJf9DdqV11oODQYW+mHmktQWlrq8JKQhBNqHOYftlV8h kXnXOB4iC+DAgzeakNlWC4mNsxowb3AjsLhw7SoVQJLykH3p+XSU1EE7DnAEgZ2v2p1X ekkD+zYHj1MiH5pEojjHtb4uT+E64xMw7Ntu4A3PH9GBAkrFbIVm4tKz7m5UUO2PU5af P/1yJq0WITCZQ9wSs2lqC0gSjozPi7bDCHT49gJPophxYlo9LQdEcLLQDrA73F7HYFkH bxh7JFNVg+Xim7DSmlptXBxIEGjWo8q70Ds6gbW0/vxky7gsUI7f5Uzralry/LBmvac0 hyMQ== 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=bjXqJB5fZDovb5keozBFqhrjyKCJ3LE/1kjYNOFtg8s=; b=O4KMVVhQbrYzhZLDzsDEpgWq7qp0dG8d2SJ4W6S/qLomjMuyWSOuB8sXm+LyLRkg1f gH0l+nOdQiPPx1KZO3/dxwzmSbmX9DfnCZ/tzcy/0JMpIqaoUsrFtR8IcMdFtvP4qmMU NPeCYqkaM3LCt/2C/aFWSGM1SZIxU2NPULTA6rbNFtDxOATujirnNWDjNSGeAWTt5yZq 5JdnQrb2EFbxNHO+DA6kP/CbXIIP4Ty01wUHBgV5kcTGtFsTWYtjABgFqnNHcxNQepIe 5N6R9IOBZ6x5BpfsE4VIS4jzdDBR1CdfKkDWRV4u9mJHxjzxad7sCNeDuoSgkJc4U0Wn MiAg== X-Gm-Message-State: AOAM530OO+DArrX5Y4rNzYYJ1YXM+Rs+pFGzyXEhJXHd7SigcB2Ij33Z ZvHi68X1hAXmm+tqYDkcQZWC X-Received: by 2002:a17:902:465:b029:d0:89f1:9e2a with SMTP id 92-20020a1709020465b02900d089f19e2amr21643144ple.6.1599552828430; Tue, 08 Sep 2020 01:13:48 -0700 (PDT) Received: from localhost.localdomain ([147.75.106.138]) by smtp.gmail.com with ESMTPSA id m190sm16934788pfm.184.2020.09.08.01.13.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 01:13:48 -0700 (PDT) From: Haibo Xu To: drjones@redhat.com, richard.henderson@linaro.org Subject: [PATCH v2 05/12] target/arm/kvm: spe: Unify device attr operation helper Date: Tue, 8 Sep 2020 08:13:23 +0000 Message-Id: <45eecae26272efc7a09837573cd5278296b58dc5.1599549462.git.haibo.xu@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::543; envelope-from=haibo.xu@linaro.org; helo=mail-pg1-x543.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org, philmd@redhat.com, qemu-devel@nongnu.org, Haibo Xu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Andrew Jones Rename kvm_arm_pmu_set_attr() to kvm_arm_set_device_attr(), So both the vPMU and vSPE device can share the same API. Signed-off-by: Andrew Jones --- target/arm/kvm64.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c index ef1e960285..8ffd31ffdf 100644 --- a/target/arm/kvm64.c +++ b/target/arm/kvm64.c @@ -397,19 +397,20 @@ static CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, target_ulong addr) return NULL; } -static bool kvm_arm_pmu_set_attr(CPUState *cs, struct kvm_device_attr *attr) +static bool kvm_arm_set_device_attr(CPUState *cs, struct kvm_device_attr *attr, + const char *name) { int err; err = kvm_vcpu_ioctl(cs, KVM_HAS_DEVICE_ATTR, attr); if (err != 0) { - error_report("PMU: KVM_HAS_DEVICE_ATTR: %s", strerror(-err)); + error_report("%s: KVM_HAS_DEVICE_ATTR: %s", name, strerror(-err)); return false; } err = kvm_vcpu_ioctl(cs, KVM_SET_DEVICE_ATTR, attr); if (err != 0) { - error_report("PMU: KVM_SET_DEVICE_ATTR: %s", strerror(-err)); + error_report("%s: KVM_SET_DEVICE_ATTR: %s", name, strerror(-err)); return false; } @@ -426,7 +427,7 @@ void kvm_arm_pmu_init(CPUState *cs) if (!ARM_CPU(cs)->has_pmu) { return; } - if (!kvm_arm_pmu_set_attr(cs, &attr)) { + if (!kvm_arm_set_device_attr(cs, &attr, "PMU")) { error_report("failed to init PMU"); abort(); } @@ -443,7 +444,7 @@ void kvm_arm_pmu_set_irq(CPUState *cs, int irq) if (!ARM_CPU(cs)->has_pmu) { return; } - if (!kvm_arm_pmu_set_attr(cs, &attr)) { + if (!kvm_arm_set_device_attr(cs, &attr, "PMU")) { error_report("failed to set irq for PMU"); abort(); }