[Qemu-commits] [qemu/qemu] 407d22: nvme: fix NSSRS offset in CAP register

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 407d22eb5b5f9eeb75e450ef52c84e202b170838
      
https://github.com/qemu/qemu/commit/407d22eb5b5f9eeb75e450ef52c84e202b170838
  Author: Klaus Jensen <address@hidden>
  Date:   2019-11-04 (Mon, 04 Nov 2019)

  Changed paths:
    M include/block/nvme.h

  Log Message:
  -----------
  nvme: fix NSSRS offset in CAP register

Fix the offset of the NSSRS field the CAP register.

>From NVME 1.4, section 3 ("Controller Registers"), subsection 3.1.1
("Offset 0h: CAP – Controller Capabilities") CAP_NSSRS_SHIFT is bit 36,
not 33.

Signed-off-by: Klaus Jensen <address@hidden>
Reported-by: Javier Gonzalez <address@hidden>
Message-id: address@hidden
Reviewed-by: John Snow <address@hidden>
[mreitz: Added John's note on the location in the specification where
         this information can be found]
Signed-off-by: Max Reitz <address@hidden>


  Commit: dcfbece68441bfbe6803de60ab5a8045196094b4
      
https://github.com/qemu/qemu/commit/dcfbece68441bfbe6803de60ab5a8045196094b4
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2019-11-04 (Mon, 04 Nov 2019)

  Changed paths:
    M block/block-copy.c

  Log Message:
  -----------
  block/block-copy: fix s->copy_size for compressed cluster

0e2402452f1f20429 allowed writes larger than cluster, but that's
unsupported for compressed write. Fix it.

Fixes: 0e2402452f1f20429
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>


  Commit: 304d9d7f034ff7f5e1e66a65b7f720f63a72c57e
      
https://github.com/qemu/qemu/commit/304d9d7f034ff7f5e1e66a65b7f720f63a72c57e
  Author: Max Reitz <address@hidden>
  Date:   2019-11-04 (Mon, 04 Nov 2019)

  Changed paths:
    M block/io.c
    M include/block/block_int.h

  Log Message:
  -----------
  block: Make wait/mark serialising requests public

Make both bdrv_mark_request_serialising() and
bdrv_wait_serialising_requests() public so they can be used from block
drivers.

Cc: address@hidden
Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>


  Commit: c28107e9e55b11cd35cf3dc2505e3e69d10dcf13
      
https://github.com/qemu/qemu/commit/c28107e9e55b11cd35cf3dc2505e3e69d10dcf13
  Author: Max Reitz <address@hidden>
  Date:   2019-11-04 (Mon, 04 Nov 2019)

  Changed paths:
    M block/io.c
    M include/block/block_int.h

  Log Message:
  -----------
  block: Add bdrv_co_get_self_request()

Cc: address@hidden
Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>


  Commit: 292d06b925b2787ee6f2430996b95651cae42fce
      
https://github.com/qemu/qemu/commit/292d06b925b2787ee6f2430996b95651cae42fce
  Author: Max Reitz <address@hidden>
  Date:   2019-11-04 (Mon, 04 Nov 2019)

  Changed paths:
    M block/file-posix.c

  Log Message:
  -----------
  block/file-posix: Let post-EOF fallocate serialize

The XFS kernel driver has a bug that may cause data corruption for qcow2
images as of qemu commit c8bb23cbdbe32f.  We can work around it by
treating post-EOF fallocates as serializing up until infinity (INT64_MAX
in practice).

Cc: address@hidden
Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>


  Commit: e9102eb84dbc82ffe4bfb379a5ae233a967a900b
      
https://github.com/qemu/qemu/commit/e9102eb84dbc82ffe4bfb379a5ae233a967a900b
  Author: Peter Maydell <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M block/block-copy.c
    M block/file-posix.c
    M block/io.c
    M include/block/block_int.h
    M include/block/nvme.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2019-11-04' 
into staging

Block patches for 4.2-rc0:
- Work around XFS write-zeroes bug in file-posix block driver
- Fix backup job with compression
- Fix to the NVMe block driver header

# gpg: Signature made Mon 04 Nov 2019 09:01:16 GMT
# gpg:                using RSA key 91BEB60A30DB3E8857D11829F407DB0061D5CF40
# gpg:                issuer "address@hidden"
# gpg: Good signature from "Max Reitz <address@hidden>" [full]
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* remotes/maxreitz/tags/pull-block-2019-11-04:
  block/file-posix: Let post-EOF fallocate serialize
  block: Add bdrv_co_get_self_request()
  block: Make wait/mark serialising requests public
  block/block-copy: fix s->copy_size for compressed cluster
  nvme: fix NSSRS offset in CAP register

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/412fbef3d076...e9102eb84dbc