On Tue, Feb 02, 2021 at 10:44:28PM +0000, Peter Maydell wrote:
> On Tue, 2 Feb 2021 at 15:12, Michael S. Tsirkin <mst@redhat.com> wrote:
> >
> > The following changes since commit 9cd69f1a270235b652766f00b94114f48a2d603f:
> >
> > Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2021-01-25-1' into staging (2021-01-26 09:51:02 +0000)
> >
> > are available in the Git repository at:
> >
> > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
> >
> > for you to fetch changes up to 737242ed5be0a7119aad55894148b3f5dec41200:
> >
> > virtio-pmem: add trace events (2021-01-27 08:02:39 -0500)
> >
> > ----------------------------------------------------------------
> > pc,virtio: fixes, features
> >
> > Fixes all over the place.
> > Ability to control ACPI OEM ID's.
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> >
> > ----------------------------------------------------------------
> > Eugenio Pérez (1):
> > virtio: Add corresponding memory_listener_unregister to unrealize
> >
> > Laurent Vivier (1):
> > virtio-mmio: fix guest kernel crash with SHM regions
> >
> > Marian Postevca (5):
> > tests/acpi: allow updates for expected data files
> > acpi: Permit OEM ID and OEM table ID fields to be changed
> > tests/acpi: add OEM ID and OEM TABLE ID test
> > tests/acpi: update expected data files
> > tests/acpi: disallow updates for expected data files
> >
> > Pankaj Gupta (1):
> > virtio-pmem: add trace events
> >
> > Stefano Garzarella (1):
> > virtio: move 'use-disabled-flag' property to hw_compat_4_2
>
> Fails to build, aarch64:
>
> In file included from /usr/include/string.h:495,
> from /home/pm/qemu/include/qemu/osdep.h:87,
> from ../../hw/arm/virt.c:31:
> In function ‘strncpy’,
> inlined from ‘virt_set_oem_table_id’ at ../../hw/arm/virt.c:2197:5:
> /usr/include/aarch64-linux-gnu/bits/string_fortified.h:106:10: error:
> ‘__builtin_strncpy’ specified bound depends on the length of the
> source argument [-Werror=stringop-overflow=]
> 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ../../hw/arm/virt.c: In function ‘virt_set_oem_table_id’:
> ../../hw/arm/virt.c:2190:18: note: length computed here
> 2190 | size_t len = strlen(value);
> | ^~~~~~~~~~~~~
> In file included from /usr/include/string.h:495,
> from /home/pm/qemu/include/qemu/osdep.h:87,
> from ../../hw/arm/virt.c:31:
> In function ‘strncpy’,
> inlined from ‘virt_set_oem_id’ at ../../hw/arm/virt.c:2176:5:
> /usr/include/aarch64-linux-gnu/bits/string_fortified.h:106:10: error:
> ‘__builtin_strncpy’ specified bound depends on the length of the
> source argument [-Werror=stringop-overflow=]
> 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ../../hw/arm/virt.c: In function ‘virt_set_oem_id’:
> ../../hw/arm/virt.c:2168:18: note: length computed here
> 2168 | size_t len = strlen(value);
> | ^~~~~~~~~~~~~
>
I added a fixup on top, and pushed.
> Also iotest 030 failed on openbsd, which might be an intermittent rather
> than anything to do with this patchset:
>
> TEST iotest-qcow2: 030 [fail]
> QEMU --
> "/home/qemu/qemu-test.vl8fUt/build/tests/qemu-iotests/../../qemu-system-aarch64"
> -nodefaults -di
> splay none -accel qtest -machine virt
> QEMU_IMG --
> "/home/qemu/qemu-test.vl8fUt/build/tests/qemu-iotests/../../qemu-img"
> QEMU_IO --
> "/home/qemu/qemu-test.vl8fUt/build/tests/qemu-iotests/../../qemu-io"
> --cache writeback --aio thr
> eads -f qcow2
> QEMU_NBD --
> "/home/qemu/qemu-test.vl8fUt/build/tests/qemu-iotests/../../qemu-nbd"
> IMGFMT -- qcow2
> IMGPROTO -- file
> PLATFORM -- OpenBSD/amd64 openbsd.localnet 6.8
> TEST_DIR -- /home/qemu/qemu-test.vl8fUt/build/tests/qemu-iotests/scratch
> SOCK_DIR -- /tmp/tmpu4236zgh
> SOCKET_SCM_HELPER --
> --- /home/qemu/qemu-test.vl8fUt/src/tests/qemu-iotests/030.out
> +++ 030.out.bad
> @@ -1,5 +1,17 @@
> -...........................
> +.........F.................
> +======================================================================
> fcntl(): Invalid argument
> +FAIL: test_overlapping_5 (__main__.TestParallelOps)
> +----------------------------------------------------------------------
> +Traceback (most recent call last):
> + File "/home/qemu/qemu-test.vl8fUt/src/tests/qemu-iotests/030", line
> 424, in test_overlapping_5
> + self.assert_qmp(result, 'return', {})
> + File "/home/qemu/qemu-test.vl8fUt/src/tests/qemu-iotests/iotests.py",
> line 925, in assert_qmp
> + result = self.dictpath(d, path)
> + File "/home/qemu/qemu-test.vl8fUt/src/tests/qemu-iotests/iotests.py",
> line 899, in dictpath
> + self.fail(f'failed path traversal for "{path}" in "{d}"')
> +AssertionError: failed path traversal for "return" in "{'error':
> {'class': 'DeviceNotActive', 'desc': "Block job
> 'drive0' not found"}}"
> +
> ----------------------------------------------------------------------
> Ran 27 tests
Can not see how it can be related ATM.
> -OK
> +FAILED (failures=1, skipped=1)
>
> -- PMM