On Mon, May 26, 2025 at 08:09:13AM +0200, Markus Armbruster wrote:
> Fabiano Rosas <faro...@suse.de> writes:
>
> > Commit 407bc4bf90 ("qapi: Move include/qapi/qmp/ to include/qobject/")
> > brought the migration-helpers.c back by mistake. This file has been
> > replaced with migration/migration-qmp.c and
> > migration/migration-util.c.
> >
> > Fixes: 407bc4bf90 ("qapi: Move include/qapi/qmp/ to include/qobject/")
> > Signed-off-by: Fabiano Rosas <faro...@suse.de>
>
> I have no idea how that happened. Rebase accident, perhaps? Thanks for
> cleaning up the mess I made!
>
> Your patch does what it says on the tin, but there's another dangling
> #include:
>
> $ git-grep migration-helpers
> --> tests/qtest/dbus-vmstate-test.c:#include "migration-helpers.h"
> tests/qtest/migration-helpers.c:#include "migration-helpers.h"
>
> Missed in commit b7d7f723a985 (tests/qtest/migration: Rename
> migration-helpers.c). Looks like dbus-vmstate-test is never compiled in
> CI. Dig, dig...
>
> dbus_daemon = find_program('dbus-daemon', required: false)
> if dbus_daemon.found() and gdbus_codegen.found()
> # Temporarily disabled due to Patchew failures:
> --> #qtests_i386 += ['dbus-vmstate-test']
> dbus_vmstate1 = custom_target('dbus-vmstate description',
> output: ['dbus-vmstate1.h',
> 'dbus-vmstate1.c'],
> input: meson.project_source_root() /
> 'backends/dbus-vmstate1.xml',
> command: [gdbus_codegen, '@INPUT@',
> '--interface-prefix',
> 'org.qemu',
> '--generate-c-code',
> '@BASENAME@']).to_list()
> else
> dbus_vmstate1 = []
> endif
>
> It's been "emporarily" disabled for more than five years:
>
> commit d46f81cb746d18b4530b5fe63e75b11f6b926f1f
> Author: Peter Maydell <peter.mayd...@linaro.org>
> Date: Tue Mar 10 15:21:41 2020 +0000
>
> tests: Disable dbus-vmstate-test
>
> The dbus-vmstate-test has been failing in some Patchew configs
> since about the 6th March:
>
> dbus-daemon[9321]: Could not get password database information for UID
> of current process: User "???" unknown or no memory to allocate password entry
>
> **
>
> ERROR:/tmp/qemu-test/src/tests/qtest/dbus-vmstate-test.c:114:get_connection:
> assertion failed (err == NULL): The connection is closed (g-io-error-quark,
> 18)
> cleaning up pid 9321
> ERROR - Bail out!
> ERROR:/tmp/qemu-test/src/tests/qtest/dbus-vmstate-test.c:114:get_connection:
> assertion failed (err == NULL): The connection is closed (g-io-error-quark,
> 18)
> make: *** [/tmp/qemu-test/src/tests/Makefile.include:632:
> check-qtest-x86_64] Error 1
> make: *** Waiting for unfinished jobs....
>
> It's not clear why this is happening (perhaps a recently revealed
> race condition or a change in the patchew build environment?).
>
> For the moment, disable this test so that patchew test runs are
> useful and don't email the list with spurious failure mails.
>
> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
> Message-id: 20200310152141.13959-1-peter.mayd...@linaro.org
>
> Separate issue, so for this patch
> Reviewed-by: Markus Armbruster <arm...@redhat.com>
Thanks both! I queued this one for now.
Then it's a matter of whether we want to fix the build only, or fix the
test.. Also add Marc-André into the loop, in case we'd like to go the
latter..
--
Peter Xu
