On 2020-06-26 at 19:26 CEST, Daniel P. Berrangé wrote...
> On Fri, Jun 26, 2020 at 06:43:05PM +0200, Christophe de Dinechin wrote:
>> Instead of adding the spice build flags to the top-level build
>> options, add them where they are necessary. This is a step to move the
>> burden of linking with spice libraries away from the top-level qemu.
>>
>> Signed-off-by: Christophe de Dinechin <dinec...@redhat.com>
>> ---
>> configure | 4 ++--
>> hw/display/Makefile.objs | 1 +
>> hw/i386/Makefile.objs | 1 +
>> monitor/Makefile.objs | 3 +++
>> softmmu/Makefile.objs | 2 +-
>> stubs/Makefile.objs | 2 +-
>> ui/Makefile.objs | 4 ++--
>> util/module.c | 13 +++++++++++--
>> 8 files changed, 22 insertions(+), 8 deletions(-)
>
>> diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
>> index f32b9e47a3..1df8bb3814 100644
>> --- a/stubs/Makefile.objs
>> +++ b/stubs/Makefile.objs
>> @@ -19,10 +19,10 @@ stub-obj-y += replay.o
>> stub-obj-y += runstate-check.o
>> stub-obj-$(CONFIG_SOFTMMU) += semihost.o
>> stub-obj-y += set-fd-handler.o
>> -stub-obj-y += vmgenid.o
>> stub-obj-y += sysbus.o
>> stub-obj-y += tpm.o
>> stub-obj-y += trace-control.o
>> +stub-obj-y += vmgenid.o
>> stub-obj-y += vmstate.o
>> stub-obj-$(CONFIG_SOFTMMU) += win32-kbd-hook.o
>>
>
> This looks unrelated to this series.
I'll send a separate trivial patch to fix the alphabetical ordering.
I used to have a spice.c stub here, which conflicted every time. This is how
I noticed the alphabetical order was not respected here.
>
>
>
>> diff --git a/util/module.c b/util/module.c
>> index 2fa93561fe..29b4806520 100644
>> --- a/util/module.c
>> +++ b/util/module.c
>> @@ -22,11 +22,11 @@
>> #ifdef CONFIG_MODULE_UPGRADES
>> #include "qemu-version.h"
>> #endif
>> -#ifdef CONFIG_TRACE_RECORDER
>> #include "trace/recorder.h"
>> -#endif
>>
>>
>> +RECORDER(modules, 16, "QEMU load modules");
>> +
>> typedef struct ModuleEntry
>> {
>> void (*init)(void);
>> @@ -85,6 +85,15 @@ void register_dso_module_init(void (*fn)(void),
>> module_init_type type)
>> {
>> ModuleEntry *e;
>>
>> +#ifdef CONFIG_TRACE_RECORDER
>> + static const char *name[] = {
>> + "MIGRATION", "BLOCK", "OPTS", "QOM",
>> + "TRACE", "XEN_BACKEND", "LIBQOS", "FUZZ_TARGET",
>> + "MAX"
>> + };
>> +#endif
>> + record(modules, "Register DSO module init %p type %u %+s",
>> + fn, type, name[type]);
>> init_lists();
>
> This looks unrelated too, but in general debugging should go via QEMU's
> standard trace backends.
>
Yes. I apparently botched a fixup. That was supposed to be a private patch
for my own use.
--
Cheers,
Christophe de Dinechin (IRC c3d)
