[Qemu-commits] [qemu/qemu] 523f5a: nbd/server.c: Remove unused field

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 523f5a9971c0766aefa2cfe42c4e7c3b54a21da6
      
https://github.com/qemu/qemu/commit/523f5a9971c0766aefa2cfe42c4e7c3b54a21da6
  Author: Nir Soffer <nsoffer@redhat.com>
  Date:   2022-01-28 (Fri, 28 Jan 2022)

  Changed paths:
    M nbd/server.c

  Log Message:
  -----------
  nbd/server.c: Remove unused field

NBDRequestData struct has unused QSIMPLEQ_ENTRY field. It seems that
this field exists since the first git commit and was never used.

Signed-off-by: Nir Soffer <nsoffer@redhat.com>
Message-Id: <20220111194313.581486-1-nsoffer@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Fixes: d9a73806 ("qemu-nbd: introduce NBDRequest", v1.1)
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: 3a8fa0edd18f76e222d983a31e486e76a51348a7
      
https://github.com/qemu/qemu/commit/3a8fa0edd18f76e222d983a31e486e76a51348a7
  Author: Philippe Mathieu-Daude <f4bug@amsat.org>
  Date:   2022-01-28 (Fri, 28 Jan 2022)

  Changed paths:
    M qapi/block-export.json

  Log Message:
  -----------
  qapi/block: Cosmetic change in BlockExportType schema

Fix long line introduced in commit bb01ea73110 ("qapi/block:
Restrict vhost-user-blk to CONFIG_VHOST_USER_BLK_SERVER").

Suggested-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220119121439.214821-1-f4bug@amsat.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: 113b727ce788335cf76f65355d670c9bc130fd75
      
https://github.com/qemu/qemu/commit/113b727ce788335cf76f65355d670c9bc130fd75
  Author: Hanna Reitz <hreitz@redhat.com>
  Date:   2022-01-28 (Fri, 28 Jan 2022)

  Changed paths:
    M block/io.c

  Log Message:
  -----------
  block/io: Update BSC only if want_zero is true

We update the block-status cache whenever we get new information from a
bdrv_co_block_status() call to the block driver.  However, if we have
passed want_zero=false to that call, it may flag areas containing zeroes
as data, and so we would update the block-status cache with wrong
information.

Therefore, we should not update the cache with want_zero=false.

Reported-by: Nir Soffer <nsoffer@redhat.com>
Fixes: 0bc329fbb00 ("block: block-status cache for data regions")
Reviewed-by: Nir Soffer <nsoffer@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220118170000.49423-2-hreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: 6384dd534d742123d26c008d9794b20bc41359d5
      
https://github.com/qemu/qemu/commit/6384dd534d742123d26c008d9794b20bc41359d5
  Author: Hanna Reitz <hreitz@redhat.com>
  Date:   2022-01-28 (Fri, 28 Jan 2022)

  Changed paths:
    A tests/qemu-iotests/tests/block-status-cache
    A tests/qemu-iotests/tests/block-status-cache.out

  Log Message:
  -----------
  iotests/block-status-cache: New test

Add a new test to verify that want_zero=false block-status calls do not
pollute the block-status cache for want_zero=true calls.

We check want_zero=true calls and their results using `qemu-img map`
(over NBD), and want_zero=false calls also using `qemu-img map` over
NBD, but using the qemu:allocation-depth context.

(This test case cannot be integrated into nbd-qemu-allocation, because
that is a qcow2 test, and this is a raw test.)

Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220118170000.49423-3-hreitz@redhat.com>
Reviewed-by: Nir Soffer <nsoffer@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Tested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: bfc3db5cf64ab538d6b3c56eab6423372758b258
      
https://github.com/qemu/qemu/commit/bfc3db5cf64ab538d6b3c56eab6423372758b258
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2022-01-30 (Sun, 30 Jan 2022)

  Changed paths:
    M block/io.c
    M nbd/server.c
    M qapi/block-export.json
    A tests/qemu-iotests/tests/block-status-cache
    A tests/qemu-iotests/tests/block-status-cache.out

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2022-01-28' into 
staging

nbd patches for 2022-01-28

- Hanna Reitz: regression fix for block status caching
- Philippe Mathieu-Daude: documentation formatting
- Nir Soffer: dead code removal

# gpg: Signature made Fri 28 Jan 2022 22:58:50 GMT
# gpg:                using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full]
# gpg:                 aka "Eric Blake (Free Software Programmer) 
<ebb9@byu.net>" [full]
# gpg:                 aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-nbd-2022-01-28:
  iotests/block-status-cache: New test
  block/io: Update BSC only if want_zero is true
  qapi/block: Cosmetic change in BlockExportType schema
  nbd/server.c: Remove unused field

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


Compare: https://github.com/qemu/qemu/compare/d90e6f665d3a...bfc3db5cf64a