Merge remote branch 'spice/spice.v29.pull' into staging

Conflicts:
	trace-events

diff --cc Makefile.objs
Simple merge

diff --cc configure
Simple merge

diff --cc hmp-commands.hx
Simple merge

diff --cc monitor.c
Simple merge

diff --cc qmp-commands.hx
Simple merge

diff --cc trace-events
index c75a7a9,ed754f5..e6138ea
--- 1/trace-events
--- 2/trace-events
+++ b/trace-events
@@@ -225,26 -225,8 +225,32 @@@ disable qed_aio_write_prefill(void *s, 
  disable qed_aio_write_postfill(void *s, void *acb, uint64_t start, size_t len, uint64_t offset) "s %p acb %p start %"PRIu64" len %zu offset %"PRIu64""
  disable qed_aio_write_main(void *s, void *acb, int ret, uint64_t offset, size_t len) "s %p acb %p ret %d offset %"PRIu64" len %zu"
  
 +# hw/grlib_gptimer.c
 +disable grlib_gptimer_enable(int id, uint32_t count) "timer:%d set count 0x%x and run"
 +disable grlib_gptimer_disabled(int id, uint32_t config) "timer:%d Timer disable config 0x%x"
 +disable grlib_gptimer_restart(int id, uint32_t reload) "timer:%d reload val: 0x%x"
 +disable grlib_gptimer_set_scaler(uint32_t scaler, uint32_t freq) "scaler:0x%x freq: 0x%x"
 +disable grlib_gptimer_hit(int id) "timer:%d HIT"
 +disable grlib_gptimer_readl(int id, const char *s, uint32_t val) "timer:%d %s 0x%x"
 +disable grlib_gptimer_writel(int id, const char *s, uint32_t val) "timer:%d %s 0x%x"
 +disable grlib_gptimer_unknown_register(const char *op, uint64_t val) "%s unknown register 0x%"PRIx64""
 +
 +# hw/grlib_irqmp.c
 +disable grlib_irqmp_check_irqs(uint32_t pend, uint32_t force, uint32_t mask, uint32_t lvl1, uint32_t lvl2) "pend:0x%04x force:0x%04x mask:0x%04x lvl1:0x%04x lvl0:0x%04x\n"
 +disable grlib_irqmp_ack(int intno) "interrupt:%d"
 +disable grlib_irqmp_set_irq(int irq) "Raise CPU IRQ %d"
 +disable grlib_irqmp_unknown_register(const char *op, uint64_t val) "%s unknown register 0x%"PRIx64""
 +
 +# hw/grlib_apbuart.c
 +disable grlib_apbuart_event(int event) "event:%d"
 +disable grlib_apbuart_unknown_register(const char *op, uint64_t val) "%s unknown register 0x%"PRIx64""
 +
 +# hw/leon3.c
 +disable leon3_set_irq(int intno) "Set CPU IRQ %d"
 +disable leon3_reset_irq(int intno) "Reset CPU IRQ %d"
++
+ # spice-qemu-char.c
+ disable spice_vmc_write(ssize_t out, int len) "spice wrottn %lu of requested %zd"
+ disable spice_vmc_read(int bytes, int len) "spice read %lu of requested %zd"
+ disable spice_vmc_register_interface(void *scd) "spice vmc registered interface %p"
+ disable spice_vmc_unregister_interface(void *scd) "spice vmc unregistered interface %p"