Merge branch 'master' of git://git.sv.gnu.org/qemu
* 'master' of git://git.sv.gnu.org/qemu: (84 commits)
ETRAX: Simplify serport control logic.
ETRAX: Drop _t for the serial type.
ETRAX: Use NULL for subwidth serport reg accesses.
ETRAX: Drop the _t for the internal PIC type.
ETRAX: Simplify the interrupt controller model.
ETRAX: Simplify interrupt signaling.
Fix compiler warnings in nwfpe code.
target-mips: proper sign extension for 'SUBU rd, zero, rt'
target-mips: fix comments about SUB/DSUB
qemu-options.hx: fix description of cache=none suboption
Suppress type mismatch warnings in VDE code.
minor fix of pci_register_bus()
use PCI_HEADER_TYPE.
Fix typos in comments in exec.c
Optimize cmp x, 0 case
Reindent
Handle NULL bdrv.
Improve instruction name comments for easier searching
Clarify: dmmuregs[1] is not a typo
Optimize operations with immediate parameters
...
Conflicts:
Makefile.target
hw/vga.c
qemu-common.h
vl.c
(iothread merge by Marcelo)
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
26 files changed: