mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 08:43:55 -06:00
Merge remote branch 'spice/spice.v29.pull' into staging
Conflicts: trace-events
This commit is contained in:
commit
9363ee31ab
17 changed files with 391 additions and 80 deletions
|
@ -248,3 +248,9 @@ disable grlib_apbuart_unknown_register(const char *op, uint64_t val) "%s unknown
|
|||
# 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"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue