From: Oliver Upton <oupton@google.com>
To: kvm@vger.kernel.org
Cc: seanjc@google.com, pbonzini@redhat.com, maz@kernel.org,
kvmarm@vger.kernel.org, Oliver Upton <oupton@google.com>
Subject: [PATCH 2/5] KVM: Shove vcpu stats_id init into kvm_vcpu_create_debugfs()
Date: Fri, 15 Apr 2022 20:15:39 +0000 [thread overview]
Message-ID: <20220415201542.1496582-3-oupton@google.com> (raw)
In-Reply-To: <20220415201542.1496582-1-oupton@google.com>
Again, the stats_id is only ever used by the stats code; put it where it
belongs with the rest of the stats initialization.
No functional change intended.
Signed-off-by: Oliver Upton <oupton@google.com>
---
virt/kvm/kvm_main.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index ec9c6aad041b..aaf8de62b897 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -3711,6 +3711,10 @@ static void kvm_create_vcpu_debugfs(struct kvm_vcpu *vcpu)
struct dentry *debugfs_dentry;
char dir_name[ITOA_MAX_LEN * 2];
+ /* Fill the stats id string for the vcpu */
+ snprintf(vcpu->stats_id, sizeof(vcpu->stats_id), "kvm-%d/vcpu-%d",
+ task_pid_nr(current), vcpu->vcpu_id);
+
if (!debugfs_initialized())
return;
@@ -3786,10 +3790,6 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id)
if (r)
goto unlock_vcpu_destroy;
- /* Fill the stats id string for the vcpu */
- snprintf(vcpu->stats_id, sizeof(vcpu->stats_id), "kvm-%d/vcpu-%d",
- task_pid_nr(current), id);
-
/* Now it's all set up, let userspace reach it */
kvm_get_kvm(kvm);
r = create_vcpu_fd(vcpu);
--
2.36.0.rc0.470.gd361397f0d-goog
next prev parent reply other threads:[~2022-04-15 20:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-15 20:15 [PATCH 0/5] KVM: Clean up debugfs+stats init/destroy Oliver Upton
2022-04-15 20:15 ` [PATCH 1/5] KVM: Shove vm stats_id init into kvm_create_vm_debugfs() Oliver Upton
2022-05-16 20:58 ` Sean Christopherson
2022-04-15 20:15 ` Oliver Upton [this message]
2022-05-16 21:01 ` [PATCH 2/5] KVM: Shove vcpu stats_id init into kvm_vcpu_create_debugfs() Sean Christopherson
2022-05-16 22:26 ` Oliver Upton
2022-04-15 20:15 ` [PATCH 3/5] KVM: Get an fd before creating the VM Oliver Upton
2022-04-15 20:15 ` [PATCH 4/5] KVM: Actually create debugfs in kvm_create_vm() Oliver Upton
2022-05-16 22:19 ` Sean Christopherson
2022-05-16 23:55 ` Oliver Upton
2022-04-15 20:15 ` [PATCH 5/5] KVM: Hoist debugfs_dentry init to kvm_create_vm_debugfs() (again) Oliver Upton
2022-04-15 20:19 ` [PATCH 0/5] KVM: Clean up debugfs+stats init/destroy Oliver Upton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220415201542.1496582-3-oupton@google.com \
--to=oupton@google.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@vger.kernel.org \
--cc=maz@kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox