Commit d649689a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



* Bugfixes all over the place
* get/set_uint cleanups (Felipe)
* Lock guard support (Stefan)
* MemoryRegion ownership cleanup (Philippe)
* AVX512 optimization for buffer_is_zero (Robert)

# gpg: Signature made Tue 17 Mar 2020 15:01:54 GMT
# gpg:                using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream: (62 commits)
  hw/arm: Let devices own the MemoryRegion they create
  hw/arm: Remove unnecessary memory_region_set_readonly() on ROM alias
  hw/ppc/ppc405: Use memory_region_init_rom() with read-only regions
  hw/arm/stm32: Use memory_region_init_rom() with read-only regions
  hw/char: Let devices own the MemoryRegion they create
  hw/riscv: Let devices own the MemoryRegion they create
  hw/dma: Let devices own the MemoryRegion they create
  hw/display: Let devices own the MemoryRegion they create
  hw/core: Let devices own the MemoryRegion they create
  scripts/cocci: Patch to let devices own their MemoryRegions
  scripts/cocci: Patch to remove unnecessary memory_region_set_readonly()
  scripts/cocci: Patch to detect potential use of memory_region_init_rom
  hw/sparc: Use memory_region_init_rom() with read-only regions
  hw/sh4: Use memory_region_init_rom() with read-only regions
  hw/riscv: Use memory_region_init_rom() with read-only regions
  hw/ppc: Use memory_region_init_rom() with read-only regions
  hw/pci-host: Use memory_region_init_rom() with read-only regions
  hw/net: Use memory_region_init_rom() with read-only regions
  hw/m68k: Use memory_region_init_rom() with read-only regions
  hw/display: Use memory_region_init_rom() with read-only regions
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents cc818a21 32b9523a

MAINTAINERS

+12 −0
Original line number Diff line number Diff line
@@ -437,6 +437,17 @@ F: include/hw/block/dataplane/xen* 
F: include/hw/xen/

F: include/sysemu/xen-mapcache.h



Guest CPU Cores (HAXM)

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

X86 HAXM CPUs

M: Wenchao Wang <wenchao.wang@intel.com>

M: Colin Xu <colin.xu@intel.com>

L: haxm-team@intel.com

W: https://github.com/intel/haxm/issues

S: Maintained

F: include/sysemu/hax.h

F: target/i386/hax-*



Hosts

-----

LINUX
@@ -2040,6 +2051,7 @@ F: include/exec/ramblock.h 
F: memory.c

F: include/exec/memory-internal.h

F: exec.c

F: scripts/coccinelle/memory-region-housekeeping.cocci



SPICE

M: Gerd Hoffmann <kraxel@redhat.com>

Makefile

+28 −21
Original line number Diff line number Diff line
@@ -1235,50 +1235,57 @@ endif 
include $(SRC_PATH)/tests/docker/Makefile.include

include $(SRC_PATH)/tests/vm/Makefile.include



print-help-run = printf "  %-30s - %s\\n" "$1" "$2"

print-help = $(quiet-@)$(call print-help-run,$1,$2)



.PHONY: help

help:

	@echo  'Generic targets:'

	@echo  '  all             - Build all'

	$(call print-help,all,Build all)

ifdef CONFIG_MODULES

	@echo  '  modules         - Build all modules'

	$(call print-help,modules,Build all modules)

endif

	@echo  '  dir/file.o      - Build specified target only'

	@echo  '  install         - Install QEMU, documentation and tools'

	@echo  '  ctags/TAGS      - Generate tags file for editors'

	@echo  '  cscope          - Generate cscope index'

	$(call print-help,dir/file.o,Build specified target only)

	$(call print-help,install,Install QEMU, documentation and tools)

	$(call print-help,ctags/TAGS,Generate tags file for editors)

	$(call print-help,cscope,Generate cscope index)

	@echo  ''

	@$(if $(TARGET_DIRS), \

		echo 'Architecture specific targets:'; \

		$(foreach t, $(TARGET_DIRS), \

		printf "  %-30s - Build for %s\\n" $(t)/all $(t);) \

		$(call print-help-run,$(t)/all,Build for $(t));) \

		echo '')

	@$(if $(TOOLS), \

		echo 'Tools targets:'; \

		$(foreach t, $(TOOLS), \

		$(call print-help-run,$(t),Build $(shell basename $(t)) tool);) \

		echo '')

	@echo  'Cleaning targets:'

	@echo  '  clean           - Remove most generated files but keep the config'

	$(call print-help,clean,Remove most generated files but keep the config)

ifdef CONFIG_GCOV

	@echo  '  clean-coverage  - Remove coverage files'

	$(call print-help,clean-coverage,Remove coverage files)

endif

	@echo  '  distclean       - Remove all generated files'

	@echo  '  dist            - Build a distributable tarball'

	$(call print-help,distclean,Remove all generated files)

	$(call print-help,dist,Build a distributable tarball)

	@echo  ''

	@echo  'Test targets:'

	@echo  '  check           - Run all tests (check-help for details)'

	@echo  '  docker          - Help about targets running tests inside containers'

	@echo  '  vm-help         - Help about targets running tests inside VM'

	$(call print-help,check,Run all tests (check-help for details))

	$(call print-help,docker,Help about targets running tests inside containers)

	$(call print-help,vm-help,Help about targets running tests inside VM)

	@echo  ''

	@echo  'Documentation targets:'

	@echo  '  html info pdf txt'

	@echo  '                  - Build documentation in specified format'

	$(call print-help,html info pdf txt,Build documentation in specified format)

ifdef CONFIG_GCOV

	@echo  '  coverage-report - Create code coverage report'

	$(call print-help,coverage-report,Create code coverage report)

endif

	@echo  ''

ifdef CONFIG_WIN32

	@echo  'Windows targets:'

	@echo  '  installer       - Build NSIS-based installer for QEMU'

	$(call print-help,installer,Build NSIS-based installer for QEMU)

ifdef QEMU_GA_MSI_ENABLED

	@echo  '  msi             - Build MSI-based installer for qemu-ga'

	$(call print-help,msi,Build MSI-based installer for qemu-ga)

endif

	@echo  ''

endif

	@echo  '  $(MAKE) [targets]      (quiet build, default)'

	@echo  '  $(MAKE) V=1 [targets]  (verbose build)'
 
	$(call print-help,$(MAKE) [targets],(quiet build, default))

	$(call print-help,$(MAKE) V=1 [targets],(verbose build))

Makefile.target

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ endif 


$(call set-vpath, $(SRC_PATH):$(BUILD_DIR))

ifdef CONFIG_LINUX

QEMU_CFLAGS += -I../linux-headers

QEMU_CFLAGS += -isystem ../linux-headers

endif

QEMU_CFLAGS += -iquote .. -iquote $(SRC_PATH)/target/$(TARGET_BASE_ARCH) -DNEED_CPU_H

block/linux-aio.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ struct aio_ring { 
    unsigned    incompat_features;

    unsigned    header_length;  /* size of aio_ring */



    struct io_event io_events[0];

    struct io_event io_events[];

};



/**

block/vmdk.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ typedef struct VmdkMetaData { 
typedef struct VmdkGrainMarker {

    uint64_t lba;

    uint32_t size;

    uint8_t  data[0];

    uint8_t  data[];

} QEMU_PACKED VmdkGrainMarker;



enum {