Commit acc95bc8 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

Merge remote-tracking branch 'origin/master' into HEAD 



Resolve conflicts around apb.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parents 880b1ffe 997eba28

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ 
/qemu-version.h.tmp

/module_block.h

/scsi/qemu-pr-helper

/vscclient

/vhost-user-scsi

/fsdev/virtfs-proxy-helper

*.tmp

MAINTAINERS

+23 −4
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ S: Maintained 
F: target/xtensa/

F: hw/xtensa/

F: tests/tcg/xtensa/

F: disas/xtensa.c



TriCore

M: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
@@ -543,7 +544,7 @@ F: include/hw/*/xlnx*.h 


ARM ACPI Subsystem

M: Shannon Zhao <zhaoshenglong@huawei.com>

M: Shannon Zhao <shannon.zhao@linaro.org>

M: Shannon Zhao <shannon.zhaosl@gmail.com>

L: qemu-arm@nongnu.org

S: Maintained

F: hw/arm/virt-acpi-build.c
@@ -732,7 +733,11 @@ F: hw/ppc/prep.c 
F: hw/ppc/prep_systemio.c

F: hw/ppc/rs6000_mc.c

F: hw/pci-host/prep.[hc]

F: hw/isa/i82378.c

F: hw/isa/pc87312.[hc]

F: hw/dma/i82374.c

F: hw/timer/m48t59-isa.c

F: include/hw/timer/m48t59.h

F: pc-bios/ppc_rom.bin



sPAPR
@@ -761,6 +766,12 @@ L: qemu-ppc@nongnu.org 
S: Odd Fixes

F: hw/ppc/virtex_ml507.c



sam460ex

M: BALATON Zoltan <balaton@eik.bme.hu>

L: qemu-ppc@nongnu.org

S: Maintained

F: hw/ide/sii3112.c



SH4 Machines

------------

R2D
@@ -861,12 +872,13 @@ F: hw/misc/sga.c 
PC Chipset

M: Michael S. Tsirkin <mst@redhat.com>

M: Paolo Bonzini <pbonzini@redhat.com>

S: Support

S: Supported

F: hw/char/debugcon.c

F: hw/char/parallel.c

F: hw/char/serial*

F: hw/dma/i8257*

F: hw/i2c/pm_smbus.c

F: hw/input/pckbd.c

F: hw/intc/apic*

F: hw/intc/ioapic*

F: hw/intc/i8259*
@@ -875,7 +887,10 @@ F: hw/misc/pc-testdev.c 
F: hw/timer/hpet*

F: hw/timer/i8254*

F: hw/timer/mc146818rtc*

F: hw/watchdog/wdt_ib700.c

F: include/hw/display/vga.h

F: include/hw/i2c/pm_smbus.h

F: include/hw/isa/i8257.h

F: include/hw/timer/hpet.h

F: include/hw/timer/i8254*

F: include/hw/timer/mc146818rtc*
@@ -976,7 +991,9 @@ M: Alexander Graf <agraf@suse.de> 
L: qemu-ppc@nongnu.org

S: Odd Fixes

F: hw/ppc/ppc4*.c

F: hw/i2c/ppc4xx_i2c.c

F: include/hw/ppc/ppc4xx.h

F: include/hw/i2c/ppc4xx_i2c.h



ppce500

M: Alexander Graf <agraf@suse.de>
@@ -995,11 +1012,13 @@ Network devices 
M: Jason Wang <jasowang@redhat.com>

S: Odd Fixes

F: hw/net/

F: include/hw/net/

F: tests/virtio-net-test.c

T: git git://github.com/jasowang/qemu.git net



SCSI

M: Paolo Bonzini <pbonzini@redhat.com>

R: Fam Zheng <famz@redhat.com>

S: Supported

F: include/hw/scsi/*

F: hw/scsi/*
@@ -1071,13 +1090,11 @@ F: include/hw/virtio/ 
F: tests/virtio-balloon-test.c



virtio-9p

M: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

M: Greg Kurz <groug@kaod.org>

S: Supported

F: hw/9pfs/

F: fsdev/

F: tests/virtio-9p-test.c

T: git git://github.com/kvaneesh/QEMU.git

T: git git://github.com/gkurz/qemu.git 9p-next



virtio-blk
@@ -1260,6 +1277,7 @@ T: git git://github.com/stefanha/qemu.git block 


Block SCSI subsystem

M: Paolo Bonzini <pbonzini@redhat.com>

R: Fam Zheng <famz@redhat.com>

L: qemu-block@nongnu.org

S: Supported

F: include/scsi/*
@@ -1538,6 +1556,7 @@ M: Alistair Francis <alistair.francis@xilinx.com> 
S: Maintained

F: hw/core/register.c

F: include/hw/register.h

F: include/hw/registerfields.h



SLIRP

M: Samuel Thibault <samuel.thibault@ens-lyon.org>

Makefile

+8 −4
Original line number Diff line number Diff line
@@ -6,7 +6,10 @@ BUILD_DIR=$(CURDIR) 
# Before including a proper config-host.mak, assume we are in the source tree

SRC_PATH=.



UNCHECKED_GOALS := %clean TAGS cscope ctags docker docker-% help

UNCHECKED_GOALS := %clean TAGS cscope ctags dist \

    html info pdf txt \

    help check-help \

    docker docker-% vm-test vm-build-%



# All following code might depend on configuration variables

ifneq ($(wildcard config-host.mak),)
@@ -50,7 +53,7 @@ ifneq ($(realpath $(SRC_PATH)),$(realpath .)) 
ifneq ($(wildcard $(SRC_PATH)/config-host.mak),)

$(error This is an out of tree build but your source tree ($(SRC_PATH)) \

seems to have been used for an in-tree build. You can fix this by running \

"make distclean && rm -rf *-linux-user *-softmmu" in your source tree)

"$(MAKE) distclean && rm -rf *-linux-user *-softmmu" in your source tree)

endif

endif
@@ -229,6 +232,7 @@ KEYCODEMAP_FILES = \ 
		 ui/input-keymap-linux-to-qcode.c \

		 ui/input-keymap-qcode-to-qnum.c \

		 ui/input-keymap-qnum-to-qcode.c \

		 ui/input-keymap-qcode-to-linux.c \

		 $(NULL)



GENERATED_FILES += $(KEYCODEMAP_FILES)
@@ -303,7 +307,7 @@ endif 
	    else \

	      echo "WARNING: $@ out of date.";\

	    fi; \

	    echo "Run \"make defconfig\" to regenerate."; \

	    echo "Run \"$(MAKE) defconfig\" to regenerate."; \

	    rm $@.tmp; \

	  fi; \

	 else \
@@ -933,4 +937,4 @@ ifdef QEMU_GA_MSI_ENABLED 
endif

	@echo  ''

endif

	@echo  '  make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'
 
	@echo  '  $(MAKE) V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ trace-events-subdirs += hw/input 
trace-events-subdirs += hw/timer

trace-events-subdirs += hw/dma

trace-events-subdirs += hw/sparc

trace-events-subdirs += hw/sparc64

trace-events-subdirs += hw/sd

trace-events-subdirs += hw/isa

trace-events-subdirs += hw/mem

VERSION

+1 −1
Original line number Diff line number Diff line 
2.10.94
 
2.11.50