diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2013-12-06 12:52:50 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-12-06 12:52:50 -0800 |
| commit | 783eb67e7a125eaf226e5ea4f5df97c1ea42311e (patch) | |
| tree | 1c0ca834d9097a7f889385166d4eefc49a7de0af /trace-events | |
| parent | 7dc65c02fe3fb8f3146ce0b9ff5fec5945329f0e (diff) | |
| parent | 6fedcaa1c5419fa89c31fd34dabbd71861c615d2 (diff) | |
| download | qemu-783eb67e7a125eaf226e5ea4f5df97c1ea42311e.tar.gz | |
Merge remote-tracking branch 'mjt/trivial-patches' into staging
# By Stefan Weil (9) and others
# Via Michael Tokarev
* mjt/trivial-patches:
eeprom93xx: fix coding style
hw/ppc/mac.h: remove unused BIOS_FILENAME definition
Don't crash on keyboard input with no handler
libcacard/vcard_emul_nss: Remove unused statement (value stored is never read)
libcacard/cac: Remove unused statement (value stored is never read)
virtio-net: fix the indent
misc: Replace 'struct QEMUTimer' by 'QEMUTimer'
qobject: Fix compiler warning (missing gnu_printf format attribute)
acpi-build: Fix compiler warning (missing gnu_printf format attribute)
.gitignore: Ignore config.status
gtk: Replace conditional debug messages by trace methods
console: Replace conditional debug messages by trace methods
trace: Remove trace.h from hw/usb/hcd-ehci.h (less dependencies)
trace: Remove trace.h from console.h (less dependencies)
Message-id: 1385408466-13183-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'trace-events')
| -rw-r--r-- | trace-events | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/trace-events b/trace-events index 8695e9e5b7..bc6788f105 100644 --- a/trace-events +++ b/trace-events @@ -1010,6 +1010,8 @@ dma_map_wait(void *dbs) "dbs=%p" # ui/console.c console_gfx_new(void) "" +console_putchar_csi(int esc_param0, int esc_param1, int ch, int nb_esc_params) "escape sequence CSI%d;%d%c, %d parameters" +console_putchar_unhandled(int ch) "unhandled escape character '%c'" console_txt_new(int w, int h) "%dx%d" console_select(int nr) "%d" console_refresh(int interval) "interval %d ms" @@ -1020,6 +1022,11 @@ displaychangelistener_register(void *dcl, const char *name) "%p [ %s ]" displaychangelistener_unregister(void *dcl, const char *name) "%p [ %s ]" ppm_save(const char *filename, void *display_surface) "%s surface=%p" +# ui/gtk.c +gd_switch(int width, int height) "width=%d, height=%d" +gd_update(int x, int y, int w, int h) "x=%d, y=%d, w=%d, h=%d" +gd_key_event(int gdk_keycode, int qemu_keycode, const char *action) "translated GDK keycode %d to QEMU keycode %d (%s)" + # hw/display/vmware_vga.c vmware_value_read(uint32_t index, uint32_t value) "index %d, value 0x%x" vmware_value_write(uint32_t index, uint32_t value) "index %d, value 0x%x" |