public inbox for virtio-comment@lists.linux.dev
 help / color / mirror / Atom feed
* [PULL v4 ] administration commands for device parts
@ 2024-07-14 15:01 Parav Pandit
  2024-07-14 15:50 ` Michael S. Tsirkin
  0 siblings, 1 reply; 7+ messages in thread
From: Parav Pandit @ 2024-07-14 15:01 UTC (permalink / raw)
  To: virtio-comment, mst, cohuck; +Cc: Parav Pandit

From: Parav Pandit <parav@nvidia.com>

Hi Michael, Cornelia,

The following changes since commit 9b3129fe72360a78e76b6dd890d3abc5a45fa915:

  virtio_pci_cap64: specify offset_hi, length_hi endianness (2024-07-12 06:43:53 -0400)

are available in the Git repository at:

  https://github.com/paravmellanox/virtio-spec.git tags/for_1.4_v4

for you to fetch changes up to f89c2818bba1bd0d80bb12372973deb6908931f2:

  editorial: replace hyperref with ref (2024-07-14 17:44:14 +0300)

If the change f89c2818bba1bd0d80bb12372973deb6908931f2 still not reaches to your
expected quality level, can you please pull upto 52d320c8b3c54ae035c0ddc1d23ae997cbfa13b2?
I will supply the requested improvements on top of virtio-1.4 branch on top of
52d320c8b3c54ae035c0ddc1d23ae997cbfa13b2 once merged.

----------------------------------------------------------------
This tag contains administration commands for device parts

changelog:
v3->v4:
- addressed Michael's comment to add fixes tag to the patches
  in editorial patch
v2->v3:
- added message-id to the last patch
- fixed reference to named reference in the last patch
v1->v2:
- fixed hyper reference to name reference
- fixed typo in commit log
- reduced the patches of pull request due to rebase of virtio-1.4 branch
v0->v1:
- resolved merge conflict for an empty line in newdevice.tex


----------------------------------------------------------------
Parav Pandit (6):
      admin: Add theory of operation for device parts
      admin: Extend resource objects for sr-iov group type
      admin: Add admin commands for device parts
      admin: Define common device parts
      admin: Add requirements of device parts commands
      editorial: replace hyperref with ref

 admin-cmds-capabilities.tex     |  16 ++
 admin-cmds-device-parts.tex     | 469 ++++++++++++++++++++++++++++++++++++++++
 admin-cmds-resource-objects.tex |  29 ++-
 admin.tex                       |  12 +-
 conformance.tex                 |   2 +
 content.tex                     |   1 +
 device-parts.tex                | 232 ++++++++++++++++++++
 newdevice.tex                   |  24 +-
 8 files changed, 778 insertions(+), 7 deletions(-)
 create mode 100644 admin-cmds-device-parts.tex
 create mode 100644 device-parts.tex

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PULL v4 ] administration commands for device parts
  2024-07-14 15:01 [PULL v4 ] administration commands for device parts Parav Pandit
@ 2024-07-14 15:50 ` Michael S. Tsirkin
  2024-07-14 22:20   ` Parav Pandit
  0 siblings, 1 reply; 7+ messages in thread
From: Michael S. Tsirkin @ 2024-07-14 15:50 UTC (permalink / raw)
  To: Parav Pandit; +Cc: virtio-comment, cohuck

On Sun, Jul 14, 2024 at 03:01:07PM +0000, Parav Pandit wrote:
> From: Parav Pandit <parav@nvidia.com>
> 
> Hi Michael, Cornelia,
> 
> The following changes since commit 9b3129fe72360a78e76b6dd890d3abc5a45fa915:
> 
>   virtio_pci_cap64: specify offset_hi, length_hi endianness (2024-07-12 06:43:53 -0400)
> 
> are available in the Git repository at:
> 
>   https://github.com/paravmellanox/virtio-spec.git tags/for_1.4_v4
> 
> for you to fetch changes up to f89c2818bba1bd0d80bb12372973deb6908931f2:
> 
>   editorial: replace hyperref with ref (2024-07-14 17:44:14 +0300)
> 
> If the change f89c2818bba1bd0d80bb12372973deb6908931f2 still not reaches to your
> expected quality level, can you please pull upto 52d320c8b3c54ae035c0ddc1d23ae997cbfa13b2?
> I will supply the requested improvements on top of virtio-1.4 branch on top of
> 52d320c8b3c54ae035c0ddc1d23ae997cbfa13b2 once merged.
> 
> ----------------------------------------------------------------
> This tag contains administration commands for device parts
> 
> changelog:
> v3->v4:
> - addressed Michael's comment to add fixes tag to the patches
>   in editorial patch
> v2->v3:
> - added message-id to the last patch
> - fixed reference to named reference in the last patch
> v1->v2:
> - fixed hyper reference to name reference
> - fixed typo in commit log
> - reduced the patches of pull request due to rebase of virtio-1.4 branch
> v0->v1:
> - resolved merge conflict for an empty line in newdevice.tex
> 
> 
> ----------------------------------------------------------------
> Parav Pandit (6):
>       admin: Add theory of operation for device parts
>       admin: Extend resource objects for sr-iov group type
>       admin: Add admin commands for device parts
>       admin: Define common device parts
>       admin: Add requirements of device parts commands
>       editorial: replace hyperref with ref
> 
>  admin-cmds-capabilities.tex     |  16 ++
>  admin-cmds-device-parts.tex     | 469 ++++++++++++++++++++++++++++++++++++++++
>  admin-cmds-resource-objects.tex |  29 ++-
>  admin.tex                       |  12 +-
>  conformance.tex                 |   2 +
>  content.tex                     |   1 +
>  device-parts.tex                | 232 ++++++++++++++++++++
>  newdevice.tex                   |  24 +-
>  8 files changed, 778 insertions(+), 7 deletions(-)
>  create mode 100644 admin-cmds-device-parts.tex
>  create mode 100644 device-parts.tex


Parav, makediff fails. Did you, in fact, run make diff and
inspect the changes?
Because it's not really practical to review the whole document
each time ...

-- 
MST


^ permalink raw reply	[flat|nested] 7+ messages in thread

* RE: [PULL v4 ] administration commands for device parts
  2024-07-14 15:50 ` Michael S. Tsirkin
