Re: [PATCH] trivial: Remove trailing whitespaces

2020-07-08 Thread Markus Armbruster
Daniel P. Berrangé  writes:

> On Mon, Jul 06, 2020 at 06:23:00PM +0200, Christophe de Dinechin wrote:
>> There are a number of unnecessary trailing whitespaces that have
>> accumulated over time in the source code. They cause stray changes
>> in patches if you use tools that automatically remove them.
>> 
>> Tested by doing a `git diff -w` after the change.
>> 
>> This could probably be turned into a pre-commit hook.

See .git/hooks/pre-commit.sample.

Expected test output is prone to flunk the whitespace test.  One
solution is to strip trailing whitespace from test output.

> scripts/checkpatch.pl ought to be made to check it.
>
>> 
>> Signed-off-by: Christophe de Dinechin 
>> ---
[...]
>>  78 files changed, 440 insertions(+), 440 deletions(-)
>
> The cleanup is a good idea, however, I think it is probably better to
> split the patch approx into subsystems. That will make it much easier
> to cherry-pick for people doing backports.

I doubt that's worth the trouble.

Acked-by: Markus Armbruster 




Re: [PATCH] trivial: Remove trailing whitespaces

2020-07-08 Thread Daniel P . Berrangé
On Mon, Jul 06, 2020 at 09:31:21AM -0700, no-re...@patchew.org wrote:
> Patchew URL: 
> https://patchew.org/QEMU/20200706162300.1084753-1-dinec...@redhat.com/
> 
> 
> 
> Hi,
> 
> This series seems to have some coding style problems. See output below for
> more information:
> 
> Subject: [PATCH] trivial: Remove trailing whitespaces
> Type: series
> Message-id: 20200706162300.1084753-1-dinec...@redhat.com
> 
> === TEST SCRIPT BEGIN ===
> #!/bin/bash
> git rev-parse base > /dev/null || exit 0
> git config --local diff.renamelimit 0
> git config --local diff.renames True
> git config --local diff.algorithm histogram
> ./scripts/checkpatch.pl --mailback base..
> === TEST SCRIPT END ===
> 
> From https://github.com/patchew-project/qemu
>  * [new tag] patchew/20200706162300.1084753-1-dinec...@redhat.com -> 
> patchew/20200706162300.1084753-1-dinec...@redhat.com
> Switched to a new branch 'test'
> 9af3e90 trivial: Remove trailing whitespaces
> 
> === OUTPUT BEGIN ===

snip

> ERROR: trailing whitespace
> #2395: FILE: target/sh4/op_helper.c:149:
> +^I$

One case of trailing whitespace missed.


Regards,
Daniel
-- 
|: https://berrange.com  -o-https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-https://fstop138.berrange.com :|
|: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|




Re: [PATCH] trivial: Remove trailing whitespaces

2020-07-08 Thread Roman Bolshakov
On Mon, Jul 06, 2020 at 06:23:00PM +0200, Christophe de Dinechin wrote:
> There are a number of unnecessary trailing whitespaces that have
> accumulated over time in the source code. They cause stray changes
> in patches if you use tools that automatically remove them.
> 
> Tested by doing a `git diff -w` after the change.
> 
> This could probably be turned into a pre-commit hook.
> 

For HVF bits,

Reviewed-by: Roman Bolshakov 

Thanks,
Roman



Re: [PATCH] trivial: Remove trailing whitespaces

2020-07-07 Thread Daniel P . Berrangé
On Mon, Jul 06, 2020 at 06:23:00PM +0200, Christophe de Dinechin wrote:
> There are a number of unnecessary trailing whitespaces that have
> accumulated over time in the source code. They cause stray changes
> in patches if you use tools that automatically remove them.
> 
> Tested by doing a `git diff -w` after the change.
> 
> This could probably be turned into a pre-commit hook.

scripts/checkpatch.pl ought to be made to check it.

