Re: [Qemu-devel] [PATCH/] checkpatch: port fix from kernel "## is not a valid modifier"

[Paolo Bonzini]

On 08/10/2015 10:05, Christian Borntraeger wrote:
> From: Andy Whitcroft 
> 
> checkpatch currently loops on fpu/softfloat.c
> Turns out this is fixed in the Linux version of checkpatch.
> 
> So this is a port of Andy Whitcrofts fix from Linux,
> Original commit was commit 89a883530fe7 ("checkpatch: ## is not a
> valid modifier")
> 
> As suggested by Peter Maydell for the QEMU version we drop the last "|"
> as there seems to be no need for that. (FWIW, the kernel discusion about
> that dried out:
> http://www.spinics.net/lists/kernel/msg1944421.html
> )
> 
> Cc: Andy Whitcroft 
> Signed-off-by: Christian Borntraeger 

Queued, thanks.

Paolo

> ---
>  scripts/checkpatch.pl | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index b6d71ea..9755e82 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -1010,7 +1010,9 @@ sub possible {
>   case|
>   else|
>   asm|__asm__|
> - do
> + do|
> + \#|
> + \#\#
>   )(?:\s|$)|
>   ^(?:typedef|struct|enum)\b
>   )}x;
> 

[Qemu-devel] [PATCH/] checkpatch: port fix from kernel "## is not a valid modifier"

[Christian Borntraeger]

From: Andy Whitcroft 

checkpatch currently loops on fpu/softfloat.c
Turns out this is fixed in the Linux version of checkpatch.

So this is a port of Andy Whitcrofts fix from Linux,
Original commit was commit 89a883530fe7 ("checkpatch: ## is not a
valid modifier")

As suggested by Peter Maydell for the QEMU version we drop the last "|"
as there seems to be no need for that. (FWIW, the kernel discusion about
that dried out:
http://www.spinics.net/lists/kernel/msg1944421.html
)

Cc: Andy Whitcroft 
Signed-off-by: Christian Borntraeger 
---
 scripts/checkpatch.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index b6d71ea..9755e82 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1010,7 +1010,9 @@ sub possible {
case|
else|
asm|__asm__|
-   do
+   do|
+   \#|
+   \#\#
)(?:\s|$)|
^(?:typedef|struct|enum)\b
)}x;
-- 
2.4.3

Re: [Qemu-devel] [PATCH] checkpatch: port fix from kernel ## is not a valid modifier

[Christian Borntraeger]