@ 2024-07-14 22:20   ` Parav Pandit
  2024-07-15  8:52     ` Cornelia Huck
  2024-07-15 10:08     ` Michael S. Tsirkin
  0 siblings, 2 replies; 7+ messages in thread
From: Parav Pandit @ 2024-07-14 22:20 UTC (permalink / raw)
  To: Michael S. Tsirkin; +Cc: virtio-comment@lists.linux.dev, cohuck@redhat.com

> From: Michael S. Tsirkin <mst@redhat.com>
> Sent: Sunday, July 14, 2024 9:21 PM
> 
> On Sun, Jul 14, 2024 at 03:01:07PM +0000, Parav Pandit wrote:
> > From: Parav Pandit <parav@nvidia.com>
> >
> > Hi Michael, Cornelia,
> >
> > The following changes since commit
> 9b3129fe72360a78e76b6dd890d3abc5a45fa915:
> >
> >   virtio_pci_cap64: specify offset_hi, length_hi endianness
> > (2024-07-12 06:43:53 -0400)
> >
> > are available in the Git repository at:
> >
> >   https://github.com/paravmellanox/virtio-spec.git tags/for_1.4_v4
> >
> > for you to fetch changes up to
> f89c2818bba1bd0d80bb12372973deb6908931f2:
> >
> >   editorial: replace hyperref with ref (2024-07-14 17:44:14 +0300)
> >
> > If the change f89c2818bba1bd0d80bb12372973deb6908931f2 still not
> > reaches to your expected quality level, can you please pull upto
> 52d320c8b3c54ae035c0ddc1d23ae997cbfa13b2?
> > I will supply the requested improvements on top of virtio-1.4 branch
> > on top of
> > 52d320c8b3c54ae035c0ddc1d23ae997cbfa13b2 once merged.
> >
> > ----------------------------------------------------------------
> > This tag contains administration commands for device parts
> >
> > changelog:
> > v3->v4:
> > - addressed Michael's comment to add fixes tag to the patches
> >   in editorial patch
> > v2->v3:
> > - added message-id to the last patch
> > - fixed reference to named reference in the last patch
> > v1->v2:
> > - fixed hyper reference to name reference
> > - fixed typo in commit log
> > - reduced the patches of pull request due to rebase of virtio-1.4
> > branch
> > v0->v1:
> > - resolved merge conflict for an empty line in newdevice.tex
> >
> >
> > ----------------------------------------------------------------
> > Parav Pandit (6):
> >       admin: Add theory of operation for device parts
> >       admin: Extend resource objects for sr-iov group type
> >       admin: Add admin commands for device parts
> >       admin: Define common device parts
> >       admin: Add requirements of device parts commands
> >       editorial: replace hyperref with ref
> >
> >  admin-cmds-capabilities.tex     |  16 ++
> >  admin-cmds-device-parts.tex     | 469
> ++++++++++++++++++++++++++++++++++++++++
> >  admin-cmds-resource-objects.tex |  29 ++-
> >  admin.tex                       |  12 +-
> >  conformance.tex                 |   2 +
> >  content.tex                     |   1 +
> >  device-parts.tex                | 232 ++++++++++++++++++++
> >  newdevice.tex                   |  24 +-
> >  8 files changed, 778 insertions(+), 7 deletions(-)  create mode
> > 100644 admin-cmds-device-parts.tex  create mode 100644
> > device-parts.tex
> 
> 
> Parav, makediff fails. Did you, in fact, run make diff and inspect the changes?
> Because it's not really practical to review the whole document each time ...
> 
Without your last commit of makediff [1],

I ran makediffpdf and verified the output as well.
There are some warnings with xtabular. I will fix them.

Makediffhtml.sh didn't succeed due to missing xtabular.
I sent the fix [2] for it.

However, with commit [1], hitting below error for makediffpdf.sh and makediffhtml.sh too.
	
HEAD is now at b495841 transport-mmio: fix up makediff from 1.2
Applying editorial: allow for longer device id table: makediff 1.3
[detached HEAD d213eb3] editorial: allow for longer device id table: makediff 1.3
 Author: Cornelia Huck <cohuck@redhat.com>
 Date: Mon Oct 30 14:42:05 2023 +0100
 1 file changed, 2 insertions(+), 2 deletions(-)
Applying admin: Prepare table for multipage listing
Auto-merging makediff.sh
CONFLICT (content): Merge conflict in makediff.sh
error: could not apply c69ccb2... makediff: cherry pick table env change
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

[1] https://github.com/oasis-tcs/virtio-spec/commit/c69ccb2f16e09e5dab9b9399b72b701d51f26b6a
[2] https://lore.kernel.org/virtio-comment/20240714221837.3323459-1-parav@vr-arch-host06.mtvr.labs.mlnx/T/#u

> --
> MST


^ permalink raw reply	[flat|nested] 7+ messages in thread

* RE: [PULL v4 ] administration commands for device parts
  2024-07-14 22:20   ` Parav Pandit
