motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 16:53:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'trivial-patches' of git://github.com/stefanha/qemu

Browse source 
* '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
This commit is contained in:
Blue Swirl 2012-11-03 12:55:05 +00:00
commit ef84755ebb
21 changed files with 66 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ui/vnc.c
View file

@ -481,12 +481,12 @@ void buffer_reserve(Buffer *buffer, size_t len)
}
}
int buffer_empty(Buffer *buffer)
static int buffer_empty(Buffer *buffer)
{
return buffer->offset == 0;
}
uint8_t *buffer_end(Buffer *buffer)
static uint8_t *buffer_end(Buffer *buffer)
{
return buffer->buffer + buffer->offset;
}
@ -1373,17 +1373,17 @@ void vnc_flush(VncState *vs)
vnc_unlock_output(vs);
}
uint8_t read_u8(uint8_t *data, size_t offset)
static uint8_t read_u8(uint8_t *data, size_t offset)
{
return data[offset];
}
uint16_t read_u16(uint8_t *data, size_t offset)
static uint16_t read_u16(uint8_t *data, size_t offset)
{
return ((data[offset] & 0xFF) << 8) | (data[offset + 1] & 0xFF);
}
int32_t read_s32(uint8_t *data, size_t offset)
static int32_t read_s32(uint8_t *data, size_t offset)
{
return (int32_t)((data[offset] << 24) | (data[offset + 1] << 16) |
(data[offset + 2] << 8) | data[offset + 3]);
@ -2774,7 +2774,7 @@ void vnc_display_init(DisplayState *ds)
}
void vnc_display_close(DisplayState *ds)
static void vnc_display_close(DisplayState *ds)
{
VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;
@ -2796,7 +2796,7 @@ void vnc_display_close(DisplayState *ds)
#endif
}
int vnc_display_disable_login(DisplayState *ds)
static int vnc_display_disable_login(DisplayState *ds)
{
VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;