> 
> Signed-off-by: Christophe de Dinechin 
> ---
>  block/iscsi.c |   2 +-
>  disas/cris.c  |   2 +-
>  disas/microblaze.c|  80 +++---
>  disas/nios2.c | 256 +-
>  hmp-commands.hx   |   2 +-
>  hw/alpha/typhoon.c|   6 +-
>  hw/arm/gumstix.c  |   6 +-
>  hw/arm/omap1.c|   2 +-
>  hw/arm/stellaris.c|   2 +-
>  hw/char/etraxfs_ser.c |   2 +-
>  hw/core/ptimer.c  |   2 +-
>  hw/cris/axis_dev88.c  |   2 +-
>  hw/cris/boot.c|   2 +-
>  hw/display/qxl.c  |   2 +-
>  hw/dma/etraxfs_dma.c  |  18 +-
>  hw/dma/i82374.c   |   2 +-
>  hw/i2c/bitbang_i2c.c  |   2 +-
>  hw/input/tsc2005.c|   2 +-
>  hw/input/tsc210x.c|   2 +-
>  hw/intc/etraxfs_pic.c |   8 +-
>  hw/intc/sh_intc.c |  10 +-
>  hw/intc/xilinx_intc.c |   2 +-
>  hw/misc/imx25_ccm.c   |   6 +-
>  hw/misc/imx31_ccm.c   |   2 +-
>  hw/net/vmxnet3.h  |   2 +-
>  hw/net/xilinx_ethlite.c   |   2 +-
>  hw/pci/pcie.c |   2 +-
>  hw/sd/omap_mmc.c  |   2 +-
>  hw/sh4/shix.c |   2 +-
>  hw/sparc64/sun4u.c|   2 +-
>  hw/timer/etraxfs_timer.c  |   2 +-
>  hw/timer/xilinx_timer.c   |   4 +-
>  hw/usb/hcd-musb.c |  10 +-
>  hw/usb/hcd-ohci.c |   6 +-
>  hw/usb/hcd-uhci.c |   2 +-
>  hw/virtio/virtio-pci.c|   2 +-
>  include/hw/cris/etraxfs_dma.h |   4 +-
>  include/hw/net/lance.h|   2 +-
>  include/hw/ppc/spapr.h|   2 +-
>  include/hw/xen/interface/io/ring.h|  34 +--
>  include/qemu/log.h|   2 +-
>  include/qom/object.h  |   4 +-
>  linux-user/cris/cpu_loop.c|  16 +-
>  linux-user/microblaze/cpu_loop.c  |  16 +-
>  linux-user/mmap.c |   8 +-
>  linux-user/sparc/signal.c |   4 +-
>  linux-user/syscall.c  |  24 +-
>  linux-user/syscall_defs.h |   2 +-
>  linux-user/uaccess.c  |   2 +-
>  os-posix.c|   2 +-
>  qapi/qapi-util.c  |   2 +-
>  qemu-img.c|   2 +-
>  qemu-options.hx   |  26 +-
>  qom/object.c  |   2 +-
>  target/cris/translate.c   |  28 +-
>  target/cris/translate_v10.inc.c   |   6 +-
>  target/i386/hvf/hvf.c |   4 +-
>  target/i386/hvf/x86.c |   4 +-
>  target/i386/hvf/x86_decode.c  |  20 +-
>  target/i386/hvf/x86_decode.h  |   4 +-
>  target/i386/hvf/x86_descr.c   |   2 +-
>  target/i386/hvf/x86_emu.c |   2 +-
>  target/i386/hvf/x86_mmu.c |   6 +-
>  target/i386/hvf/x86_task.c|   2 +-
>  target/i386/hvf/x86hvf.c  |  42 +--
>  target/i386/translate.c   |   8 +-
>  target/microblaze/mmu.c   |   2 +-
>  target/microblaze/translate.c |   2 +-
>  target/sh4/op_helper.c|   4 +-
>  target/xtensa/core-de212/core-isa.h   |   6 +-
>  .../xtensa/core-sample_controller/core-isa.h  |   6 +-
>  target/xtensa/core-test_kc705_be/core-isa.h   |   2 +-
>  tcg/sparc/tcg-target.inc.c|   2 +-
>  tcg/tcg.c |  32 +--
>  tests/tcg/multiarch/test-mmap.c   |  72 ++---
>  ui/curses.c   |   4 +-
>  ui/curses_keys.h  |   4 +-
>  util/cutils.c   

