Commit ef84755e authored by Blue Swirl's avatar Blue Swirl
Browse files

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
parents b76f0d8c 0d3cf3b6

console.h

+0 −2
Original line number Diff line number Diff line
@@ -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);

cpu-common.h

+0 −5
Original line number Diff line number Diff line
@@ -39,10 +39,6 @@ typedef uint32_t CPUReadMemoryFunc(void *opaque, hwaddr addr); 
void qemu_ram_remap(ram_addr_t addr, ram_addr_t length);

/* This should only be used for ram local to a device.  */

void *qemu_get_ram_ptr(ram_addr_t addr);

void *qemu_ram_ptr_length(ram_addr_t addr, ram_addr_t *size);

/* Same but slower, to use for migration, where the order of

 * RAMBlocks must not change. */

void *qemu_safe_ram_ptr(ram_addr_t addr);

void qemu_put_ram_ptr(void *addr);

/* This should not be used by devices.  */

int qemu_ram_addr_from_host(void *ptr, ram_addr_t *ram_addr);
@@ -67,7 +63,6 @@ void *cpu_physical_memory_map(hwaddr addr, 
void cpu_physical_memory_unmap(void *buffer, hwaddr len,

                               int is_write, hwaddr access_len);

void *cpu_register_map_client(void *opaque, void (*callback)(void *opaque));

void cpu_unregister_map_client(void *cookie);



bool cpu_physical_memory_is_io(hwaddr phys_addr);

exec-all.h

+0 −2
Original line number Diff line number Diff line
@@ -194,8 +194,6 @@ static inline unsigned int tb_phys_hash_func(tb_page_addr_t pc) 


void tb_free(TranslationBlock *tb);

void tb_flush(CPUArchState *env);

void tb_link_page(TranslationBlock *tb,

                  tb_page_addr_t phys_pc, tb_page_addr_t phys_page2);

void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr);



extern TranslationBlock *tb_phys_hash[CODE_GEN_PHYS_HASH_SIZE];

exec.c

+9 −6
Original line number Diff line number Diff line
@@ -188,9 +188,12 @@ static unsigned phys_map_nodes_nb, phys_map_nodes_nb_alloc; 


static void io_mem_init(void);

static void memory_map_init(void);

static void *qemu_safe_ram_ptr(ram_addr_t addr);



static MemoryRegion io_mem_watch;

#endif

static void tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc,

                         tb_page_addr_t phys_page2);



/* statistics */

static int tb_flush_count;
@@ -1352,8 +1355,8 @@ static inline void tb_alloc_page(TranslationBlock *tb, 


/* add a new TB and link it to the physical page tables. phys_page2 is

   (-1) to indicate that only one page contains the TB. */

void tb_link_page(TranslationBlock *tb,

                  tb_page_addr_t phys_pc, tb_page_addr_t phys_page2)

static void tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc,

                         tb_page_addr_t phys_page2)

{

    unsigned int h;

    TranslationBlock **ptb;
@@ -1874,7 +1877,7 @@ void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t end, 
    }

}



int cpu_physical_memory_set_dirty_tracking(int enable)

static int cpu_physical_memory_set_dirty_tracking(int enable)

{

    int ret = 0;

    in_migration = enable;
@@ -2756,7 +2759,7 @@ void *qemu_get_ram_ptr(ram_addr_t addr) 
/* Return a host pointer to ram allocated with qemu_ram_alloc.

 * Same as qemu_get_ram_ptr but avoid reordering ramblocks.

 */

void *qemu_safe_ram_ptr(ram_addr_t addr)

static void *qemu_safe_ram_ptr(ram_addr_t addr)

{

    RAMBlock *block;
@@ -2786,7 +2789,7 @@ void *qemu_safe_ram_ptr(ram_addr_t addr) 


/* Return a host pointer to guest's ram. Similar to qemu_get_ram_ptr

 * but takes a size argument */

void *qemu_ram_ptr_length(ram_addr_t addr, ram_addr_t *size)

static void *qemu_ram_ptr_length(ram_addr_t addr, ram_addr_t *size)

{

    if (*size == 0) {

        return NULL;
@@ -3534,7 +3537,7 @@ void *cpu_register_map_client(void *opaque, void (*callback)(void *opaque)) 
    return client;

}



void cpu_unregister_map_client(void *_client)

static void cpu_unregister_map_client(void *_client)

{

    MapClient *client = (MapClient *)_client;

hw/adb.c

+4 −4
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ int adb_poll(ADBBusState *s, uint8_t *obuf) 
    return olen;

}



ADBDevice *adb_register_device(ADBBusState *s, int devaddr,

static ADBDevice *adb_register_device(ADBBusState *s, int devaddr,

                                      ADBDeviceRequest *devreq,

                                      ADBDeviceReset *devreset,

                                      void *opaque)