diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-02-01 15:22:48 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-02-01 15:22:48 -0600 |
| commit | 9363ee31ab53fc0fd39fbe5936d9c00a2f4e54a4 (patch) | |
| tree | 77c55ab45310cbeced2a05e1f85a109bf2efd481 /trace-events | |
| parent | cfb41c82ab9c468e599d3603ffcebeb81b6577ca (diff) | |
| parent | cbcc6336ce9e5c048821b136649712e078c4d05f (diff) | |
| download | qemu-9363ee31ab53fc0fd39fbe5936d9c00a2f4e54a4.zip qemu-9363ee31ab53fc0fd39fbe5936d9c00a2f4e54a4.tar.gz qemu-9363ee31ab53fc0fd39fbe5936d9c00a2f4e54a4.tar.bz2 | |
Merge remote branch 'spice/spice.v29.pull' into staging
Conflicts:
trace-events
Diffstat (limited to 'trace-events')
| -rw-r--r-- | trace-events | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/trace-events b/trace-events index c75a7a9..e6138ea 100644 --- a/trace-events +++ b/trace-events @@ -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" |