[Qemu-commits] [qemu/qemu] 6deb20: char-stdio: Fix QMP default for 'signal'

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 6deb20f6683662a3ff5b5248dea2fd4d1055a628
      
https://github.com/qemu/qemu/commit/6deb20f6683662a3ff5b5248dea2fd4d1055a628
  Author: Kevin Wolf <kwolf@redhat.com>
  Date:   2020-11-17 (Tue, 17 Nov 2020)

  Changed paths:
    M chardev/char-stdio.c
    M qapi/char.json

  Log Message:
  -----------
  char-stdio: Fix QMP default for 'signal'

Commit 02c4bdf1 tried to make signal=on the default for stdio chardevs
except for '-serial mon:stdio', but it forgot about QMP and accidentally
switched the QMP default from true (except for -nographic) to false
(always). The documentation was kept unchanged and still describes the
opposite of the old behaviour (which is an even older documentation
bug).

Fix all of this by making signal=true the default in ChardevStdio and
documenting it as such.

Fixes: 02c4bdf1d2ca8c02a9bae16398f260b5c08d08bf
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20201023101222.250147-2-kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 5aaabf9161c501142558f1837f6f90c94ee15081
      
https://github.com/qemu/qemu/commit/5aaabf9161c501142558f1837f6f90c94ee15081
  Author: Kevin Wolf <kwolf@redhat.com>
  Date:   2020-11-17 (Tue, 17 Nov 2020)

  Changed paths:
    M tests/qemu-iotests/nbd-fault-injector.py

  Log Message:
  -----------
  iotests: Replace deprecated ConfigParser.readfp()

iotest 277 fails on Fedora 33 (Python 3.9) because a deprecation warning
changes the output:

    nbd-fault-injector.py:230: DeprecationWarning: This method will be
    removed in future versions.  Use 'parser.read_file()' instead.

In fact, readfp() has already been deprecated in Python 3.2 and the
replacement has existed since the same version, so we can now
unconditionally switch to read_file().

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20201113100602.15936-1-kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: ece4fa9152ea37c7ebd158af330e3b20e33cf385
      
https://github.com/qemu/qemu/commit/ece4fa9152ea37c7ebd158af330e3b20e33cf385
  Author: Maxim Levitsky <mlevitsk@redhat.com>
  Date:   2020-11-17 (Tue, 17 Nov 2020)

  Changed paths:
    M block/file-posix.c

  Log Message:
  -----------
  file-posix: allow -EBUSY errors during write zeros on raw block devices

On Linux, fallocate(fd, FALLOC_FL_PUNCH_HOLE) when it is used on a block device,
without O_DIRECT can return -EBUSY if it races with another write to the same 
page.

Since this is rare and discard is not a critical operation, ignore this error

Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20201111153913.41840-2-mlevitsk@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: bd89f93603f4e588e80f2e622118bf4131f30865
      
https://github.com/qemu/qemu/commit/bd89f93603f4e588e80f2e622118bf4131f30865
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-11-17 (Tue, 17 Nov 2020)

  Changed paths:
    M block/io_uring.c

  Log Message:
  -----------
  io_uring: do not use pointer after free

Even though only the pointer value is only printed, it is untidy
and Coverity complains.

Cc: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20201113154102.1460459-1-pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 9ca5b0e8427789438f5f8e8b6cc76bc8eb76c941
      
https://github.com/qemu/qemu/commit/9ca5b0e8427789438f5f8e8b6cc76bc8eb76c941
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2020-11-17 (Tue, 17 Nov 2020)

  Changed paths:
    M block/quorum.c

  Log Message:
  -----------
  quorum: Require WRITE perm with rewrite-corrupted

Using rewrite-corrupted means quorum may issue writes to its children
just from receiving read requests from its parents.  Thus, it must take
the WRITE permission when rewrite-corrupted is used.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20201113211718.261671-2-mreitz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 55f2c014d7a4f79bc22dc7f018ef785b5d6baf49
      
https://github.com/qemu/qemu/commit/55f2c014d7a4f79bc22dc7f018ef785b5d6baf49
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2020-11-17 (Tue, 17 Nov 2020)

  Changed paths:
    M tests/qemu-iotests/081

  Log Message:
  -----------
  iotests/081: Filter image format after testdir

Otherwise, this breaks whenever the test directory contains the image
format (e.g. "/tmp/test-raw-file" is filtered to "/tmp/test-IMGFMT-file"
instead of "TEST_DIR").

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20201113211718.261671-3-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: c61c644f59c43017f9577d7f867c48bb9d7a28ad
      
https://github.com/qemu/qemu/commit/c61c644f59c43017f9577d7f867c48bb9d7a28ad
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2020-11-17 (Tue, 17 Nov 2020)

  Changed paths:
    M tests/qemu-iotests/081
    M tests/qemu-iotests/081.out

  Log Message:
  -----------
  iotests/081: Test rewrite-corrupted without WRITE

Test what happens when a rewrite-corrupted quorum node performs such a
rewrite, while there is no parent that has taken the WRITE permission.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20201113211718.261671-4-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: c8e5c4b246584da36694a3c259a7dbb8a7e7b1f3
      
https://github.com/qemu/qemu/commit/c8e5c4b246584da36694a3c259a7dbb8a7e7b1f3
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-11-17 (Tue, 17 Nov 2020)

  Changed paths:
    M block/file-posix.c
    M block/io_uring.c
    M block/quorum.c
    M chardev/char-stdio.c
    M qapi/char.json
    M tests/qemu-iotests/081
    M tests/qemu-iotests/081.out

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Patches for 5.2.0-rc2:

- quorum: Fix crash with rewrite-corrupted and without read-write user
- io_uring: do not use pointer after free
- file-posix: Use fallback path for -EBUSY from FALLOC_FL_PUNCH_HOLE
- iotests: Fix failure on Python 3.9 due to use of a deprecated function
- char-stdio: Fix QMP default for 'signal'

# gpg: Signature made Tue 17 Nov 2020 11:43:17 GMT
# gpg:                using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6
# gpg:                issuer "kwolf@redhat.com"
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  iotests/081: Test rewrite-corrupted without WRITE
  iotests/081: Filter image format after testdir
  quorum: Require WRITE perm with rewrite-corrupted
  io_uring: do not use pointer after free
  file-posix: allow -EBUSY errors during write zeros on raw block devices
  iotests: Replace deprecated ConfigParser.readfp()
  char-stdio: Fix QMP default for 'signal'

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/f45fc83bc0a5...c8e5c4b24658