| Message ID | 20220518175811.2758661-2-oupton@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: Clean up debugfs+stats init/destroy | expand |
On Wed, May 18, 2022, Oliver Upton wrote: > Initialize the field alongside the other struct kvm fields. No Restate "stats_id" instead of "the field", it's literally fewer characters and having to go read subject/shortlog to grok the change is annoying. IMO, changelogs should be 100% coherent without the shortlog. Explaining why would also be helpful. AFAICT there's no actual "need" for this in this series, rather that this is futureproofing KVM since there's no reason not to fill kvm->stats_id from time zero. > functional change intended. > > Signed-off-by: Oliver Upton <oupton@google.com> > --- > virt/kvm/kvm_main.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index 6d971fb1b08d..36dc9271d039 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -1101,6 +1101,9 @@ static struct kvm *kvm_create_vm(unsigned long type) > */ > kvm->debugfs_dentry = ERR_PTR(-ENOENT); > > + snprintf(kvm->stats_id, sizeof(kvm->stats_id), > + "kvm-%d", task_pid_nr(current)); > + > if (init_srcu_struct(&kvm->srcu)) > goto out_err_no_srcu; > if (init_srcu_struct(&kvm->irq_srcu)) > @@ -4787,9 +4790,6 @@ static int kvm_dev_ioctl_create_vm(unsigned long type) > if (r < 0) > goto put_kvm; > > - snprintf(kvm->stats_id, sizeof(kvm->stats_id), > - "kvm-%d", task_pid_nr(current)); > - > file = anon_inode_getfile("kvm-vm", &kvm_vm_fops, kvm, O_RDWR); > if (IS_ERR(file)) { > put_unused_fd(r); > -- > 2.36.1.124.g0e6072fb45-goog >
On Wed, May 18, 2022, Oliver Upton wrote: > Initialize the field alongside the other struct kvm fields. No > functional change intended. > > Signed-off-by: Oliver Upton <oupton@google.com> > --- > virt/kvm/kvm_main.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index 6d971fb1b08d..36dc9271d039 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -1101,6 +1101,9 @@ static struct kvm *kvm_create_vm(unsigned long type) > */ > kvm->debugfs_dentry = ERR_PTR(-ENOENT); > > + snprintf(kvm->stats_id, sizeof(kvm->stats_id), > + "kvm-%d", task_pid_nr(current)); After looking at the next patch, can you opportunistically tweak this to (a) have the string on the first line, and (b) align indentation? I.e. snprintf(kvm->stats_id, sizeof(kvm->stats_id), "kvm-%d", task_pid_nr(current)); That makes it a lot easier to see what the string will look like.
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 6d971fb1b08d..36dc9271d039 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1101,6 +1101,9 @@ static struct kvm *kvm_create_vm(unsigned long type) */ kvm->debugfs_dentry = ERR_PTR(-ENOENT); + snprintf(kvm->stats_id, sizeof(kvm->stats_id), + "kvm-%d", task_pid_nr(current)); + if (init_srcu_struct(&kvm->srcu)) goto out_err_no_srcu; if (init_srcu_struct(&kvm->irq_srcu)) @@ -4787,9 +4790,6 @@ static int kvm_dev_ioctl_create_vm(unsigned long type) if (r < 0) goto put_kvm; - snprintf(kvm->stats_id, sizeof(kvm->stats_id), - "kvm-%d", task_pid_nr(current)); - file = anon_inode_getfile("kvm-vm", &kvm_vm_fops, kvm, O_RDWR); if (IS_ERR(file)) { put_unused_fd(r);
Initialize the field alongside the other struct kvm fields. No functional change intended. Signed-off-by: Oliver Upton <oupton@google.com> --- virt/kvm/kvm_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)