Re: [PATCH] trivial: Remove trailing whitespaces

2020-07-07 Thread Laurent Vivier
Le 06/07/2020 à 18:23, Christophe de Dinechin a écrit :
> There are a number of unnecessary trailing whitespaces that have
> accumulated over time in the source code. They cause stray changes
> in patches if you use tools that automatically remove them.
> 
> Tested by doing a `git diff -w` after the change.
> 
> This could probably be turned into a pre-commit hook.
> 
> Signed-off-by: Christophe de Dinechin 
> ---
>  block/iscsi.c |   2 +-
>  disas/cris.c  |   2 +-
>  disas/microblaze.c|  80 +++---
>  disas/nios2.c | 256 +-
>  hmp-commands.hx   |   2 +-
>  hw/alpha/typhoon.c|   6 +-
>  hw/arm/gumstix.c  |   6 +-
>  hw/arm/omap1.c|   2 +-
>  hw/arm/stellaris.c|   2 +-
>  hw/char/etraxfs_ser.c |   2 +-
>  hw/core/ptimer.c  |   2 +-
>  hw/cris/axis_dev88.c  |   2 +-
>  hw/cris/boot.c|   2 +-
>  hw/display/qxl.c  |   2 +-
>  hw/dma/etraxfs_dma.c  |  18 +-
>  hw/dma/i82374.c   |   2 +-
>  hw/i2c/bitbang_i2c.c  |   2 +-
>  hw/input/tsc2005.c|   2 +-
>  hw/input/tsc210x.c|   2 +-
>  hw/intc/etraxfs_pic.c |   8 +-
>  hw/intc/sh_intc.c |  10 +-
>  hw/intc/xilinx_intc.c |   2 +-
>  hw/misc/imx25_ccm.c   |   6 +-
>  hw/misc/imx31_ccm.c   |   2 +-
>  hw/net/vmxnet3.h  |   2 +-
>  hw/net/xilinx_ethlite.c   |   2 +-
>  hw/pci/pcie.c |   2 +-
>  hw/sd/omap_mmc.c  |   2 +-
>  hw/sh4/shix.c |   2 +-
>  hw/sparc64/sun4u.c|   2 +-
>  hw/timer/etraxfs_timer.c  |   2 +-
>  hw/timer/xilinx_timer.c   |   4 +-
>  hw/usb/hcd-musb.c |  10 +-
>  hw/usb/hcd-ohci.c |   6 +-
>  hw/usb/hcd-uhci.c |   2 +-
>  hw/virtio/virtio-pci.c|   2 +-
>  include/hw/cris/etraxfs_dma.h |   4 +-
>  include/hw/net/lance.h|   2 +-
>  include/hw/ppc/spapr.h|   2 +-
>  include/hw/xen/interface/io/ring.h|  34 +--
>  include/qemu/log.h|   2 +-
>  include/qom/object.h  |   4 +-
>  linux-user/cris/cpu_loop.c|  16 +-
>  linux-user/microblaze/cpu_loop.c  |  16 +-
>  linux-user/mmap.c |   8 +-
>  linux-user/sparc/signal.c |   4 +-
>  linux-user/syscall.c  |  24 +-
>  linux-user/syscall_defs.h |   2 +-
>  linux-user/uaccess.c  |   2 +-
>  os-posix.c|   2 +-
>  qapi/qapi-util.c  |   2 +-
>  qemu-img.c|   2 +-
>  qemu-options.hx   |  26 +-
>  qom/object.c  |   2 +-
>  target/cris/translate.c   |  28 +-
>  target/cris/translate_v10.inc.c   |   6 +-
>  target/i386/hvf/hvf.c |   4 +-
>  target/i386/hvf/x86.c |   4 +-
>  target/i386/hvf/x86_decode.c  |  20 +-
>  target/i386/hvf/x86_decode.h  |   4 +-
>  target/i386/hvf/x86_descr.c   |   2 +-
>  target/i386/hvf/x86_emu.c |   2 +-
>  target/i386/hvf/x86_mmu.c |   6 +-
>  target/i386/hvf/x86_task.c|   2 +-
>  target/i386/hvf/x86hvf.c  |  42 +--
>  target/i386/translate.c   |   8 +-
>  target/microblaze/mmu.c   |   2 +-
>  target/microblaze/translate.c |   2 +-
>  target/sh4/op_helper.c|   4 +-
>  target/xtensa/core-de212/core-isa.h   |   6 +-
>  .../xtensa/core-sample_controller/core-isa.h  |   6 +-
>  target/xtensa/core-test_kc705_be/core-isa.h   |   2 +-
>  tcg/sparc/tcg-target.inc.c|   2 +-
>  tcg/tcg.c |  32 +--
>  tests/tcg/multiarch/test-mmap.c   |  72 ++---
>  ui/curses.c   |   4 +-
>  ui/curses_keys.h  |   4 +-
>  util/cutils.c |   2 +-
>  78 files changed, 440 