@ 2024-07-15  8:52     ` Cornelia Huck
  2024-07-15  8:56       ` Michael S. Tsirkin
  2024-07-15 10:08     ` Michael S. Tsirkin
  1 sibling, 1 reply; 7+ messages in thread
From: Cornelia Huck @ 2024-07-15  8:52 UTC (permalink / raw)
  To: Parav Pandit, Michael S. Tsirkin; +Cc: virtio-comment@lists.linux.dev

On Sun, Jul 14 2024, Parav Pandit <parav@nvidia.com> wrote:

> However, with commit [1], hitting below error for makediffpdf.sh and makediffhtml.sh too.
> 	
> HEAD is now at b495841 transport-mmio: fix up makediff from 1.2
> Applying editorial: allow for longer device id table: makediff 1.3
> [detached HEAD d213eb3] editorial: allow for longer device id table: makediff 1.3
>  Author: Cornelia Huck <cohuck@redhat.com>
>  Date: Mon Oct 30 14:42:05 2023 +0100
>  1 file changed, 2 insertions(+), 2 deletions(-)
> Applying admin: Prepare table for multipage listing
> Auto-merging makediff.sh
> CONFLICT (content): Merge conflict in makediff.sh
> error: could not apply c69ccb2... makediff: cherry pick table env change
> hint: After resolving the conflicts, mark them with
> hint: "git add/rm <pathspec>", then run
> hint: "git cherry-pick --continue".
> hint: You can instead skip this commit with "git cherry-pick --skip".
> hint: To abort and get back to the state before "git cherry-pick",
> hint: run "git cherry-pick --abort".
>
> [1] https://github.com/oasis-tcs/virtio-spec/commit/c69ccb2f16e09e5dab9b9399b72b701d51f26b6a
> [2] https://lore.kernel.org/virtio-comment/20240714221837.3323459-1-parav@vr-arch-host06.mtvr.labs.mlnx/T/#u

Changed line numbers probably throw it off... maybe using a different
merge strategy for the cherry pick would make it succeed?


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PULL v4 ] administration commands for device parts
  2024-07-15  8:52     ` Cornelia Huck
