diff options
author | Avi Kivity <avi@redhat.com> | 2009-07-12 18:06:23 +0300 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-07-12 18:06:23 +0300 |
commit | 34f9d7d9de76fb313dd8541eb705ced2284b923b (patch) | |
tree | 1dbcf10a5d44c1d7a4ae3d649abd4269bb26d869 /cpu-all.h | |
parent | Merge commit '79c4f6b08009a1d23177c2be8bd003253cf3686a' into upstream-merge (diff) | |
parent | fix segfault in msix_save (diff) | |
download | qemu-kvm-34f9d7d9de76fb313dd8541eb705ced2284b923b.tar.gz qemu-kvm-34f9d7d9de76fb313dd8541eb705ced2284b923b.tar.bz2 qemu-kvm-34f9d7d9de76fb313dd8541eb705ced2284b923b.zip |
Merge commit '9a3e12c8a48ef96bf0f3effc21a4ce98d35992f9' into upstream-merge
* commit '9a3e12c8a48ef96bf0f3effc21a4ce98d35992f9':
fix segfault in msix_save
Unregister savevm callback in eeprom93xx_free()
Don't leak VLANClientState on PCI hot remove
Don't abort if TUNSETSNDBUF fails where no sndbuf= arg is supplied
Substitute O_DSYNC with O_SYNC or O_FSYNC when needed.
Allow adjustment of http block device's readahead size, via a new
consolidate user cpu_{in, out}[bwl] into ioport-user.c
ioport: consolidate duplicated logic in register_ioport_{read, write}().
use constant IOPORTS_MASK instead of 0xffff.
split out ioport related stuffs from vl.c into ioport.c.
Replace signrom with shell script v3
Revert "support colon in filenames"
Fix build for ESD audio
qcow2: Make cache=writethrough default
net: set a default value for sndbuf=
configure: detect xen with --extra-cflags / --extra-ldflags
Conflicts:
hw/msix.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'cpu-all.h')
-rw-r--r-- | cpu-all.h | 12 |
1 files changed, 1 insertions, 11 deletions
@@ -837,17 +837,7 @@ void cpu_set_log_filename(const char *filename); int cpu_str_to_log_mask(const char *str); /* IO ports API */ - -/* NOTE: as these functions may be even used when there is an isa - brige on non x86 targets, we always defined them */ -#ifndef NO_CPU_IO_DEFS -void cpu_outb(CPUState *env, int addr, int val); -void cpu_outw(CPUState *env, int addr, int val); -void cpu_outl(CPUState *env, int addr, int val); -int cpu_inb(CPUState *env, int addr); -int cpu_inw(CPUState *env, int addr); -int cpu_inl(CPUState *env, int addr); -#endif +#include "ioport.h" /* memory API */ |