diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-11-03 12:55:05 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-11-03 12:55:05 +0000 |
| commit | ef84755ebb38b4f5629b24440bb00f1ef5287707 (patch) | |
| tree | c2d74584b5f8c85c4c61ae650e628e08403b69ec /console.h | |
| parent | b76f0d8c2e3eac94bc7fd90a510cb7426b2a2699 (diff) | |
| parent | 0d3cf3b6ff469bba95ae235021a3be232af4068d (diff) | |
| download | qemu-ef84755ebb38b4f5629b24440bb00f1ef5287707.tar.gz | |
Merge branch 'trivial-patches' of git://github.com/stefanha/qemu
* 'trivial-patches' of git://github.com/stefanha/qemu:
pc: Drop redundant test for ROM memory region
exec: make some functions static
target-ppc: make some functions static
ppc: add missing static
vnc: add missing static
vl.c: add missing static
target-sparc: make do_unaligned_access static
m68k: Return semihosting errno values correctly
cadence_uart: More debug information
Conflicts:
target-m68k/m68k-semi.c
Diffstat (limited to 'console.h')
| -rw-r--r-- | console.h | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -424,10 +424,8 @@ void cocoa_display_init(DisplayState *ds, int full_screen); /* vnc.c */ void vnc_display_init(DisplayState *ds); -void vnc_display_close(DisplayState *ds); void vnc_display_open(DisplayState *ds, const char *display, Error **errp); void vnc_display_add_client(DisplayState *ds, int csock, int skipauth); -int vnc_display_disable_login(DisplayState *ds); char *vnc_display_local_addr(DisplayState *ds); #ifdef CONFIG_VNC int vnc_display_password(DisplayState *ds, const char *password); |