@ 2024-07-15  8:56       ` Michael S. Tsirkin
  0 siblings, 0 replies; 7+ messages in thread
From: Michael S. Tsirkin @ 2024-07-15  8:56 UTC (permalink / raw)
  To: Cornelia Huck; +Cc: Parav Pandit, virtio-comment@lists.linux.dev

On Mon, Jul 15, 2024 at 10:52:08AM +0200, Cornelia Huck wrote:
> On Sun, Jul 14 2024, Parav Pandit <parav@nvidia.com> wrote:
> 
> > However, with commit [1], hitting below error for makediffpdf.sh and makediffhtml.sh too.
> > 	
> > HEAD is now at b495841 transport-mmio: fix up makediff from 1.2
> > Applying editorial: allow for longer device id table: makediff 1.3
> > [detached HEAD d213eb3] editorial: allow for longer device id table: makediff 1.3
> >  Author: Cornelia Huck <cohuck@redhat.com>
> >  Date: Mon Oct 30 14:42:05 2023 +0100
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > Applying admin: Prepare table for multipage listing
> > Auto-merging makediff.sh
> > CONFLICT (content): Merge conflict in makediff.sh
> > error: could not apply c69ccb2... makediff: cherry pick table env change
> > hint: After resolving the conflicts, mark them with
> > hint: "git add/rm <pathspec>", then run
> > hint: "git cherry-pick --continue".
> > hint: You can instead skip this commit with "git cherry-pick --skip".
> > hint: To abort and get back to the state before "git cherry-pick",
> > hint: run "git cherry-pick --abort".
> >
> > [1] https://github.com/oasis-tcs/virtio-spec/commit/c69ccb2f16e09e5dab9b9399b72b701d51f26b6a
> > [2] https://lore.kernel.org/virtio-comment/20240714221837.3323459-1-parav@vr-arch-host06.mtvr.labs.mlnx/T/#u
> 
> Changed line numbers probably throw it off... maybe using a different
> merge strategy for the cherry pick would make it succeed?

It's weird that it works for me - could be a different version of git.
Parav, which git version are you using? Can you try with e.g. -s patience?
Cornelia, does it work for you? Parav said he's traveling ...

-- 
MST


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PULL v4 ] administration commands for device parts
  2024-07-14 22:20   ` Parav Pandit
  2024-07-15  8:52     ` Cornelia Huck
@ 2024-07-15 10:08     ` Michael S. Tsirkin
  2024-07-15 11:12       ` Cornelia Huck
  1 sibling, 1 reply; 7+ messages in thread
From: Michael S. Tsirkin @ 2024-07-15 10:08 UTC (permalink / raw)
  To: Parav Pandit; +Cc: virtio-comment@lists.linux.dev, cohuck@redhat.com

On Sun, Jul 14, 2024 at 10:20:33PM +0000, Parav Pandit wrote:
> > From: Michael S. Tsirkin <mst@redhat.com>
> > Sent: Sunday, July 14, 2024 9:21 PM
> > 
> > On Sun, Jul 14, 2024 at 03:01:07PM +0000, Parav Pandit wrote:
> > > From: Parav Pandit <parav@nvidia.com>
> > >
> > > Hi Michael, Cornelia,
> > >
> > > The following changes since commit
> > 9b3129fe72360a78e76b6dd890d3abc5a45fa915:
> > >
> > >   virtio_pci_cap64: specify offset_hi, length_hi endianness
> > > (2024-07-12 06:43:53 -0400)
> > >
> > > are available in the Git repository at:
> > >
> > >   https://github.com/paravmellanox/virtio-spec.git tags/for_1.4_v4
> > >
> > > for you to fetch changes up to
> > f89c2818bba1bd0d80bb12372973deb6908931f2:
> > >
> > >   editorial: replace hyperref with ref (2024-07-14 17:44:14 +0300)
> > >
> > > If the change f89c2818bba1bd0d80bb12372973deb6908931f2 still not
> > > reaches to your expected quality level, can you please pull upto
> > 52d320c8b3c54ae035c0ddc1d23ae997cbfa13b2?
> > > I will supply the requested improvements on top of virtio-1.4 branch
> > > on top of
> > > 52d320c8b3c54ae035c0ddc1d23ae997cbfa13b2 once merged.
> > >
> > > ----------------------------------------------------------------
> > > This tag contains administration commands for device parts
> > >
> > > changelog:
> > > v3->v4:
> > > - addressed Michael's comment to add fixes tag to the patches
> > >   in editorial patch
> > > v2->v3:
> > > - added message-id to the last patch
> > > - fixed reference to named reference in the last patch
> > > v1->v2:
> > > - fixed hyper reference to name reference
> > > - fixed typo in commit log
> > > - reduced the patches of pull request due to rebase of virtio-1.4
> > > branch
> > > v0->v1:
> > > - resolved merge conflict for an empty line in newdevice.tex
> > >
> > >
> > > ----------------------------------------------------------------
> > > Parav Pandit (6):
> > >       admin: Add theory of operation for device parts
> > >       admin: Extend resource objects for sr-iov group type
> > >       admin: Add admin commands for device parts
> > >       admin: Define common device parts
> > >       admin: Add requirements of device parts commands
> > >       editorial: replace hyperref with ref
> > >
> > >  admin-cmds-capabilities.tex     |  16 ++
> > >  admin-cmds-device-parts.tex     | 469
> > ++++++++++++++++++++++++++++++++++++++++
> > >  admin-cmds-resource-objects.tex |  29 ++-
> > >  admin.tex                       |  12 +-
> > >  conformance.tex                 |   2 +
> > >  content.tex                     |   1 +
> > >  device-parts.tex                | 232 ++++++++++++++++++++
> > >  newdevice.tex                   |  24 +-
> > >  8 files changed, 778 insertions(+), 7 deletions(-)  create mode
> > > 100644 admin-cmds-device-parts.tex  create mode 100644
> > > device-parts.tex
> > 
> > 
> > Parav, makediff fails. Did you, in fact, run make diff and inspect the changes?
> > Because it's not really practical to review the whole document each time ...
> > 
> Without your last commit of makediff [1],
> 
> I ran makediffpdf and verified the output as well.
> There are some warnings with xtabular. I will fix them.
> 
> Makediffhtml.sh didn't succeed due to missing xtabular.
> I sent the fix [2] for it.
> 
> However, with commit [1], hitting below error for makediffpdf.sh and makediffhtml.sh too.
> 	
> HEAD is now at b495841 transport-mmio: fix up makediff from 1.2
> Applying editorial: allow for longer device id table: makediff 1.3
> [detached HEAD d213eb3] editorial: allow for longer device id table: makediff 1.3
>  Author: Cornelia Huck <cohuck@redhat.com>
>  Date: Mon Oct 30 14:42:05 2023 +0100
>  1 file changed, 2 insertions(+), 2 deletions(-)
> Applying admin: Prepare table for multipage listing
> Auto-merging makediff.sh
> CONFLICT (content): Merge conflict in makediff.sh
> error: could not apply c69ccb2... makediff: cherry pick table env change
> hint: After resolving the conflicts, mark them with
> hint: "git add/rm <pathspec>", then run
> hint: "git cherry-pick --continue".
> hint: You can instead skip this commit with "git cherry-pick --skip".
> hint: To abort and get back to the state before "git cherry-pick",
> hint: run "git cherry-pick --abort".
> 
> [1] https://github.com/oasis-tcs/virtio-spec/commit/c69ccb2f16e09e5dab9b9399b72b701d51f26b6a
> [2] https://lore.kernel.org/virtio-comment/20240714221837.3323459-1-parav@vr-arch-host06.mtvr.labs.mlnx/T/#u
> 
> > --
> > MST


OK I figured it out.
It's because you have the xtabular commit in there.
cherry-pick logic was picking it up because it
included the Fixes tag for the subject it was looking for.
For now I just switched it to looking for a regexp and added ^
in front. Will break if we have commits with special
characters in the subject, but we'll worry about it if
this occurs.

-- 
MST


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PULL v4 ] administration commands for device parts
  2024-07-15 10:08     ` Michael S. Tsirkin
