OASIS Virtual I/O Device (VIRTIO) TC

 View Only
  • 1.  [PATCH] fixupdiff: escape ^ caret

    Posted 04-19-2022 16:31
    Since commit: commit 1e30753d53d222fbe955f0643583d756105d557e Author: Jan Kiszka <jan.kiszka@siemens.com> Date: Fri Oct 11 13:43:41 2019 +0200 Fix ^= in example code Trying to escaping ^ here only leaves the backslash in the output. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> we have plain ^ inside listing. Escape it with but only if not already escaped (as output of diff with old source will be). Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- fixupdiff.pl 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fixupdiff.pl b/fixupdiff.pl index f50cf26..e7d3a0f 100644 --- a/fixupdiff.pl +++ b/fixupdiff.pl @@ -35,6 +35,10 @@ while (<>) { $line =~ s/%DIFDELCMDs+< //; if (not $line =~ m/\(?:begin end){lstlisting}/) { $line =~ s/([#&{} ])/\$1/g; + #be careful: do not escape ^ + $line =~ s/([^\])(^)/$1\$2/g; + #also at beginning of line + $line =~ s/^(^)/\$1/g; if ($add) { $line =~ s/(.*)/$\DIFdel{$1}$/; } else { -- MST


  • 2.  Re: [virtio-dev] [PATCH] fixupdiff: escape ^ caret

    Posted 04-20-2022 12:57
    On Tue, Apr 19 2022, "Michael S. Tsirkin" <mst@redhat.com> wrote:

    > Since commit:
    >
    > commit 1e30753d53d222fbe955f0643583d756105d557e
    > Author: Jan Kiszka <jan.kiszka@siemens.com>
    > Date: Fri Oct 11 13:43:41 2019 +0200
    >
    > Fix ^= in example code
    >
    > Trying to escaping ^ here only leaves the backslash in the output.
    >
    > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    >
    > we have plain ^ inside listing. Escape it with \ but only
    > if not already escaped (as output of diff with old source will be).
    >
    > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    > ---
    > fixupdiff.pl | 4 ++++
    > 1 file changed, 4 insertions(+)

    Thanks, pushed as an editorial update.




  • 3.  Re: [virtio-dev] [PATCH] fixupdiff: escape ^ caret

    Posted 04-20-2022 12:57
    On Tue, Apr 19 2022, "Michael S. Tsirkin" <mst@redhat.com> wrote:

    > Since commit:
    >
    > commit 1e30753d53d222fbe955f0643583d756105d557e
    > Author: Jan Kiszka <jan.kiszka@siemens.com>
    > Date: Fri Oct 11 13:43:41 2019 +0200
    >
    > Fix ^= in example code
    >
    > Trying to escaping ^ here only leaves the backslash in the output.
    >
    > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    >
    > we have plain ^ inside listing. Escape it with \ but only
    > if not already escaped (as output of diff with old source will be).
    >
    > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    > ---
    > fixupdiff.pl | 4 ++++
    > 1 file changed, 4 insertions(+)

    Thanks, pushed as an editorial update.




  • 4.  Re: [virtio-dev] [PATCH] fixupdiff: escape ^ caret

    Posted 04-20-2022 12:57
    On Tue, Apr 19 2022, "Michael S. Tsirkin" <mst@redhat.com> wrote: > Since commit: > > commit 1e30753d53d222fbe955f0643583d756105d557e > Author: Jan Kiszka <jan.kiszka@siemens.com> > Date: Fri Oct 11 13:43:41 2019 +0200 > > Fix ^= in example code > > Trying to escaping ^ here only leaves the backslash in the output. > > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > we have plain ^ inside listing. Escape it with but only > if not already escaped (as output of diff with old source will be). > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > --- > fixupdiff.pl 4 ++++ > 1 file changed, 4 insertions(+) Thanks, pushed as an editorial update.


  • 5.  Re: [virtio-dev] [PATCH] fixupdiff: escape ^ caret

    Posted 04-20-2022 15:33
    On Wed, Apr 20, 2022 at 02:57:04PM +0200, Cornelia Huck wrote:
    > On Tue, Apr 19 2022, "Michael S. Tsirkin" <mst@redhat.com> wrote:
    >
    > > Since commit:
    > >
    > > commit 1e30753d53d222fbe955f0643583d756105d557e
    > > Author: Jan Kiszka <jan.kiszka@siemens.com>
    > > Date: Fri Oct 11 13:43:41 2019 +0200
    > >
    > > Fix ^= in example code
    > >
    > > Trying to escaping ^ here only leaves the backslash in the output.
    > >
    > > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    > >
    > > we have plain ^ inside listing. Escape it with \ but only
    > > if not already escaped (as output of diff with old source will be).
    > >
    > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    > > ---
    > > fixupdiff.pl | 4 ++++
    > > 1 file changed, 4 insertions(+)
    >
    > Thanks, pushed as an editorial update.

    Sounds good! OK let me compile this all, upload and we can
    get the ball rolling with the 1st vote.

    --
    MST




  • 6.  Re: [virtio-dev] [PATCH] fixupdiff: escape ^ caret

    Posted 04-20-2022 15:33
    On Wed, Apr 20, 2022 at 02:57:04PM +0200, Cornelia Huck wrote:
    > On Tue, Apr 19 2022, "Michael S. Tsirkin" <mst@redhat.com> wrote:
    >
    > > Since commit:
    > >
    > > commit 1e30753d53d222fbe955f0643583d756105d557e
    > > Author: Jan Kiszka <jan.kiszka@siemens.com>
    > > Date: Fri Oct 11 13:43:41 2019 +0200
    > >
    > > Fix ^= in example code
    > >
    > > Trying to escaping ^ here only leaves the backslash in the output.
    > >
    > > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    > >
    > > we have plain ^ inside listing. Escape it with \ but only
    > > if not already escaped (as output of diff with old source will be).
    > >
    > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    > > ---
    > > fixupdiff.pl | 4 ++++
    > > 1 file changed, 4 insertions(+)
    >
    > Thanks, pushed as an editorial update.

    Sounds good! OK let me compile this all, upload and we can
    get the ball rolling with the 1st vote.

    --
    MST




  • 7.  Re: [virtio-dev] [PATCH] fixupdiff: escape ^ caret

    Posted 04-20-2022 15:33
    On Wed, Apr 20, 2022 at 02:57:04PM +0200, Cornelia Huck wrote: > On Tue, Apr 19 2022, "Michael S. Tsirkin" <mst@redhat.com> wrote: > > > Since commit: > > > > commit 1e30753d53d222fbe955f0643583d756105d557e > > Author: Jan Kiszka <jan.kiszka@siemens.com> > > Date: Fri Oct 11 13:43:41 2019 +0200 > > > > Fix ^= in example code > > > > Trying to escaping ^ here only leaves the backslash in the output. > > > > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > > > we have plain ^ inside listing. Escape it with but only > > if not already escaped (as output of diff with old source will be). > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > --- > > fixupdiff.pl 4 ++++ > > 1 file changed, 4 insertions(+) > > Thanks, pushed as an editorial update. Sounds good! OK let me compile this all, upload and we can get the ball rolling with the 1st vote. -- MST