[Qemu-devel] [PULL 0/1] Tracing patches

[Qemu-devel] [PULL 0/1] Tracing patches

[Stefan Hajnoczi]

The following changes since commit 5456c6a4ec9cd8fc314ddc303e88bf85c110975c:

  Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2017-10-05 12:02:21 +0100)

are available in the git repository at:

  git://github.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 45042732f39ecd42794c256bf98f231e58849c3e:

  checkpatch: fix incompatibility with old perl (2017-10-05 10:22:44 -0400)

----------------------------------------------------------------

----------------------------------------------------------------

Vladimir Sementsov-Ogievskiy (1):
  checkpatch: fix incompatibility with old perl

 scripts/checkpatch.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.13.6

[Qemu-devel] [PULL 1/1] checkpatch: fix incompatibility with old perl

[Stefan Hajnoczi]

From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Do not use '/r' modifier which was introduced in perl 5.14.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Fixes: 3e5875afc0f ("checkpatch: check trace-events code style")
Tested-by: Alex Williamson <alex.williamson@redhat.com>
Message-id: 20171004154420.34596-1-vsementsov@virtuozzo.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 scripts/checkpatch.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 3c0a28e644..0c41f1212f 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1432,7 +1432,8 @@ sub process {
 					qr/%[-+ *.0-9]*([hljztL]|ll|hh)?(x|X|"\s*PRI[xX][^"]*"?)/;
 
 				# don't consider groups splitted by [.:/ ], like 2A.20:12ab
-				my $tmpline = $rawline =~ s/($hex[.:\/ ])+$hex//gr;
+				my $tmpline = $rawline;
+				$tmpline =~ s/($hex[.:\/ ])+$hex//g;
 
 				if ($tmpline =~ /(?<!0x)$hex/) {
 					ERROR("Hex numbers must be prefixed with '0x'\n" .
-- 
2.13.6

Re: [Qemu-devel] [PULL 0/1] Tracing patches

[Peter Maydell]

On 5 October 2017 at 15:25, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 5456c6a4ec9cd8fc314ddc303e88bf85c110975c:
>
>   Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2017-10-05 12:02:21 +0100)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/tracing-pull-request
>
> for you to fetch changes up to 45042732f39ecd42794c256bf98f231e58849c3e:
>
>   checkpatch: fix incompatibility with old perl (2017-10-05 10:22:44 -0400)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> Vladimir Sementsov-Ogievskiy (1):
>   checkpatch: fix incompatibility with old perl
>
>  scripts/checkpatch.pl | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>

Applied, thanks.

-- PMM