@ 2024-07-15 11:12       ` Cornelia Huck
  0 siblings, 0 replies; 7+ messages in thread
From: Cornelia Huck @ 2024-07-15 11:12 UTC (permalink / raw)
  To: Michael S. Tsirkin, Parav Pandit; +Cc: virtio-comment@lists.linux.dev

On Mon, Jul 15 2024, "Michael S. Tsirkin" <mst@redhat.com> wrote:

> OK I figured it out.
> It's because you have the xtabular commit in there.
> cherry-pick logic was picking it up because it
> included the Fixes tag for the subject it was looking for.
> For now I just switched it to looking for a regexp and added ^
> in front. Will break if we have commits with special
> characters in the subject, but we'll worry about it if
> this occurs.

I'd also advocate for avoiding special characters in the title, if at
all possible, since it is not clear what else that might break.


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2024-07-15 11:12 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-14 15:01 [PULL v4 ] administration commands for device parts Parav Pandit
2024-07-14 15:50 ` Michael S. Tsirkin
2024-07-14 22:20   ` Parav Pandit
2024-07-15  8:52     ` Cornelia Huck
2024-07-15  8:56       ` Michael S. Tsirkin
2024-07-15 10:08     ` Michael S. Tsirkin
2024-07-15 11:12       ` Cornelia Huck

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox