diff options
author | Marcelo Tosatti <mtosatti@redhat.com> | 2011-02-02 20:18:11 -0200 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2011-02-02 20:18:11 -0200 |
commit | 2d2339f995d7176dcb2de10d162aed323a1ffbf3 (patch) | |
tree | 850127b9bd38138b277f04bac21c5bcaa9d504a1 /cache-utils.h | |
parent | 16b0249ee000c083c359a419bad4b460a465b3b8 (diff) | |
parent | f487d6278f75f84378833b8c3a67443346d639dc (diff) |
Merge commit 'f487d6278f75f84378833b8c3a67443346d639dc' into upstream-merge
* commit 'f487d6278f75f84378833b8c3a67443346d639dc': (140 commits)
Update SeaBIOS to 0.6.1.2
vhost: force vhost off for non-MSI guests
tap: safe sndbuf default
Add boot index documentation.
Add bootindex handling into usb storage device.
fix QemuOpts leak
remove text_console_opts
add set_echo implementation for text consoles
create TextConsole together with the CharDeviceState
add set_echo implementation for qemu_chr_stdio
move atexit(term_exit) and O_NONBLOCK to qemu_chr_open_stdio
add qemu_chr_set_echo
remove broken code for tty
vnc: Fix password expiration through 'change vnc ""' (v2)
linux-user: avoid gcc array overrun warning for sparc
hw/slavio_intctl.c: fix gcc warning about array bounds overrun
SPARC: Fix Leon3 cache control
blockdev: Fix drive_add for drives without media
blockdev: Replace drive_add()'s fmt, ... by optstr parameter
blockdev: Reject multiple definitions for the same drive
...
Conflicts:
roms/seabios
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'cache-utils.h')
-rw-r--r-- | cache-utils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cache-utils.h b/cache-utils.h index e4f27ef51..ee0baef4c 100644 --- a/cache-utils.h +++ b/cache-utils.h @@ -9,7 +9,7 @@ struct qemu_cache_conf { extern struct qemu_cache_conf qemu_cache_conf; -extern void qemu_cache_utils_init(char **envp); +void qemu_cache_utils_init(char **envp); /* mildly adjusted code from tcg-dyngen.c */ static inline void flush_icache_range(unsigned long start, unsigned long stop) |