Am 09.02.2015 um 23:54 schrieb Peter Maydell:
 On 9 February 2015 at 19:43, Christian Borntraeger
 borntrae...@de.ibm.com wrote:
 From: Andy Whitcroft a...@canonical.com

 checkpatch currently loops on fpu/softfloat.c
 Turns out this is fixed in the Linux version of checkpatch.

 So this is a port of Andy Whitcrofts fix from Linux,
 Original commit was commit 89a883530fe7 (checkpatch: ## is not a
 valid modifier)

 Cc: Andy Whitcroft a...@canonical.com
 Signed-off-by: Christian Borntraeger borntrae...@de.ibm.com
 ---
  scripts/checkpatch.pl | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)

 diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
 index 5df61f9..8635f4c 100755
 --- a/scripts/checkpatch.pl
 +++ b/scripts/checkpatch.pl
 @@ -1061,7 +1061,9 @@ sub possible {
 case|
 else|
 asm|__asm__|
 -   do
 +   do|
 +   \#|
 +   \#\#|
 
 Are you sure this line should end with a '|', given it's the
 last item in the alternation ?

Good question - dont know. But the kernel version looks the same.

Re: [Qemu-devel] [PATCH] checkpatch: port fix from kernel ## is not a valid modifier

[Christian Borntraeger]

Am 09.02.2015 um 23:54 schrieb Peter Maydell:
 On 9 February 2015 at 19:43, Christian Borntraeger
 borntrae...@de.ibm.com wrote:
 From: Andy Whitcroft a...@canonical.com

 checkpatch currently loops on fpu/softfloat.c
 Turns out this is fixed in the Linux version of checkpatch.

 So this is a port of Andy Whitcrofts fix from Linux,
 Original commit was commit 89a883530fe7 (checkpatch: ## is not a
 valid modifier)

 Cc: Andy Whitcroft a...@canonical.com
 Signed-off-by: Christian Borntraeger borntrae...@de.ibm.com
 ---
  scripts/checkpatch.pl | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)

 diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
 index 5df61f9..8635f4c 100755
 --- a/scripts/checkpatch.pl
 +++ b/scripts/checkpatch.pl
 @@ -1061,7 +1061,9 @@ sub possible {
 case|
 else|
 asm|__asm__|
 -   do
 +   do|
 +   \#|
 +   \#\#|
 
 Are you sure this line should end with a '|', given it's the
 last item in the alternation ?

Getting rid of that additional | also works, but both ways fix the endless loop.
Certainly not having the | seems cleaner. (No idea why it works).
Shall I respin without the |? I will then also send a patch for the kernel, 
in case we resync again in the future.

Christian

Re: [Qemu-devel] [PATCH] checkpatch: port fix from kernel ## is not a valid modifier

[Markus Armbruster]

Christian Borntraeger borntrae...@de.ibm.com writes:

 Am 09.02.2015 um 23:54 schrieb Peter Maydell:
 On 9 February 2015 at 19:43, Christian Borntraeger
 borntrae...@de.ibm.com wrote:
 From: Andy Whitcroft a...@canonical.com

 checkpatch currently loops on fpu/softfloat.c
 Turns out this is fixed in the Linux version of checkpatch.

 So this is a port of Andy Whitcrofts fix from Linux,
 Original commit was commit 89a883530fe7 (checkpatch: ## is not a
 valid modifier)

 Cc: Andy Whitcroft a...@canonical.com
 Signed-off-by: Christian Borntraeger borntrae...@de.ibm.com
 ---
  scripts/checkpatch.pl | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)

 diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
 index 5df61f9..8635f4c 100755
 --- a/scripts/checkpatch.pl
 +++ b/scripts/checkpatch.pl
 @@ -1061,7 +1061,9 @@ sub possible {
 case|
 else|
 asm|__asm__|
 -   do
 +   do|
 +   \#|
 +   \#\#|
 
 Are you sure this line should end with a '|', given it's the
 last item in the alternation ?

 Getting rid of that additional | also works, but both ways fix the endless 
 loop.
 Certainly not having the | seems cleaner. (No idea why it works).
 Shall I respin without the |? I will then also send a patch for the
 kernel, in case we resync again in the future.

If it works, I'd take it as is into QEMU, and get the cleanup from the
kernel in the next resync.

Re: [Qemu-devel] [PATCH] checkpatch: port fix from kernel ## is not a valid modifier

[Don Slutz]

On 02/09/15 10:08, Christian Borntraeger wrote:
 Am 09.02.2015 um 15:31 schrieb Paolo Bonzini:


 On 09/02/2015 13:18, Christian Borntraeger wrote:
 From: Andy Whitcroft a...@canonical.com

 checkpatch currently loops on fpu/softfloat.c
 Turns out this is fixed in the Linux version of checkpatch.

 So this is a port of Andy Whitcrofts fix from Linux,
 Original commit was commit 89a883530fe7 (checkpatch: ## is not a
 valid modifier)

 I think you need to send it as a toplevel patch for Peter to pick it up.
 
 What do you mean? This patch is on top of qemu/master - if I dont messed up.
 

The patch email headers:

...
Message-ID: 1423484293-46903-1-git-send-email-borntrae...@de.ibm.com
X-Mailer: git-send-email 1.9.3
In-Reply-To:
cafeaca9dvehzel1t+bt3n+_gjtgol4ig_opv7rvt-0ejekl...@mail.gmail.com
References:
cafeaca9dvehzel1t+bt3n+_gjtgol4ig_opv7rvt-0ejekl...@mail.gmail.com
...

Say that it is a reply, not a new email thread.

  -Don Slutz


 Christian

 Paolo

 Cc: Andy Whitcroft a...@canonical.com
 Signed-off-by: Christian Borntraeger borntrae...@de.ibm.com
 ---
  scripts/checkpatch.pl | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)

 diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
 index 5df61f9..8635f4c 100755
 --- a/scripts/checkpatch.pl
 +++ b/scripts/checkpatch.pl
 @@ -1061,7 +1061,9 @@ sub possible {
 case|
 else|
 asm|__asm__|
 -   do
 +   do|
 +   \#|
 +   \#\#|
 )(?:\s|$)|
 ^(?:typedef|struct|enum)\b
 )}x;


 
 

Re: [Qemu-devel] [PATCH] checkpatch: port fix from kernel ## is not a valid modifier

[Christian Borntraeger]

Am 09.02.2015 um 15:31 schrieb Paolo Bonzini:
 
 
 On 09/02/2015 13:18, Christian Borntraeger wrote:
 From: Andy Whitcroft a...@canonical.com

 checkpatch currently loops on fpu/softfloat.c
 Turns out this is fixed in the Linux version of checkpatch.

 So this is a port of Andy Whitcrofts fix from Linux,
 Original commit was commit 89a883530fe7 (checkpatch: ## is not a
 valid modifier)
 
 I think you need to send it as a toplevel patch for Peter to pick it up.

What do you mean? This patch is on top of qemu/master - if I dont messed up.

