On 2018-12-17 20:18, Markus Armbruster wrote: > Thomas Huth <th...@redhat.com> writes: > >> On 2018-12-13 19:43, Markus Armbruster wrote: >>> From: Marc-André Lureau <marcandre.lur...@redhat.com> >>> >>> Add #if defined(CONFIG_REPLICATION) in generated code, and adjust the >>> code accordingly. >>> >>> Made conditional: >>> >>> * xen-set-replication, query-xen-replication-status, >>> xen-colo-do-checkpoint >>> >>> Before the patch, we first register the commands unconditionally in >>> generated code (requires a stub), then conditionally unregister in >>> qmp_unregister_commands_hack(). >>> >>> Afterwards, we register only when CONFIG_REPLICATION. The command >>> fails exactly the same, with CommandNotFound. >>> >>> Improvement, because now query-qmp-schema is accurate, and we're one >>> step closer to killing qmp_unregister_commands_hack(). >>> >>> * enum BlockdevDriver value "replication" in command blockdev-add >>> >>> * BlockdevOptions variant @replication >>> >>> and related structures. >>> >>> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> >>> Reviewed-by: Markus Armbruster <arm...@redhat.com> >>> Message-Id: <20181213123724.4866-23-marcandre.lur...@redhat.com> >>> Signed-off-by: Markus Armbruster <arm...@redhat.com> >>> --- >>> migration/colo.c | 16 ++++------------ >>> monitor.c | 5 ----- >>> qapi/block-core.json | 13 +++++++++---- >>> qapi/migration.json | 12 ++++++++---- >>> 4 files changed, 21 insertions(+), 25 deletions(-) >> >> I think this might have broken compilation with --disable-replication: >> >> https://gitlab.com/huth/qemu/-/jobs/135648240 > > Reproduced. > >> Any ideas how to fix it? > > The problem is fairly obvious, repair less so. Sorry this escaped > review.
This is the second time in 2 months that compilation with --disable-replication broke. So instead of relying on reviews here, I think we should catch this with Patchew / some docker based compilation test instead that configures the build process with everything disabled, e.g.: ./configure --enable-werror --disable-rdma --disable-slirp \ --disable-curl --disable-capstone --disable-live-block-migration \ --disable-glusterfs --disable-replication --disable-coroutine-pool \ --disable-smartcard --disable-guest-agent --disable-curses \ --disable-libxml2 --disable-tpm --disable-qom-cast-debug \ --disable-spice --disable-vhost-vsock --disable-vhost-net \ --disable-vhost-crypto --disable-vhost-user ... (I'm still one of those docker agnostics ... so if someone wants to come up with a patch, I'd be very glad ... otherwise it'll take some time 'til I figured it out how to add a docker based test for this...) Thanks, Thomas