Re: [PATCH] trivial: Remove trailing whitespaces

2020-07-07 Thread David Gibson
On Mon, Jul 06, 2020 at 06:23:00PM +0200, Christophe de Dinechin wrote:
> There are a number of unnecessary trailing whitespaces that have
> accumulated over time in the source code. They cause stray changes
> in patches if you use tools that automatically remove them.
> 
> Tested by doing a `git diff -w` after the change.
> 
> This could probably be turned into a pre-commit hook.
> 
> Signed-off-by: Christophe de Dinechin 

ppc parts

Acked-by: David Gibson 

> ---
>  block/iscsi.c |   2 +-
>  disas/cris.c  |   2 +-
>  disas/microblaze.c|  80 +++---
>  disas/nios2.c | 256 +-
>  hmp-commands.hx   |   2 +-
>  hw/alpha/typhoon.c|   6 +-
>  hw/arm/gumstix.c  |   6 +-
>  hw/arm/omap1.c|   2 +-
>  hw/arm/stellaris.c|   2 +-
>  hw/char/etraxfs_ser.c |   2 +-
>  hw/core/ptimer.c  |   2 +-
>  hw/cris/axis_dev88.c  |   2 +-
>  hw/cris/boot.c|   2 +-
>  hw/display/qxl.c  |   2 +-
>  hw/dma/etraxfs_dma.c  |  18 +-
>  hw/dma/i82374.c   |   2 +-
>  hw/i2c/bitbang_i2c.c  |   2 +-
>  hw/input/tsc2005.c|   2 +-
>  hw/input/tsc210x.c|   2 +-
>  hw/intc/etraxfs_pic.c |   8 +-
>  hw/intc/sh_intc.c |  10 +-
>  hw/intc/xilinx_intc.c |   2 +-
>  hw/misc/imx25_ccm.c   |   6 +-
>  hw/misc/imx31_ccm.c   |   2 +-
>  hw/net/vmxnet3.h  |   2 +-
>  hw/net/xilinx_ethlite.c   |   2 +-
>  hw/pci/pcie.c |   2 +-
>  hw/sd/omap_mmc.c  |   2 +-
>  hw/sh4/shix.c |   2 +-
>  hw/sparc64/sun4u.c|   2 +-
>  hw/timer/etraxfs_timer.c  |   2 +-
>  hw/timer/xilinx_timer.c   |   4 +-
>  hw/usb/hcd-musb.c |  10 +-
>  hw/usb/hcd-ohci.c |   6 +-
>  hw/usb/hcd-uhci.c |   2 +-
>  hw/virtio/virtio-pci.c|   2 +-
>  include/hw/cris/etraxfs_dma.h |   4 +-
>  include/hw/net/lance.h|   2 +-
>  include/hw/ppc/spapr.h|   2 +-
>  include/hw/xen/interface/io/ring.h|  34 +--
>  include/qemu/log.h|   2 +-
>  include/qom/object.h  |   4 +-
>  linux-user/cris/cpu_loop.c|  16 +-
>  linux-user/microblaze/cpu_loop.c  |  16 +-
>  linux-user/mmap.c |   8 +-
>  linux-user/sparc/signal.c |   4 +-
>  linux-user/syscall.c  |  24 +-
>  linux-user/syscall_defs.h |   2 +-
>  linux-user/uaccess.c  |   2 +-
>  os-posix.c|   2 +-
>  qapi/qapi-util.c  |   2 +-
>  qemu-img.c|   2 +-
>  qemu-options.hx   |  26 +-
>  qom/object.c  |   2 +-
>  target/cris/translate.c   |  28 +-
>  target/cris/translate_v10.inc.c   |   6 +-
>  target/i386/hvf/hvf.c |   4 +-
>  target/i386/hvf/x86.c |   4 +-
>  target/i386/hvf/x86_decode.c  |  20 +-
>  target/i386/hvf/x86_decode.h  |   4 +-
>  target/i386/hvf/x86_descr.c   |   2 +-
>  target/i386/hvf/x86_emu.c |   2 +-
>  target/i386/hvf/x86_mmu.c |   6 +-
>  target/i386/hvf/x86_task.c|   2 +-
>  target/i386/hvf/x86hvf.c  |  42 +--
>  target/i386/translate.c   |   8 +-
>  target/microblaze/mmu.c   |   2 +-
>  target/microblaze/translate.c |   2 +-
>  target/sh4/op_helper.c|   4 +-
>  target/xtensa/core-de212/core-isa.h   |   6 +-
>  .../xtensa/core-sample_controller/core-isa.h  |   6 +-
>  target/xtensa/core-test_kc705_be/core-isa.h   |   2 +-
>  tcg/sparc/tcg-target.inc.c|   2 +-
>  tcg/tcg.c |  32 +--
>  tests/tcg/multiarch/test-mmap.c   |  72 ++---
>  ui/curses.c   |   4 +-
>  ui/curses_keys.h  |   4 +-
>  util/cutils.c

