[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 8ba9c4: iotests/210: Fix reference output
|
From: |
Peter Maydell |
|
Subject: |
[Qemu-commits] [qemu/qemu] 8ba9c4: iotests/210: Fix reference output |
|
Date: |
Thu, 31 Dec 2020 15:53:09 -0800 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 8ba9c4d9b088d66aebfcb019f61ddc36fba2db88
https://github.com/qemu/qemu/commit/8ba9c4d9b088d66aebfcb019f61ddc36fba2db88
Author: Max Reitz <mreitz@redhat.com>
Date: 2020-12-18 (Fri, 18 Dec 2020)
Changed paths:
M tests/qemu-iotests/210.out
Log Message:
-----------
iotests/210: Fix reference output
Commit 8b1170012b1 has added a global maximum disk length for the block
layer, so the error message when creating an overly large disk has
changed.
Fixes: 8b1170012b1de6649c66ac1887f4df7e312abf3b
("block: introduce BDRV_MAX_LENGTH")
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20201214175158.299919-1-mreitz@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 9d1cc1d0942b12587c9218661b78fdd7d5e508f4
https://github.com/qemu/qemu/commit/9d1cc1d0942b12587c9218661b78fdd7d5e508f4
Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: 2020-12-18 (Fri, 18 Dec 2020)
Changed paths:
M hw/block/nand.c
Log Message:
-----------
hw/block/nand: Decommission the NAND museum
This is the QEMU equivalent of this Linux commit (but 7 years later):
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f7025a43a9da2
The MTD subsystem has its own small museum of ancient NANDs
in a form of the CONFIG_MTD_NAND_MUSEUM_IDS configuration option.
The museum contains stone age NANDs with 256 bytes pages, as well
as iron age NANDs with 512 bytes per page and up to 8MiB page size.
It is with great sorrow that I inform you that the museum is being
decommissioned. The MTD subsystem is out of budget for Kconfig
options and already has too many of them, and there is a general
kernel trend to simplify the configuration menu.
We remove the stone age exhibits along with closing the museum,
but some of the iron age ones are transferred to the regular NAND
depot. Namely, only those which have unique device IDs are
transferred, and the ones which have conflicting device IDs are
removed.
The machine using this device are:
- axis-dev88
- tosa (via tc6393xb_init)
- spitz based (akita, borzoi, terrier)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201214002620.342384-1-f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 182454dc63c66ff5a29eddd60cc987b6a1b45e7f
https://github.com/qemu/qemu/commit/182454dc63c66ff5a29eddd60cc987b6a1b45e7f
Author: Peter Lieven <pl@kamp.de>
Date: 2020-12-18 (Fri, 18 Dec 2020)
Changed paths:
M block/nfs.c
Log Message:
-----------
block/nfs: fix int overflow in nfs_client_open_qdict
nfs_client_open returns the file size in sectors. This effectively
makes it impossible to open files larger than 1TB.
Fixes: c22a03454544c2a08f1107c5cc8481a5574533d5
Cc: qemu-stable@nongnu.org
Signed-off-by: Peter Lieven <pl@kamp.de>
Message-Id: <20201209121735.16437-1-pl@kamp.de>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 23c02ace3508dba5f781ed9ecfde400e462f3a37
https://github.com/qemu/qemu/commit/23c02ace3508dba5f781ed9ecfde400e462f3a37
Author: Stefan Hajnoczi <stefanha@redhat.com>
Date: 2020-12-18 (Fri, 18 Dec 2020)
Changed paths:
M docs/interop/conf.py
M docs/interop/index.rst
A docs/interop/qemu-storage-daemon-qmp-ref.rst
M docs/meson.build
M storage-daemon/qapi/qapi-schema.json
Log Message:
-----------
docs: generate qemu-storage-daemon-qmp-ref(7) man page
Although individual qemu-storage-daemon QMP commands are identical to
QEMU QMP commands, qemu-storage-daemon only supports a subset of QEMU's
QMP commands. Generate a manual page of just the commands supported by
qemu-storage-daemon so that users know exactly what is available in
qemu-storage-daemon.
Add an h1 heading in storage-daemon/qapi/qapi-schema.json so that
block-core.json is at the h2 heading level.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20201209103802.350848-2-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 1982e1602d15313cd82f225e821c37733ece3404
https://github.com/qemu/qemu/commit/1982e1602d15313cd82f225e821c37733ece3404
Author: Stefan Hajnoczi <stefanha@redhat.com>
Date: 2020-12-18 (Fri, 18 Dec 2020)
Changed paths:
M docs/tools/conf.py
M docs/tools/index.rst
A docs/tools/qemu-storage-daemon.rst
Log Message:
-----------
docs: add qemu-storage-daemon(1) man page
Document the qemu-storage-daemon tool. Most of the command-line options
are identical to their QEMU counterparts. Perhaps Sphinx hxtool
integration could be extended to extract documentation for individual
command-line options so they can be shared. For now the
qemu-storage-daemon simply refers to the qemu(1) man page where the
command-line options are identical.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20201209103802.350848-3-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: c607c7fb88122e7dfa97159bce2237dd7987c558
https://github.com/qemu/qemu/commit/c607c7fb88122e7dfa97159bce2237dd7987c558
Author: Stefan Hajnoczi <stefanha@redhat.com>
Date: 2020-12-18 (Fri, 18 Dec 2020)
Changed paths:
M MAINTAINERS
Log Message:
-----------
MAINTAINERS: add Kevin Wolf as storage daemon maintainer
The MAINTAINERS file was not updated when the storage daemon was merged.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20201209103802.350848-4-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 7ba9646c6044afc715212981b8747e0418198c1d
https://github.com/qemu/qemu/commit/7ba9646c6044afc715212981b8747e0418198c1d
Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Date: 2020-12-18 (Fri, 18 Dec 2020)
Changed paths:
M tests/qemu-iotests/186.out
M tests/qemu-iotests/common.filter
Log Message:
-----------
iotests: make _filter_qom_path more strict
According to original commit, that added this filter (627f607e3dddb2),
the problematic thing in qom path is device[NUMBER], not the whole
path. Seems that tracking the other parts of the path in iotest output
is not bad. Let's make _filter_qom_path stricter.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20201216095205.526235-2-vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 1a35110150e38beea15865f886022fe329028e12
https://github.com/qemu/qemu/commit/1a35110150e38beea15865f886022fe329028e12
Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Date: 2020-12-18 (Fri, 18 Dec 2020)
Changed paths:
M tests/qemu-iotests/172
M tests/qemu-iotests/172.out
Log Message:
-----------
iotests:172: use _filter_qom_path
device[NUMBER] thing in QOM path is not stable and tracking it during
code modifications is not fun. Let's filter it like it's already done
in iotest 186.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20201216095205.526235-3-vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 02df95c4a1746aac168dc70a6d8aec062e3f6250
https://github.com/qemu/qemu/commit/02df95c4a1746aac168dc70a6d8aec062e3f6250
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-12-18 (Fri, 18 Dec 2020)
Changed paths:
M block/vpc.c
Log Message:
-----------
block/vpc: Make vpc_open() read the full dynamic header
The dynamic header's size is 1024 bytes.
vpc_open() reads only the 512 bytes of the dynamic header into buf[].
Works, because it doesn't actually access the second half. However, a
colleague told me that GCC 11 warns:
../block/vpc.c:358:51: error: array subscript 'struct VHDDynDiskHeader[0]'
is partly outside array bounds of 'uint8_t[512]' [-Werror=array-bounds]
Clean up to read the full header.
Rename buf[] to dyndisk_header_buf[] while there.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201217162003.1102738-2-armbru@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: b0ce8cb0e8470b37963d1db7e4baca9c3647b0a1
https://github.com/qemu/qemu/commit/b0ce8cb0e8470b37963d1db7e4baca9c3647b0a1
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-12-18 (Fri, 18 Dec 2020)
Changed paths:
M block/vpc.c
Log Message:
-----------
block/vpc: Don't abuse the footer buffer as BAT sector buffer
create_dynamic_disk() takes a buffer holding the footer as first
argument. It writes out the footer (512 bytes), then reuses the
buffer to initialize and write out the dynamic header (1024 bytes),
then reuses it again to initialize and write out BAT sectors (512).
Works, because the caller passes a buffer that is large enough for all
three purposes. I hate that.
Use a separate buffer for writing out BAT sectors. The next commit
will do the same for the dynamic header.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201217162003.1102738-3-armbru@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: a18dc3a14d8455c0b7673f9c3b6cdc4f10a7dade
https://github.com/qemu/qemu/commit/a18dc3a14d8455c0b7673f9c3b6cdc4f10a7dade
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-12-18 (Fri, 18 Dec 2020)
Changed paths:
M block/vpc.c
Log Message:
-----------
block/vpc: Don't abuse the footer buffer for dynamic header
create_dynamic_disk() takes a buffer holding the footer as first
argument. It writes out the footer (512 bytes), then reuses the
buffer to initialize and write out the dynamic header (1024 bytes).
Works, because the caller passes a buffer that is large enough for
both purposes. I hate that.
Use a separate buffer for the dynamic header, and adjust the caller's
buffer.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201217162003.1102738-4-armbru@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 7550379dedc4e0791ffadc3b18ac202fce51e21c
https://github.com/qemu/qemu/commit/7550379dedc4e0791ffadc3b18ac202fce51e21c
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-12-18 (Fri, 18 Dec 2020)
Changed paths:
M block/vpc.c
Log Message:
-----------
block/vpc: Make vpc_checksum() take void *
Some of the next commits will checksum structs. Change vpc_checksum()
to take void * instead of uint8_t, to save us pointless casts to
uint8_t *.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201217162003.1102738-5-armbru@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: e326f0783ed06ed7360f63c7223424cc1d910406
https://github.com/qemu/qemu/commit/e326f0783ed06ed7360f63c7223424cc1d910406
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-12-18 (Fri, 18 Dec 2020)
Changed paths:
M block/vpc.c
Log Message:
-----------
block/vpc: Pad VHDDynDiskHeader, replace uint8_t[] buffers
Pad VHDDynDiskHeader as specified in the "Virtual Hard Disk Image
Format Specification" version 1.0[*]. Change dynamic disk header
buffers from uint8_t[1024] to VHDDynDiskHeader. Their size remains
the same.
The VHDDynDiskHeader * variables pointing to a VHDDynDiskHeader
variable right next to it are now silly. Eliminate them.
[*]
http://download.microsoft.com/download/f/f/e/ffef50a5-07dd-4cf8-aaa3-442c0673a029/Virtual%20Hard%20Disk%20Format%20Spec_10_18_06.doc
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201217162003.1102738-6-armbru@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 3d6101a3f2c88176b3abfe60b0759a75243d0592
https://github.com/qemu/qemu/commit/3d6101a3f2c88176b3abfe60b0759a75243d0592
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-12-18 (Fri, 18 Dec 2020)
Changed paths:
M block/vpc.c
Log Message:
-----------
block/vpc: Use sizeof() instead of 1024 for dynamic header size
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201217162003.1102738-7-armbru@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 275734e4794bb7a3d73f7517fbd769727f2479af
https://github.com/qemu/qemu/commit/275734e4794bb7a3d73f7517fbd769727f2479af
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-12-18 (Fri, 18 Dec 2020)
Changed paths:
M block/vpc.c
Log Message:
-----------
block/vpc: Pad VHDFooter, replace uint8_t[] buffers
Pad VHDFooter as specified in the "Virtual Hard Disk Image Format
Specification" version 1.0[*]. Change footer buffers from
uint8_t[HEADER_SIZE] to VHDFooter. Their size remains the same.
The VHDFooter * variables pointing to a VHDFooter variable right next
to it are now silly. Eliminate them, and shorten the remaining
variables' names.
Most variables pointing to s->footer are now also silly. Eliminate
them, too.
[*]
http://download.microsoft.com/download/f/f/e/ffef50a5-07dd-4cf8-aaa3-442c0673a029/Virtual%20Hard%20Disk%20Format%20Spec_10_18_06.doc
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201217162003.1102738-8-armbru@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: a3d2761719c0ff35419ad030ef6a8da2101c424f
https://github.com/qemu/qemu/commit/a3d2761719c0ff35419ad030ef6a8da2101c424f
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-12-18 (Fri, 18 Dec 2020)
Changed paths:
M block/vpc.c
Log Message:
-----------
block/vpc: Pass footer buffers as VHDFooter * instead of uint8_t *
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201217162003.1102738-9-armbru@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: be7c5ddd0d80e2d6cf8e3ef12c049851d28d9c26
https://github.com/qemu/qemu/commit/be7c5ddd0d80e2d6cf8e3ef12c049851d28d9c26
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-12-18 (Fri, 18 Dec 2020)
Changed paths:
M block/vpc.c
Log Message:
-----------
block/vpc: Use sizeof() instead of HEADER_SIZE for footer size
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201217162003.1102738-10-armbru@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: c7e48f91653d6ace9dc42ec6b5b627b57d5d49e0
https://github.com/qemu/qemu/commit/c7e48f91653d6ace9dc42ec6b5b627b57d5d49e0
Author: Peter Maydell <peter.maydell@linaro.org>
Date: 2020-12-31 (Thu, 31 Dec 2020)
Changed paths:
M MAINTAINERS
M block/nfs.c
M block/vpc.c
M docs/interop/conf.py
M docs/interop/index.rst
A docs/interop/qemu-storage-daemon-qmp-ref.rst
M docs/meson.build
M docs/tools/conf.py
M docs/tools/index.rst
A docs/tools/qemu-storage-daemon.rst
M hw/block/nand.c
M storage-daemon/qapi/qapi-schema.json
M tests/qemu-iotests/172
M tests/qemu-iotests/172.out
M tests/qemu-iotests/186.out
M tests/qemu-iotests/210.out
M tests/qemu-iotests/common.filter
Log Message:
-----------
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:
- Add qemu-storage-daemon documentation
- hw/block/nand: Decommission the NAND museum
- vpc: Clean up some buffer abuse
- nfs: fix int overflow in nfs_client_open_qdict
- Several iotests fixes
# gpg: Signature made Fri 18 Dec 2020 12:07:30 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:
block/vpc: Use sizeof() instead of HEADER_SIZE for footer size
block/vpc: Pass footer buffers as VHDFooter * instead of uint8_t *
block/vpc: Pad VHDFooter, replace uint8_t[] buffers
block/vpc: Use sizeof() instead of 1024 for dynamic header size
block/vpc: Pad VHDDynDiskHeader, replace uint8_t[] buffers
block/vpc: Make vpc_checksum() take void *
block/vpc: Don't abuse the footer buffer for dynamic header
block/vpc: Don't abuse the footer buffer as BAT sector buffer
block/vpc: Make vpc_open() read the full dynamic header
iotests:172: use _filter_qom_path
iotests: make _filter_qom_path more strict
MAINTAINERS: add Kevin Wolf as storage daemon maintainer
docs: add qemu-storage-daemon(1) man page
docs: generate qemu-storage-daemon-qmp-ref(7) man page
block/nfs: fix int overflow in nfs_client_open_qdict
hw/block/nand: Decommission the NAND museum
iotests/210: Fix reference output
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Compare: https://github.com/qemu/qemu/compare/3fb340ccf5f8...c7e48f91653d