Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* First batch of MAINTAINERS updates
* IOAPIC fixes (to pass kvm-unit-tests with -machine kernel_irqchip=off)
* NBD API upgrades from Daniel
* strtosz fixes from Marc-André
* improved support for readonly=on on scsi-generic devices
* new "info ioapic" and "info lapic" monitor commands
* Peter Crosthwaite's ELF_MACHINE cleanups
* docs patches from Thomas and Daniel
# gpg: Signature made Fri 25 Sep 2015 11:20:52 BST using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
* remotes/bonzini/tags/for-upstream: (52 commits)
doc: Refresh URLs in the qemu-tech documentation
docs: describe the QEMU build system structure / design
typedef: add typedef for QemuOpts
i386: interrupt poll processing
i386: partial revert of interrupt poll fix
ppc: Rename ELF_MACHINE to be PPC specific
i386: Rename ELF_MACHINE to be x86 specific
alpha: Remove ELF_MACHINE from cpu.h
mips: Remove ELF_MACHINE from cpu.h
sparc: Remove ELF_MACHINE from cpu.h
s390: Remove ELF_MACHINE from cpu.h
sh4: Remove ELF_MACHINE from cpu.h
xtensa: Remove ELF_MACHINE from cpu.h
tricore: Remove ELF_MACHINE from cpu.h
or32: Remove ELF_MACHINE from cpu.h
lm32: Remove ELF_MACHINE from cpu.h
unicore: Remove ELF_MACHINE from cpu.h
moxie: Remove ELF_MACHINE from cpu.h
cris: Remove ELF_MACHINE from cpu.h
m68k: Remove ELF_MACHINE from cpu.h
...
Signed-off-by:
Peter Maydell <peter.maydell@linaro.org>
No related branches found
No related tags found
Showing
- MAINTAINERS 51 additions, 7 deletionsMAINTAINERS
- Makefile 1 addition, 2 deletionsMakefile
- block/nbd.c 37 additions, 34 deletionsblock/nbd.c
- cpu-exec.c 9 additions, 0 deletionscpu-exec.c
- disas.c 0 additions, 10 deletionsdisas.c
- docs/build-system.txt 507 additions, 0 deletionsdocs/build-system.txt
- hmp-commands-info.hx 32 additions, 0 deletionshmp-commands-info.hx
- hw/arm/armv7m.c 1 addition, 1 deletionhw/arm/armv7m.c
- hw/cris/boot.c 1 addition, 1 deletionhw/cris/boot.c
- hw/i386/kvm/ioapic.c 10 additions, 0 deletionshw/i386/kvm/ioapic.c
- hw/i386/multiboot.c 1 addition, 1 deletionhw/i386/multiboot.c
- hw/intc/apic.c 3 additions, 19 deletionshw/intc/apic.c
- hw/intc/ioapic.c 16 additions, 4 deletionshw/intc/ioapic.c
- hw/intc/ioapic_common.c 55 additions, 0 deletionshw/intc/ioapic_common.c
- hw/lm32/lm32_boards.c 2 additions, 2 deletionshw/lm32/lm32_boards.c
- hw/lm32/milkymist.c 1 addition, 1 deletionhw/lm32/milkymist.c
- hw/m68k/an5206.c 1 addition, 1 deletionhw/m68k/an5206.c
- hw/m68k/dummy_m68k.c 1 addition, 1 deletionhw/m68k/dummy_m68k.c
- hw/m68k/mcf5208.c 1 addition, 1 deletionhw/m68k/mcf5208.c
- hw/microblaze/boot.c 2 additions, 2 deletionshw/microblaze/boot.c
Loading
Please register or sign in to comment