Re: [PATCH] trivial: Remove trailing whitespaces

2020-07-06 Thread no-reply
Patchew URL: 
https://patchew.org/QEMU/20200706162300.1084753-1-dinec...@redhat.com/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Subject: [PATCH] trivial: Remove trailing whitespaces
Type: series
Message-id: 20200706162300.1084753-1-dinec...@redhat.com

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

From https://github.com/patchew-project/qemu
 * [new tag] patchew/20200706162300.1084753-1-dinec...@redhat.com -> 
patchew/20200706162300.1084753-1-dinec...@redhat.com
Switched to a new branch 'test'
9af3e90 trivial: Remove trailing whitespaces

=== OUTPUT BEGIN ===
WARNING: line over 80 characters
#121: FILE: disas/microblaze.c:112:
+   fcmp_lt, fcmp_eq, fcmp_le, fcmp_gt, fcmp_ne, fcmp_ge, fcmp_un, flt, fint, 
fsqrt,

ERROR: line over 90 characters
#148: FILE: disas/microblaze.c:280:
+  unsigned long bit_sequence; /* all the fixed bits for the op are set and all 
the variable bits (reg names, imm vals) are set to 0 */

ERROR: space prohibited between function name and open parenthesis '('
#289: FILE: disas/microblaze.c:728:
+read_insn_microblaze (bfd_vma memaddr,

ERROR: suspect code indent for conditional statements (2, 6)
#298: FILE: disas/microblaze.c:739:
+  if (status != 0)
 {

ERROR: code indent should never use tabs
#334: FILE: disas/microblaze.c:854:
+^I  /* The non-pc relative instructions are returns, which shouldn't$

WARNING: Block comments use a leading /* on a separate line
#334: FILE: disas/microblaze.c:854:
+ /* The non-pc relative instructions are returns, which shouldn't

ERROR: code indent should never use tabs
#343: FILE: disas/microblaze.c:889:
+^I}$

WARNING: Block comments use a leading /* on a separate line
#365: FILE: disas/nios2.c:99:
+/* This structure holds information for a particular instruction.

ERROR: code indent should never use tabs
#374: FILE: disas/nios2.c:155:
+  const char *args;^I^I/* A string describing the arguments for this$

WARNING: Block comments use a leading /* on a separate line
#374: FILE: disas/nios2.c:155:
+  const char *args;/* A string describing the arguments for this

ERROR: code indent should never use tabs
#377: FILE: disas/nios2.c:157:
+  const char *args_test;^I/* Like args, but with an extra argument for$

WARNING: Block comments use a leading /* on a separate line
#377: FILE: disas/nios2.c:157:
+  const char *args_test;   /* Like args, but with an extra argument for

ERROR: code indent should never use tabs
#380: FILE: disas/nios2.c:159:
+  unsigned long num_args;^I/* The number of arguments the instruction$

WARNING: Block comments use a leading /* on a separate line
#380: FILE: disas/nios2.c:159:
+  unsigned long num_args;  /* The number of arguments the instruction

ERROR: code indent should never use tabs
#386: FILE: disas/nios2.c:164:
+  unsigned long mask;^I^I/* Mask for the opcode field of the$

WARNING: Block comments use a leading /* on a separate line
#386: FILE: disas/nios2.c:164:
+  unsigned long mask;  /* Mask for the opcode field of the

ERROR: code indent should never use tabs
#389: FILE: disas/nios2.c:166:
+  unsigned long pinfo;^I^I/* Is this a real instruction or instruction$

WARNING: Block comments use a leading /* on a separate line
#389: FILE: disas/nios2.c:166:
+  unsigned long pinfo; /* Is this a real instruction or instruction

WARNING: Block comments use a leading /* on a separate line
#392: FILE: disas/nios2.c:168:
+  enum overflow_type overflow_msg;  /* Used to generate informative

WARNING: Block comments use a leading /* on a separate line
#399: FILE: disas/nios2.c:172:
+/* This value is used in the nios2_opcode.pinfo field to indicate that the

WARNING: Block comments use * on subsequent lines
#400: FILE: disas/nios2.c:173:
+/* This value is used in the nios2_opcode.pinfo field to indicate that the
+   instruction is a macro or pseudo-op.  This requires special treatment by

WARNING: line over 80 characters
#549: FILE: disas/nios2.c:284:
+#define GET_IW_CUSTOM_A(W) (((W) >> IW_CUSTOM_A_LSB) & 
IW_CUSTOM_A_UNSHIFTED_MASK)

WARNING: line over 80 characters
#550: FILE: disas/nios2.c:285:
+#define SET_IW_CUSTOM_A(V) (((V) & IW_CUSTOM_A_UNSHIFTED_MASK) << 
IW_CUSTOM_A_LSB)

WARNING: line over 80 characters
#562: FILE: disas/nios2.c:291:
+#define GET_IW_CUSTOM_B(W) (((W) >> IW_CUSTOM_B_LSB) & 
IW_CUSTOM_B_UNSHIFTED_MASK)

WARNING: line over 80 characters
#563: FILE: disas/nios2.c:292:
+#define SET_IW_CUSTOM_B(V) (((V) & IW_CUSTOM_B_UNSHIFTED_MASK) << 
IW_CUSTOM_B_LSB)

WARNING: line over 80 characters
#575: FILE: disas/nios2.c:298:
+#define GET_IW_CUSTOM_C(W) (((W) >> IW_CUSTOM_C_LSB) & 
IW_CUSTOM_C_UNSHIFTED_MASK)

WARNING: line ov

[PATCH] trivial: Remove trailing whitespaces

2020-07-06 Thread Christophe de Dinechin
There are a number of unnecessary trailing whitespaces that have
accumulated over time in the source code. They cause stray changes
in patches if you use tools that automatically remove them.

Tested by doing a `git diff -w` after the change.

This could probably be turned into a pre-commit hook.

Signed-off-by: Christophe de Dinechin 
---
 block/iscsi.c |   2 +-
 disas/cris.c  |   2 +-
 disas/microblaze.c|  80 +++---
 disas/nios2.c | 256 +-
 hmp-commands.hx   |   2 +-
 hw/alpha/typhoon.c|   6 +-
 hw/arm/gumstix.c  |   6 +-
 hw/arm/omap1.c|   2 +-
 hw/arm/stellaris.c|   2 +-
 hw/char/etraxfs_ser.c |   2 +-
 hw/core/ptimer.c  |   2 +-
 hw/cris/axis_dev88.c  |   2 +-
 hw/cris/boot.c|   2 +-
 hw/display/qxl.c  |   2 +-
 hw/dma/etraxfs_dma.c  |  18 +-
 hw/dma/i82374.c   |   2 +-
 hw/i2c/bitbang_i2c.c  |   2 +-
 hw/input/tsc2005.c|   2 +-
 hw/input/tsc210x.c|   2 +-
 hw/intc/etraxfs_pic.c |   8 +-
 hw/intc/sh_intc.c |  10 +-
 hw/intc/xilinx_intc.c |   2 +-
 hw/misc/imx25_ccm.c   |   6 +-
 hw/misc/imx31_ccm.c   |   2 +-
 hw/net/vmxnet3.h  |   2 +-
 hw/net/xilinx_ethlite.c   |   2 +-
 hw/pci/pcie.c |   2 +-
 hw/sd/omap_mmc.c  |   2 +-
 hw/sh4/shix.c |   2 +-
 hw/sparc64/sun4u.c|   2 +-
 hw/timer/etraxfs_timer.c  |   2 +-
 hw/timer/xilinx_timer.c   |   4 +-
 hw/usb/hcd-musb.c |  10 +-
 hw/usb/hcd-ohci.c |   6 +-
 hw/usb/hcd-uhci.c |   2 +-
 hw/virtio/virtio-pci.c|   2 +-
 include/hw/cris/etraxfs_dma.h |   4 +-
 include/hw/net/lance.h|   2 +-
 include/hw/ppc/spapr.h|   2 +-
 include/hw/xen/interface/io/ring.h|  34 +--
 include/qemu/log.h|   2 +-
 include/qom/object.h  |   4 +-
 linux-user/cris/cpu_loop.c|  16 +-
 linux-user/microblaze/cpu_loop.c  |  16 +-
 linux-user/mmap.c |   8 +-
 linux-user/sparc/signal.c |   4 +-
 linux-user/syscall.c  |  24 +-
 linux-user/syscall_defs.h |   2 +-
 linux-user/uaccess.c  |   2 +-
 os-posix.c|   2 +-
 qapi/qapi-util.c  |   2 +-
 qemu-img.c|   2 +-
 qemu-options.hx   |  26 +-
 qom/object.c  |   2 +-
 target/cris/translate.c   |  28 +-
 target/cris/translate_v10.inc.c   |   6 +-
 target/i386/hvf/hvf.c |   4 +-
 target/i386/hvf/x86.c |   4 +-
 target/i386/hvf/x86_decode.c  |  20 +-
 target/i386/hvf/x86_decode.h  |   4 +-
 target/i386/hvf/x86_descr.c   |   2 +-
 target/i386/hvf/x86_emu.c |   2 +-
 target/i386/hvf/x86_mmu.c |   6 +-
 target/i386/hvf/x86_task.c|   2 +-
 target/i386/hvf/x86hvf.c  |  42 +--
 target/i386/translate.c   |   8 +-
 target/microblaze/mmu.c   |   2 +-
 target/microblaze/translate.c |   2 +-
 target/sh4/op_helper.c|   4 +-
 target/xtensa/core-de212/core-isa.h   |   6 +-
 .../xtensa/core-sample_controller/core-isa.h  |   6 +-
 target/xtensa/core-test_kc705_be/core-isa.h   |   2 +-
 tcg/sparc/tcg-target.inc.c|   2 +-
 tcg/tcg.c |  32 +--
 tests/tcg/multiarch/test-mmap.c   |  72 ++---
 ui/curses.c   |   4 +-
 ui/curses_keys.h  |   4 +-
 util/cutils.c |   2 +-
 78 files changed, 440 insertions(+), 440 deletions(-)

diff --git a/block/iscsi.c b/block/iscsi.c
index a8b76979d8..884075f4e1 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -1412,7 +1412,7 @@ static void iscsi_readcapacity_sync(IscsiLun *iscsilun, 
Error