Christian
 
 Paolo
 
 Cc: Andy Whitcroft a...@canonical.com
 Signed-off-by: Christian Borntraeger borntrae...@de.ibm.com
 ---
  scripts/checkpatch.pl | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)

 diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
 index 5df61f9..8635f4c 100755
 --- a/scripts/checkpatch.pl
 +++ b/scripts/checkpatch.pl
 @@ -1061,7 +1061,9 @@ sub possible {
  case|
  else|
  asm|__asm__|
 -do
 +do|
 +\#|
 +\#\#|
  )(?:\s|$)|
  ^(?:typedef|struct|enum)\b
  )}x;

 

[Qemu-devel] [PATCH] checkpatch: port fix from kernel ## is not a valid modifier

[Christian Borntraeger]

From: Andy Whitcroft a...@canonical.com

checkpatch currently loops on fpu/softfloat.c
Turns out this is fixed in the Linux version of checkpatch.

So this is a port of Andy Whitcrofts fix from Linux,
Original commit was commit 89a883530fe7 (checkpatch: ## is not a
valid modifier)

Cc: Andy Whitcroft a...@canonical.com
Signed-off-by: Christian Borntraeger borntrae...@de.ibm.com
---
 scripts/checkpatch.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 5df61f9..8635f4c 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1061,7 +1061,9 @@ sub possible {
case|
else|
asm|__asm__|
-   do
+   do|
+   \#|
+   \#\#|
)(?:\s|$)|
^(?:typedef|struct|enum)\b
)}x;
-- 
1.9.3

Re: [Qemu-devel] [PATCH] checkpatch: port fix from kernel ## is not a valid modifier

[Peter Maydell]

On 9 February 2015 at 19:43, Christian Borntraeger
borntrae...@de.ibm.com wrote:
 From: Andy Whitcroft a...@canonical.com

 checkpatch currently loops on fpu/softfloat.c
 Turns out this is fixed in the Linux version of checkpatch.

 So this is a port of Andy Whitcrofts fix from Linux,
 Original commit was commit 89a883530fe7 (checkpatch: ## is not a
 valid modifier)

 Cc: Andy Whitcroft a...@canonical.com
 Signed-off-by: Christian Borntraeger borntrae...@de.ibm.com
 ---
  scripts/checkpatch.pl | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)

 diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
 index 5df61f9..8635f4c 100755
 --- a/scripts/checkpatch.pl
 +++ b/scripts/checkpatch.pl
 @@ -1061,7 +1061,9 @@ sub possible {
 case|
 else|
 asm|__asm__|
 -   do
 +   do|
 +   \#|
 +   \#\#|

Are you sure this line should end with a '|', given it's the
last item in the alternation ?

 )(?:\s|$)|
 ^(?:typedef|struct|enum)\b
 )}x;
 --
 1.9.3


thanks
-- PMM

Re: [Qemu-devel] [PATCH] checkpatch: port fix from kernel ## is not a valid modifier

[Paolo Bonzini]

On 09/02/2015 13:18, Christian Borntraeger wrote:
 From: Andy Whitcroft a...@canonical.com
 
 checkpatch currently loops on fpu/softfloat.c
 Turns out this is fixed in the Linux version of checkpatch.
 
 So this is a port of Andy Whitcrofts fix from Linux,
 Original commit was commit 89a883530fe7 (checkpatch: ## is not a
 valid modifier)

I think you need to send it as a toplevel patch for Peter to pick it up.

Paolo

 Cc: Andy Whitcroft a...@canonical.com
 Signed-off-by: Christian Borntraeger borntrae...@de.ibm.com
 ---
  scripts/checkpatch.pl | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
 index 5df61f9..8635f4c 100755
 --- a/scripts/checkpatch.pl
 +++ b/scripts/checkpatch.pl
 @@ -1061,7 +1061,9 @@ sub possible {
   case|
   else|
   asm|__asm__|
 - do
 + do|
 + \#|
 + \#\#|
   )(?:\s|$)|
   ^(?:typedef|struct|enum)\b
   )}x;
 

[Qemu-devel] [PATCH] checkpatch: port fix from kernel ## is not a valid modifier

[Christian Borntraeger]

From: Andy Whitcroft a...@canonical.com

checkpatch currently loops on fpu/softfloat.c
Turns out this is fixed in the Linux version of checkpatch.

So this is a port of Andy Whitcrofts fix from Linux,
Original commit was commit 89a883530fe7 (checkpatch: ## is not a
valid modifier)

Cc: Andy Whitcroft a...@canonical.com
Signed-off-by: Christian Borntraeger borntrae...@de.ibm.com
---
 scripts/checkpatch.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 5df61f9..8635f4c 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1061,7 +1061,9 @@ sub possible {
case|
else|
asm|__asm__|
-   do
+   do|
+   \#|
+   \#\#|
)(?:\s|$)|
^(?:typedef|struct|enum)\b
)}x;
-- 
1.9.3