ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* 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)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQEcBAABAgAGBQJecOZiAAoJEL/70l94x66DgGkH/jpY4IgqlSAAWCgaxfe1n1vg
 ahSzSLrC8wiJq2Jxbmxn+5BbH6BxQ9ibflsY5bvCY/sTb7UlOFCPkFhQ2iUgplkw
 ciB5UfgCA6OHpKEhpHhXtzlybtNOlxXNWYJ1SrcVXbRES8f7XdhMKs15mnJJuOOE
 k/tuZo/44yZRJl0Cv+nkvIFcCVgyu1q0Lln/1MMPngY2r9gt893cY9feTBSSWgnp
 +7HZr5TXI7mcIytczFKzbdujlG4391DGejKX66IIxGcWg9vXS7TwAStzH1vSKVfJ
 73SKZBoCU5gpHHHC+dqVyouMerV+UE+WQPNtF+LCsNgJBw/2NXc1ZgDrtz1OI2c=
 =+LRX
 -----END PGP SIGNATURE-----

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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2020-03-17 18:33:05 +00:00
parent cc818a2148 32b9523ad5
commit d649689a8e
116 changed files with 1166 additions and 772 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MAINTAINERS
View File

@ -437,6 +437,17 @@ F: include/hw/block/dataplane/xen*
F: include/hw/xen/ F: include/hw/xen/
F: include/sysemu/xen-mapcache.h 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 Hosts
----- -----
LINUX LINUX
@ -2040,6 +2051,7 @@ F: include/exec/ramblock.h
F: memory.c F: memory.c
F: include/exec/memory-internal.h F: include/exec/memory-internal.h
F: exec.c F: exec.c
F: scripts/coccinelle/memory-region-housekeeping.cocci
SPICE SPICE
M: Gerd Hoffmann <kraxel@redhat.com> M: Gerd Hoffmann <kraxel@redhat.com>

49
Makefile
View File

@ -1235,50 +1235,57 @@ endif
include $(SRC_PATH)/tests/docker/Makefile.include include $(SRC_PATH)/tests/docker/Makefile.include
include $(SRC_PATH)/tests/vm/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 .PHONY: help
help: help:
@echo 'Generic targets:' @echo 'Generic targets:'
@echo ' all - Build all' $(call print-help,all,Build all)
ifdef CONFIG_MODULES ifdef CONFIG_MODULES
@echo ' modules - Build all modules' $(call print-help,modules,Build all modules)
endif endif
@echo ' dir/file.o - Build specified target only' $(call print-help,dir/file.o,Build specified target only)
@echo ' install - Install QEMU, documentation and tools' $(call print-help,install,Install QEMU, documentation and tools)
@echo ' ctags/TAGS - Generate tags file for editors' $(call print-help,ctags/TAGS,Generate tags file for editors)
@echo ' cscope - Generate cscope index' $(call print-help,cscope,Generate cscope index)
@echo '' @echo ''
@$(if $(TARGET_DIRS), \ @$(if $(TARGET_DIRS), \
echo 'Architecture specific targets:'; \ echo 'Architecture specific targets:'; \
$(foreach t, $(TARGET_DIRS), \ $(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 '')
@echo 'Cleaning targets:' @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 ifdef CONFIG_GCOV
@echo ' clean-coverage - Remove coverage files' $(call print-help,clean-coverage,Remove coverage files)
endif endif
@echo ' distclean - Remove all generated files' $(call print-help,distclean,Remove all generated files)
@echo ' dist - Build a distributable tarball' $(call print-help,dist,Build a distributable tarball)
@echo '' @echo ''
@echo 'Test targets:' @echo 'Test targets:'
@echo ' check - Run all tests (check-help for details)' $(call print-help,check,Run all tests (check-help for details))
@echo ' docker - Help about targets running tests inside containers' $(call print-help,docker,Help about targets running tests inside containers)
@echo ' vm-help - Help about targets running tests inside VM' $(call print-help,vm-help,Help about targets running tests inside VM)
@echo '' @echo ''
@echo 'Documentation targets:' @echo 'Documentation targets:'
@echo ' html info pdf txt' $(call print-help,html info pdf txt,Build documentation in specified format)
@echo ' - Build documentation in specified format'
ifdef CONFIG_GCOV ifdef CONFIG_GCOV
@echo ' coverage-report - Create code coverage report' $(call print-help,coverage-report,Create code coverage report)
endif endif
@echo '' @echo ''
ifdef CONFIG_WIN32 ifdef CONFIG_WIN32
@echo 'Windows targets:' @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 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 endif
@echo '' @echo ''
endif endif
@echo ' $(MAKE) [targets] (quiet build, default)' $(call print-help,$(MAKE) [targets],(quiet build, default))
@echo ' $(MAKE) V=1 [targets] (verbose build)' $(call print-help,$(MAKE) V=1 [targets],(verbose build))

2
Makefile.target
View File

@ -12,7 +12,7 @@ endif
$(call set-vpath, $(SRC_PATH):$(BUILD_DIR)) $(call set-vpath, $(SRC_PATH):$(BUILD_DIR))
ifdef CONFIG_LINUX ifdef CONFIG_LINUX
QEMU_CFLAGS += -I../linux-headers QEMU_CFLAGS += -isystem ../linux-headers
endif endif
QEMU_CFLAGS += -iquote .. -iquote $(SRC_PATH)/target/$(TARGET_BASE_ARCH) -DNEED_CPU_H QEMU_CFLAGS += -iquote .. -iquote $(SRC_PATH)/target/$(TARGET_BASE_ARCH) -DNEED_CPU_H

2
block/linux-aio.c
View File

@ -121,7 +121,7 @@ struct aio_ring {
unsigned incompat_features; unsigned incompat_features;
unsigned header_length; /* size of aio_ring */ unsigned header_length; /* size of aio_ring */
struct io_event io_events[0]; struct io_event io_events[];
}; };
/** /**

2
block/vmdk.c
View File

@ -187,7 +187,7 @@ typedef struct VmdkMetaData {
typedef struct VmdkGrainMarker { typedef struct VmdkGrainMarker {
uint64_t lba; uint64_t lba;
uint32_t size; uint32_t size;
uint8_t data[0]; uint8_t data[];
} QEMU_PACKED VmdkGrainMarker; } QEMU_PACKED VmdkGrainMarker;
enum { enum {

2
bsd-user/qemu.h
View File

@ -95,7 +95,7 @@ typedef struct TaskState {
struct sigqueue *first_free; /* first free siginfo queue entry */ struct sigqueue *first_free; /* first free siginfo queue entry */
int signal_pending; /* non zero if a signal may be pending */ int signal_pending; /* non zero if a signal may be pending */
uint8_t stack[0]; uint8_t stack[];
} __attribute__((aligned(16))) TaskState; } __attribute__((aligned(16))) TaskState;
void init_task_state(TaskState *ts); void init_task_state(TaskState *ts);

62
configure vendored
View File

@ -405,6 +405,7 @@ EXESUF=""
DSOSUF=".so" DSOSUF=".so"
LDFLAGS_SHARED="-shared" LDFLAGS_SHARED="-shared"
modules="no" modules="no"
module_upgrades="no"
prefix="/usr/local" prefix="/usr/local"
mandir="\${prefix}/share/man" mandir="\${prefix}/share/man"
datadir="\${prefix}/share" datadir="\${prefix}/share"
@ -899,7 +900,7 @@ Linux)
linux="yes" linux="yes"
linux_user="yes" linux_user="yes"
kvm="yes" kvm="yes"
QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers -I$PWD/linux-headers $QEMU_INCLUDES" QEMU_INCLUDES="-isystem \$(SRC_PATH)/linux-headers -isystem $PWD/linux-headers $QEMU_INCLUDES"
supported_os="yes" supported_os="yes"
libudev="yes" libudev="yes"
;; ;;
@ -1032,6 +1033,10 @@ for opt do
--disable-modules) --disable-modules)
modules="no" modules="no"
;; ;;
--disable-module-upgrades) module_upgrades="no"
;;
--enable-module-upgrades) module_upgrades="yes"
;;
--cpu=*) --cpu=*)
;; ;;
--target-list=*) target_list="$optarg" --target-list=*) target_list="$optarg"
@ -1421,6 +1426,11 @@ for opt do
;; ;;
--enable-avx2) avx2_opt="yes" --enable-avx2) avx2_opt="yes"
;; ;;
--disable-avx512f) avx512f_opt="no"
;;
--enable-avx512f) avx512f_opt="yes"
;;
--enable-glusterfs) glusterfs="yes" --enable-glusterfs) glusterfs="yes"
;; ;;
--disable-virtio-blk-data-plane|--enable-virtio-blk-data-plane) --disable-virtio-blk-data-plane|--enable-virtio-blk-data-plane)
@ -1786,6 +1796,7 @@ disabled with --disable-FEATURE, default is enabled if available:
guest-agent-msi build guest agent Windows MSI installation package guest-agent-msi build guest agent Windows MSI installation package
pie Position Independent Executables pie Position Independent Executables
modules modules support (non-Windows) modules modules support (non-Windows)
module-upgrades try to load modules from alternate paths for upgrades
debug-tcg TCG debugging (default is disabled) debug-tcg TCG debugging (default is disabled)
debug-info debugging information debug-info debugging information
sparse sparse checker sparse sparse checker
@ -1857,6 +1868,7 @@ disabled with --disable-FEATURE, default is enabled if available:
tcmalloc tcmalloc support tcmalloc tcmalloc support
jemalloc jemalloc support jemalloc jemalloc support
avx2 AVX2 optimization support avx2 AVX2 optimization support
avx512f AVX512F optimization support
replication replication support replication replication support
opengl opengl support opengl opengl support
virglrenderer virgl rendering support virglrenderer virgl rendering support
@ -2049,6 +2061,11 @@ if test "$modules" = "yes" && test "$mingw32" = "yes" ; then
error_exit "Modules are not available for Windows" error_exit "Modules are not available for Windows"
fi fi
# module_upgrades is only reasonable if modules are enabled
if test "$modules" = "no" && test "$module_upgrades" = "yes" ; then
error_exit "Can't enable module-upgrades as Modules are not enabled"
fi
# Static linking is not possible with modules or PIE # Static linking is not possible with modules or PIE
if test "$static" = "yes" ; then if test "$static" = "yes" ; then
if test "$modules" = "yes" ; then if test "$modules" = "yes" ; then
@ -3350,7 +3367,9 @@ if test "$vnc" = "yes" && test "$vnc_sasl" != "no" ; then
int main(void) { sasl_server_init(NULL, "qemu"); return 0; } int main(void) { sasl_server_init(NULL, "qemu"); return 0; }
EOF EOF
# Assuming Cyrus-SASL installed in /usr prefix # Assuming Cyrus-SASL installed in /usr prefix
vnc_sasl_cflags="" # QEMU defines struct iovec in "qemu/osdep.h",
# we don't want libsasl to redefine it in <sasl/sasl.h>.
vnc_sasl_cflags="-DSTRUCT_IOVEC_DEFINED"
vnc_sasl_libs="-lsasl2" vnc_sasl_libs="-lsasl2"
if compile_prog "$vnc_sasl_cflags" "$vnc_sasl_libs" ; then if compile_prog "$vnc_sasl_cflags" "$vnc_sasl_libs" ; then
vnc_sasl=yes vnc_sasl=yes
@ -5574,6 +5593,36 @@ EOF
fi fi
fi fi
##########################################
# avx512f optimization requirement check
#
# There is no point enabling this if cpuid.h is not usable,
# since we won't be able to select the new routines.
# by default, it is turned off.
# if user explicitly want to enable it, check environment
if test "$cpuid_h" = "yes" && test "$avx512f_opt" = "yes"; then
cat > $TMPC << EOF
#pragma GCC push_options
#pragma GCC target("avx512f")
#include <cpuid.h>
#include <immintrin.h>
static int bar(void *a) {
__m512i x = *(__m512i *)a;
return _mm512_test_epi64_mask(x, x);
}
int main(int argc, char *argv[])
{
return bar(argv[0]);
}
EOF
if ! compile_object "" ; then
avx512f_opt="no"
fi
else
avx512f_opt="no"
fi
######################################## ########################################
# check if __[u]int128_t is usable. # check if __[u]int128_t is usable.
@ -6590,6 +6639,7 @@ if test "$slirp" != "no" ; then
echo "smbd $smbd" echo "smbd $smbd"
fi fi
echo "module support $modules" echo "module support $modules"
echo "alt path mod load $module_upgrades"
echo "host CPU $cpu" echo "host CPU $cpu"
echo "host big endian $bigendian" echo "host big endian $bigendian"
echo "target list $target_list" echo "target list $target_list"
@ -6717,6 +6767,7 @@ echo "libxml2 $libxml2"
echo "tcmalloc support $tcmalloc" echo "tcmalloc support $tcmalloc"
echo "jemalloc support $jemalloc" echo "jemalloc support $jemalloc"
echo "avx2 optimization $avx2_opt" echo "avx2 optimization $avx2_opt"
echo "avx512f optimization $avx512f_opt"
echo "replication support $replication" echo "replication support $replication"
echo "VxHS block device $vxhs" echo "VxHS block device $vxhs"
echo "bochs support $bochs" echo "bochs support $bochs"
@ -6943,6 +6994,9 @@ if test "$modules" = "yes"; then
echo "CONFIG_STAMP=_$( (echo $qemu_version; echo $pkgversion; cat $0) | $shacmd - | cut -f1 -d\ )" >> $config_host_mak echo "CONFIG_STAMP=_$( (echo $qemu_version; echo $pkgversion; cat $0) | $shacmd - | cut -f1 -d\ )" >> $config_host_mak
echo "CONFIG_MODULES=y" >> $config_host_mak echo "CONFIG_MODULES=y" >> $config_host_mak
fi fi
if test "$module_upgrades" = "yes"; then
echo "CONFIG_MODULE_UPGRADES=y" >> $config_host_mak
fi
if test "$have_x11" = "yes" && test "$need_x11" = "yes"; then if test "$have_x11" = "yes" && test "$need_x11" = "yes"; then
echo "CONFIG_X11=y" >> $config_host_mak echo "CONFIG_X11=y" >> $config_host_mak
echo "X11_CFLAGS=$x11_cflags" >> $config_host_mak echo "X11_CFLAGS=$x11_cflags" >> $config_host_mak
@ -7268,6 +7322,10 @@ if test "$avx2_opt" = "yes" ; then
echo "CONFIG_AVX2_OPT=y" >> $config_host_mak echo "CONFIG_AVX2_OPT=y" >> $config_host_mak
fi fi
if test "$avx512f_opt" = "yes" ; then
echo "CONFIG_AVX512F_OPT=y" >> $config_host_mak
fi
if test "$lzo" = "yes" ; then if test "$lzo" = "yes" ; then
echo "CONFIG_LZO=y" >> $config_host_mak echo "CONFIG_LZO=y" >> $config_host_mak
fi fi

2
contrib/libvhost-user/libvhost-user.h
View File

@ -286,7 +286,7 @@ typedef struct VuVirtqInflight {
uint16_t used_idx; uint16_t used_idx;
/* Used to track the state of each descriptor in descriptor table */ /* Used to track the state of each descriptor in descriptor table */
VuDescStateSplit desc[0]; VuDescStateSplit desc[];
} VuVirtqInflight; } VuVirtqInflight;
typedef struct VuVirtqInflightDesc { typedef struct VuVirtqInflightDesc {

6
contrib/vhost-user-gpu/Makefile.objs
View File

@ -1,7 +1,7 @@
vhost-user-gpu-obj-y = main.o virgl.o vugbm.o vhost-user-gpu-obj-y = vhost-user-gpu.o virgl.o vugbm.o
main.o-cflags := $(PIXMAN_CFLAGS) $(GBM_CFLAGS) vhost-user-gpu.o-cflags := $(PIXMAN_CFLAGS) $(GBM_CFLAGS)
main.o-libs := $(PIXMAN_LIBS) vhost-user-gpu.o-libs := $(PIXMAN_LIBS)
virgl.o-cflags := $(VIRGL_CFLAGS) $(GBM_CFLAGS) virgl.o-cflags := $(VIRGL_CFLAGS) $(GBM_CFLAGS)
virgl.o-libs := $(VIRGL_LIBS) virgl.o-libs := $(VIRGL_LIBS)

0
contrib/vhost-user-gpu/main.c → contrib/vhost-user-gpu/vhost-user-gpu.c
View File

6
cpus.c
View File

@ -1026,9 +1026,9 @@ static int do_vm_stop(RunState state, bool send_stop)
int ret = 0; int ret = 0;
if (runstate_is_running()) { if (runstate_is_running()) {
runstate_set(state);
cpu_disable_ticks(); cpu_disable_ticks();
pause_all_vcpus(); pause_all_vcpus();
runstate_set(state);
vm_state_notify(0, state); vm_state_notify(0, state);
if (send_stop) { if (send_stop) {
qapi_event_send_stop(); qapi_event_send_stop();
@ -1899,6 +1899,10 @@ void resume_all_vcpus(void)
{ {
CPUState *cpu; CPUState *cpu;
if (!runstate_is_running()) {
return;
}
qemu_clock_enable(QEMU_CLOCK_VIRTUAL, true); qemu_clock_enable(QEMU_CLOCK_VIRTUAL, true);
CPU_FOREACH(cpu) { CPU_FOREACH(cpu) {
cpu_resume(cpu); cpu_resume(cpu);

4
docs/interop/vhost-user.rst
View File

@ -568,7 +568,7 @@ For split virtqueue, queue region can be implemented as:
uint16_t used_idx; uint16_t used_idx;
/* Used to track the state of each descriptor in descriptor table */ /* Used to track the state of each descriptor in descriptor table */
DescStateSplit desc[0]; DescStateSplit desc[];
} QueueRegionSplit; } QueueRegionSplit;
To track inflight I/O, the queue region should be processed as follows: To track inflight I/O, the queue region should be processed as follows:
@ -690,7 +690,7 @@ For packed virtqueue, queue region can be implemented as:
uint8_t padding[7]; uint8_t padding[7];
/* Used to track the state of each descriptor fetched from descriptor ring */ /* Used to track the state of each descriptor fetched from descriptor ring */
DescStatePacked desc[0]; DescStatePacked desc[];
} QueueRegionPacked; } QueueRegionPacked;
To track inflight I/O, the queue region should be processed as follows: To track inflight I/O, the queue region should be processed as follows:

57
docs/system/cpu-models-x86.rst.inc
View File

@ -49,10 +49,15 @@ mixture of host CPU models between machines, if live migration
compatibility is required, use the newest CPU model that is compatible compatibility is required, use the newest CPU model that is compatible
across all desired hosts. across all desired hosts.
``Skylake-Server``, ``Skylake-Server-IBRS`` ``Cascadelake-Server``, ``Cascadelake-Server-noTSX``
Intel Xeon Processor (Cascade Lake, 2019), with "stepping" levels 6
or 7 only. (The Cascade Lake Xeon processor with *stepping 5 is
vulnerable to MDS variants*.)
``Skylake-Server``, ``Skylake-Server-IBRS``, ``Skylake-Server-IBRS-noTSX``
Intel Xeon Processor (Skylake, 2016) Intel Xeon Processor (Skylake, 2016)
``Skylake-Client``, ``Skylake-Client-IBRS`` ``Skylake-Client``, ``Skylake-Client-IBRS``, ``Skylake-Client-noTSX-IBRS}``
Intel Core Processor (Skylake, 2015) Intel Core Processor (Skylake, 2015)
``Broadwell``, ``Broadwell-IBRS``, ``Broadwell-noTSX``, ``Broadwell-noTSX-IBRS`` ``Broadwell``, ``Broadwell-IBRS``, ``Broadwell-noTSX``, ``Broadwell-noTSX-IBRS``
@ -148,6 +153,54 @@ features are included if using "Host passthrough" or "Host model".
Requires the host CPU microcode to support this feature before it Requires the host CPU microcode to support this feature before it
can be used for guest CPUs. can be used for guest CPUs.
``mds-no``
Recommended to inform the guest OS that the host is *not* vulnerable
to any of the MDS variants ([MFBDS] CVE-2018-12130, [MLPDS]
CVE-2018-12127, [MSBDS] CVE-2018-12126).
This is an MSR (Model-Specific Register) feature rather than a CPUID feature,
so it will not appear in the Linux ``/proc/cpuinfo`` in the host or
guest. Instead, the host kernel uses it to populate the MDS
vulnerability file in ``sysfs``.
So it should only be enabled for VMs if the host reports @code{Not
affected} in the ``/sys/devices/system/cpu/vulnerabilities/mds`` file.
``taa-no``
Recommended to inform that the guest that the host is ``not``
vulnerable to CVE-2019-11135, TSX Asynchronous Abort (TAA).
This too is an MSR feature, so it does not show up in the Linux
``/proc/cpuinfo`` in the host or guest.
It should only be enabled for VMs if the host reports ``Not affected``
in the ``/sys/devices/system/cpu/vulnerabilities/tsx_async_abort``
file.
``tsx-ctrl``
Recommended to inform the guest that it can disable the Intel TSX
(Transactional Synchronization Extensions) feature; or, if the
processor is vulnerable, use the Intel VERW instruction (a
processor-level instruction that performs checks on memory access) as
a mitigation for the TAA vulnerability. (For details, refer to
Intel's `deep dive into MDS
<https://software.intel.com/security-software-guidance/insights/deep-dive-intel-analysis-microarchitectural-data-sampling>`_.)
Expose this to the guest OS if and only if: (a) the host has TSX
enabled; *and* (b) the guest has ``rtm`` CPU flag enabled.
By disabling TSX, KVM-based guests can avoid paying the price of
mitigating TSX-based attacks.
Note that ``tsx-ctrl`` too is an MSR feature, so it does not show
up in the Linux ``/proc/cpuinfo`` in the host or guest.
To validate that Intel TSX is indeed disabled for the guest, there are
two ways: (a) check for the *absence* of ``rtm`` in the guest's
``/proc/cpuinfo``; or (b) the
``/sys/devices/system/cpu/vulnerabilities/tsx_async_abort`` file in
the guest should report ``Mitigation: TSX disabled``.
Preferred CPU models for AMD x86 hosts Preferred CPU models for AMD x86 hosts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

9
exec.c
View File

@ -1315,7 +1315,7 @@ bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
unsigned client) unsigned client)
{ {
DirtyMemoryBlocks *blocks; DirtyMemoryBlocks *blocks;
unsigned long end, page; unsigned long end, page, start_page;
bool dirty = false; bool dirty = false;
RAMBlock *ramblock; RAMBlock *ramblock;
uint64_t mr_offset, mr_size; uint64_t mr_offset, mr_size;
@ -1325,7 +1325,8 @@ bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
} }
end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS; end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS;
page = start >> TARGET_PAGE_BITS; start_page = start >> TARGET_PAGE_BITS;
page = start_page;
WITH_RCU_READ_LOCK_GUARD() { WITH_RCU_READ_LOCK_GUARD() {
blocks = atomic_rcu_read(&ram_list.dirty_memory[client]); blocks = atomic_rcu_read(&ram_list.dirty_memory[client]);
@ -1345,8 +1346,8 @@ bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
page += num; page += num;
} }
mr_offset = (ram_addr_t)(page << TARGET_PAGE_BITS) - ramblock->offset; mr_offset = (ram_addr_t)(start_page << TARGET_PAGE_BITS) - ramblock->offset;
mr_size = (end - page) << TARGET_PAGE_BITS; mr_size = (end - start_page) << TARGET_PAGE_BITS;
memory_region_clear_dirty_bitmap(ramblock->mr, mr_offset, mr_size); memory_region_clear_dirty_bitmap(ramblock->mr, mr_offset, mr_size);
} }

99
hw/acpi/ich9.c
View File

@ -357,81 +357,6 @@ static void ich9_pm_set_cpu_hotplug_legacy(Object *obj, bool value,
s->pm.cpu_hotplug_legacy = value; s->pm.cpu_hotplug_legacy = value;
} }
static void ich9_pm_get_disable_s3(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
ICH9LPCPMRegs *pm = opaque;
uint8_t value = pm->disable_s3;
visit_type_uint8(v, name, &value, errp);
}
static void ich9_pm_set_disable_s3(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
ICH9LPCPMRegs *pm = opaque;
Error *local_err = NULL;
uint8_t value;
visit_type_uint8(v, name, &value, &local_err);
if (local_err) {
goto out;
}
pm->disable_s3 = value;
out:
error_propagate(errp, local_err);
}
static void ich9_pm_get_disable_s4(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
ICH9LPCPMRegs *pm = opaque;
uint8_t value = pm->disable_s4;
visit_type_uint8(v, name, &value, errp);
}
static void ich9_pm_set_disable_s4(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
ICH9LPCPMRegs *pm = opaque;
Error *local_err = NULL;
uint8_t value;
visit_type_uint8(v, name, &value, &local_err);
if (local_err) {
goto out;
}
pm->disable_s4 = value;
out:
error_propagate(errp, local_err);
}
static void ich9_pm_get_s4_val(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
ICH9LPCPMRegs *pm = opaque;
uint8_t value = pm->s4_val;
visit_type_uint8(v, name, &value, errp);
}
static void ich9_pm_set_s4_val(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
ICH9LPCPMRegs *pm = opaque;
Error *local_err = NULL;
uint8_t value;
visit_type_uint8(v, name, &value, &local_err);
if (local_err) {
goto out;
}
pm->s4_val = value;
out:
error_propagate(errp, local_err);
}
static bool ich9_pm_get_enable_tco(Object *obj, Error **errp) static bool ich9_pm_get_enable_tco(Object *obj, Error **errp)
{ {
ICH9LPCState *s = ICH9_LPC_DEVICE(obj); ICH9LPCState *s = ICH9_LPC_DEVICE(obj);
@ -454,12 +379,12 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
pm->s4_val = 2; pm->s4_val = 2;
object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE, object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE,
&pm->pm_io_base, errp); &pm->pm_io_base, OBJ_PROP_FLAG_READ, errp);
object_property_add(obj, ACPI_PM_PROP_GPE0_BLK, "uint32", object_property_add(obj, ACPI_PM_PROP_GPE0_BLK, "uint32",
ich9_pm_get_gpe0_blk, ich9_pm_get_gpe0_blk,
NULL, NULL, pm, NULL); NULL, NULL, pm, NULL);
object_property_add_uint32_ptr(obj, ACPI_PM_PROP_GPE0_BLK_LEN, object_property_add_uint32_ptr(obj, ACPI_PM_PROP_GPE0_BLK_LEN,
&gpe0_len, errp); &gpe0_len, OBJ_PROP_FLAG_READ, errp);
object_property_add_bool(obj, "memory-hotplug-support", object_property_add_bool(obj, "memory-hotplug-support",
ich9_pm_get_memory_hotplug_support, ich9_pm_get_memory_hotplug_support,
ich9_pm_set_memory_hotplug_support, ich9_pm_set_memory_hotplug_support,
@ -468,18 +393,14 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
ich9_pm_get_cpu_hotplug_legacy, ich9_pm_get_cpu_hotplug_legacy,
ich9_pm_set_cpu_hotplug_legacy, ich9_pm_set_cpu_hotplug_legacy,
NULL); NULL);
object_property_add(obj, ACPI_PM_PROP_S3_DISABLED, "uint8", object_property_add_uint8_ptr(obj, ACPI_PM_PROP_S3_DISABLED,
ich9_pm_get_disable_s3, &pm->disable_s3, OBJ_PROP_FLAG_READWRITE,
ich9_pm_set_disable_s3, NULL);
NULL, pm, NULL); object_property_add_uint8_ptr(obj, ACPI_PM_PROP_S4_DISABLED,
object_property_add(obj, ACPI_PM_PROP_S4_DISABLED, "uint8", &pm->disable_s4, OBJ_PROP_FLAG_READWRITE,
ich9_pm_get_disable_s4, NULL);
ich9_pm_set_disable_s4, object_property_add_uint8_ptr(obj, ACPI_PM_PROP_S4_VAL,
NULL, pm, NULL); &pm->s4_val, OBJ_PROP_FLAG_READWRITE, NULL);
object_property_add(obj, ACPI_PM_PROP_S4_VAL, "uint8",
ich9_pm_get_s4_val,
ich9_pm_set_s4_val,
NULL, pm, NULL);
object_property_add_bool(obj, ACPI_PM_PROP_TCO_ENABLED, object_property_add_bool(obj, ACPI_PM_PROP_TCO_ENABLED,
ich9_pm_get_enable_tco, ich9_pm_get_enable_tco,
ich9_pm_set_enable_tco, ich9_pm_set_enable_tco,

6
hw/acpi/nvdimm.c
View File

@ -485,7 +485,7 @@ struct NvdimmFuncGetLabelDataOut {
/* the size of buffer filled by QEMU. */ /* the size of buffer filled by QEMU. */
uint32_t len; uint32_t len;
uint32_t func_ret_status; /* return status code. */ uint32_t func_ret_status; /* return status code. */
uint8_t out_buf[0]; /* the data got via Get Namesapce Label function. */ uint8_t out_buf[]; /* the data got via Get Namesapce Label function. */
} QEMU_PACKED; } QEMU_PACKED;
typedef struct NvdimmFuncGetLabelDataOut NvdimmFuncGetLabelDataOut; typedef struct NvdimmFuncGetLabelDataOut NvdimmFuncGetLabelDataOut;
QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncGetLabelDataOut) > NVDIMM_DSM_MEMORY_SIZE); QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncGetLabelDataOut) > NVDIMM_DSM_MEMORY_SIZE);
@ -493,7 +493,7 @@ QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncGetLabelDataOut) > NVDIMM_DSM_MEMORY_SIZE);
struct NvdimmFuncSetLabelDataIn { struct NvdimmFuncSetLabelDataIn {
uint32_t offset; /* the offset in the namespace label data area. */ uint32_t offset; /* the offset in the namespace label data area. */
uint32_t length; /* the size of data is to be written via the function. */ uint32_t length; /* the size of data is to be written via the function. */
uint8_t in_buf[0]; /* the data written to label data area. */ uint8_t in_buf[]; /* the data written to label data area. */
} QEMU_PACKED; } QEMU_PACKED;
typedef struct NvdimmFuncSetLabelDataIn NvdimmFuncSetLabelDataIn; typedef struct NvdimmFuncSetLabelDataIn NvdimmFuncSetLabelDataIn;
QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncSetLabelDataIn) + QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncSetLabelDataIn) +
@ -510,7 +510,7 @@ struct NvdimmFuncReadFITOut {
/* the size of buffer filled by QEMU. */ /* the size of buffer filled by QEMU. */
uint32_t len; uint32_t len;
uint32_t func_ret_status; /* return status code. */ uint32_t func_ret_status; /* return status code. */
uint8_t fit[0]; /* the FIT data. */ uint8_t fit[]; /* the FIT data. */
} QEMU_PACKED; } QEMU_PACKED;
typedef struct NvdimmFuncReadFITOut NvdimmFuncReadFITOut; typedef struct NvdimmFuncReadFITOut NvdimmFuncReadFITOut;
QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncReadFITOut) > NVDIMM_DSM_MEMORY_SIZE); QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncReadFITOut) > NVDIMM_DSM_MEMORY_SIZE);

7
hw/acpi/pcihp.c
View File

@ -80,7 +80,8 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque)
*bus_bsel = (*bsel_alloc)++; *bus_bsel = (*bsel_alloc)++;
object_property_add_uint32_ptr(OBJECT(bus), ACPI_PCIHP_PROP_BSEL, object_property_add_uint32_ptr(OBJECT(bus), ACPI_PCIHP_PROP_BSEL,
bus_bsel, &error_abort); bus_bsel, OBJ_PROP_FLAG_READ,
&error_abort);
} }
return bsel_alloc; return bsel_alloc;
@ -373,9 +374,9 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus,
memory_region_add_subregion(address_space_io, s->io_base, &s->io); memory_region_add_subregion(address_space_io, s->io_base, &s->io);
object_property_add_uint16_ptr(owner, ACPI_PCIHP_IO_BASE_PROP, &s->io_base, object_property_add_uint16_ptr(owner, ACPI_PCIHP_IO_BASE_PROP, &s->io_base,
&error_abort); OBJ_PROP_FLAG_READ, &error_abort);
object_property_add_uint16_ptr(owner, ACPI_PCIHP_IO_LEN_PROP, &s->io_len, object_property_add_uint16_ptr(owner, ACPI_PCIHP_IO_LEN_PROP, &s->io_len,
&error_abort); OBJ_PROP_FLAG_READ, &error_abort);
} }
const VMStateDescription vmstate_acpi_pcihp_pci_status = { const VMStateDescription vmstate_acpi_pcihp_pci_status = {

12
hw/acpi/piix4.c
View File

@ -444,17 +444,17 @@ static void piix4_pm_add_propeties(PIIX4PMState *s)
static const uint16_t sci_int = 9; static const uint16_t sci_int = 9;
object_property_add_uint8_ptr(OBJECT(s), ACPI_PM_PROP_ACPI_ENABLE_CMD, object_property_add_uint8_ptr(OBJECT(s), ACPI_PM_PROP_ACPI_ENABLE_CMD,
&acpi_enable_cmd, NULL); &acpi_enable_cmd, OBJ_PROP_FLAG_READ, NULL);
object_property_add_uint8_ptr(OBJECT(s), ACPI_PM_PROP_ACPI_DISABLE_CMD, object_property_add_uint8_ptr(OBJECT(s), ACPI_PM_PROP_ACPI_DISABLE_CMD,
&acpi_disable_cmd, NULL); &acpi_disable_cmd, OBJ_PROP_FLAG_READ, NULL);
object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_GPE0_BLK, object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_GPE0_BLK,
&gpe0_blk, NULL); &gpe0_blk, OBJ_PROP_FLAG_READ, NULL);
object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_GPE0_BLK_LEN, object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_GPE0_BLK_LEN,
&gpe0_blk_len, NULL); &gpe0_blk_len, OBJ_PROP_FLAG_READ, NULL);
object_property_add_uint16_ptr(OBJECT(s), ACPI_PM_PROP_SCI_INT, object_property_add_uint16_ptr(OBJECT(s), ACPI_PM_PROP_SCI_INT,
&sci_int, NULL); &sci_int, OBJ_PROP_FLAG_READ, NULL);
object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_PM_IO_BASE, object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_PM_IO_BASE,
&s->io_base, NULL); &s->io_base, OBJ_PROP_FLAG_READ, NULL);
} }
static void piix4_pm_realize(PCIDevice *dev, Error **errp) static void piix4_pm_realize(PCIDevice *dev, Error **errp)

14
hw/arm/exynos4210.c
View File

@ -305,23 +305,21 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp)
/*** Memory ***/ /*** Memory ***/
/* Chip-ID and OMR */ /* Chip-ID and OMR */
memory_region_init_io(&s->chipid_mem, NULL, &exynos4210_chipid_and_omr_ops, memory_region_init_io(&s->chipid_mem, OBJECT(socdev),
NULL, "exynos4210.chipid", sizeof(chipid_and_omr)); &exynos4210_chipid_and_omr_ops, NULL,
"exynos4210.chipid", sizeof(chipid_and_omr));
memory_region_add_subregion(system_mem, EXYNOS4210_CHIPID_ADDR, memory_region_add_subregion(system_mem, EXYNOS4210_CHIPID_ADDR,
&s->chipid_mem); &s->chipid_mem);
/* Internal ROM */ /* Internal ROM */
memory_region_init_ram(&s->irom_mem, NULL, "exynos4210.irom", memory_region_init_rom(&s->irom_mem, OBJECT(socdev), "exynos4210.irom",
EXYNOS4210_IROM_SIZE, &error_fatal); EXYNOS4210_IROM_SIZE, &error_fatal);
memory_region_set_readonly(&s->irom_mem, true);
memory_region_add_subregion(system_mem, EXYNOS4210_IROM_BASE_ADDR, memory_region_add_subregion(system_mem, EXYNOS4210_IROM_BASE_ADDR,
&s->irom_mem); &s->irom_mem);
/* mirror of iROM */ /* mirror of iROM */
memory_region_init_alias(&s->irom_alias_mem, NULL, "exynos4210.irom_alias", memory_region_init_alias(&s->irom_alias_mem, OBJECT(socdev),
&s->irom_mem, "exynos4210.irom_alias", &s->irom_mem, 0,
0,
EXYNOS4210_IROM_SIZE); EXYNOS4210_IROM_SIZE);
memory_region_set_readonly(&s->irom_alias_mem, true);
memory_region_add_subregion(system_mem, EXYNOS4210_IROM_MIRROR_BASE_ADDR, memory_region_add_subregion(system_mem, EXYNOS4210_IROM_MIRROR_BASE_ADDR,
&s->irom_alias_mem); &s->irom_alias_mem);

10
hw/arm/fsl-imx25.c
View File

@ -303,16 +303,16 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp)
} }
/* initialize 2 x 16 KB ROM */ /* initialize 2 x 16 KB ROM */
memory_region_init_rom(&s->rom[0], NULL, memory_region_init_rom(&s->rom[0], OBJECT(dev), "imx25.rom0",
"imx25.rom0", FSL_IMX25_ROM0_SIZE, &err); FSL_IMX25_ROM0_SIZE, &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
return; return;
} }
memory_region_add_subregion(get_system_memory(), FSL_IMX25_ROM0_ADDR, memory_region_add_subregion(get_system_memory(), FSL_IMX25_ROM0_ADDR,
&s->rom[0]); &s->rom[0]);
memory_region_init_rom(&s->rom[1], NULL, memory_region_init_rom(&s->rom[1], OBJECT(dev), "imx25.rom1",
"imx25.rom1", FSL_IMX25_ROM1_SIZE, &err); FSL_IMX25_ROM1_SIZE, &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
return; return;
@ -331,7 +331,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp)
&s->iram); &s->iram);
/* internal RAM (128 KB) is aliased over 128 MB - 128 KB */ /* internal RAM (128 KB) is aliased over 128 MB - 128 KB */
memory_region_init_alias(&s->iram_alias, NULL, "imx25.iram_alias", memory_region_init_alias(&s->iram_alias, OBJECT(dev), "imx25.iram_alias",
&s->iram, 0, FSL_IMX25_IRAM_ALIAS_SIZE); &s->iram, 0, FSL_IMX25_IRAM_ALIAS_SIZE);
memory_region_add_subregion(get_system_memory(), FSL_IMX25_IRAM_ALIAS_ADDR, memory_region_add_subregion(get_system_memory(), FSL_IMX25_IRAM_ALIAS_ADDR,
&s->iram_alias); &s->iram_alias);

6
hw/arm/fsl-imx31.c
View File

@ -206,7 +206,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp)
} }
/* On a real system, the first 16k is a `secure boot rom' */ /* On a real system, the first 16k is a `secure boot rom' */
memory_region_init_rom(&s->secure_rom, NULL, "imx31.secure_rom", memory_region_init_rom(&s->secure_rom, OBJECT(dev), "imx31.secure_rom",
FSL_IMX31_SECURE_ROM_SIZE, &err); FSL_IMX31_SECURE_ROM_SIZE, &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
@ -216,7 +216,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp)
&s->secure_rom); &s->secure_rom);
/* There is also a 16k ROM */ /* There is also a 16k ROM */
memory_region_init_rom(&s->rom, NULL, "imx31.rom", memory_region_init_rom(&s->rom, OBJECT(dev), "imx31.rom",
FSL_IMX31_ROM_SIZE, &err); FSL_IMX31_ROM_SIZE, &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
@ -236,7 +236,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp)
&s->iram); &s->iram);
/* internal RAM (16 KB) is aliased over 256 MB - 16 KB */ /* internal RAM (16 KB) is aliased over 256 MB - 16 KB */
memory_region_init_alias(&s->iram_alias, NULL, "imx31.iram_alias", memory_region_init_alias(&s->iram_alias, OBJECT(dev), "imx31.iram_alias",
&s->iram, 0, FSL_IMX31_IRAM_ALIAS_SIZE); &s->iram, 0, FSL_IMX31_IRAM_ALIAS_SIZE);
memory_region_add_subregion(get_system_memory(), FSL_IMX31_IRAM_ALIAS_ADDR, memory_region_add_subregion(get_system_memory(), FSL_IMX31_IRAM_ALIAS_ADDR,
&s->iram_alias); &s->iram_alias);

6
hw/arm/fsl-imx6.c
View File

@ -441,7 +441,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
} }
/* ROM memory */ /* ROM memory */
memory_region_init_rom(&s->rom, NULL, "imx6.rom", memory_region_init_rom(&s->rom, OBJECT(dev), "imx6.rom",
FSL_IMX6_ROM_SIZE, &err); FSL_IMX6_ROM_SIZE, &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
@ -451,7 +451,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
&s->rom); &s->rom);
/* CAAM memory */ /* CAAM memory */
memory_region_init_rom(&s->caam, NULL, "imx6.caam", memory_region_init_rom(&s->caam, OBJECT(dev), "imx6.caam",
FSL_IMX6_CAAM_MEM_SIZE, &err); FSL_IMX6_CAAM_MEM_SIZE, &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
@ -471,7 +471,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
&s->ocram); &s->ocram);
/* internal OCRAM (256 KB) is aliased over 1 MB */ /* internal OCRAM (256 KB) is aliased over 1 MB */
memory_region_init_alias(&s->ocram_alias, NULL, "imx6.ocram_alias", memory_region_init_alias(&s->ocram_alias, OBJECT(dev), "imx6.ocram_alias",
&s->ocram, 0, FSL_IMX6_OCRAM_ALIAS_SIZE); &s->ocram, 0, FSL_IMX6_OCRAM_ALIAS_SIZE);
memory_region_add_subregion(get_system_memory(), FSL_IMX6_OCRAM_ALIAS_ADDR, memory_region_add_subregion(get_system_memory(), FSL_IMX6_OCRAM_ALIAS_ADDR,
&s->ocram_alias); &s->ocram_alias);

9
hw/arm/fsl-imx6ul.c
View File

@ -592,7 +592,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)
/* /*
* ROM memory * ROM memory
*/ */
memory_region_init_rom(&s->rom, NULL, "imx6ul.rom", memory_region_init_rom(&s->rom, OBJECT(dev), "imx6ul.rom",
FSL_IMX6UL_ROM_SIZE, &error_abort); FSL_IMX6UL_ROM_SIZE, &error_abort);
memory_region_add_subregion(get_system_memory(), FSL_IMX6UL_ROM_ADDR, memory_region_add_subregion(get_system_memory(), FSL_IMX6UL_ROM_ADDR,
&s->rom); &s->rom);
@ -600,7 +600,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)
/* /*
* CAAM memory * CAAM memory
*/ */
memory_region_init_rom(&s->caam, NULL, "imx6ul.caam", memory_region_init_rom(&s->caam, OBJECT(dev), "imx6ul.caam",
FSL_IMX6UL_CAAM_MEM_SIZE, &error_abort); FSL_IMX6UL_CAAM_MEM_SIZE, &error_abort);
memory_region_add_subregion(get_system_memory(), FSL_IMX6UL_CAAM_MEM_ADDR, memory_region_add_subregion(get_system_memory(), FSL_IMX6UL_CAAM_MEM_ADDR,
&s->caam); &s->caam);
@ -617,8 +617,9 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)
/* /*
* internal OCRAM (128 KB) is aliased over 512 KB * internal OCRAM (128 KB) is aliased over 512 KB
*/ */
memory_region_init_alias(&s->ocram_alias, NULL, "imx6ul.ocram_alias", memory_region_init_alias(&s->ocram_alias, OBJECT(dev),
&s->ocram, 0, FSL_IMX6UL_OCRAM_ALIAS_SIZE); "imx6ul.ocram_alias", &s->ocram, 0,
FSL_IMX6UL_OCRAM_ALIAS_SIZE);
memory_region_add_subregion(get_system_memory(), memory_region_add_subregion(get_system_memory(),
FSL_IMX6UL_OCRAM_ALIAS_ADDR, &s->ocram_alias); FSL_IMX6UL_OCRAM_ALIAS_ADDR, &s->ocram_alias);
} }

3
hw/arm/mainstone.c
View File

@ -124,9 +124,8 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,
/* Setup CPU & memory */ /* Setup CPU & memory */
mpu = pxa270_init(address_space_mem, mainstone_binfo.ram_size, mpu = pxa270_init(address_space_mem, mainstone_binfo.ram_size,
machine->cpu_type); machine->cpu_type);
memory_region_init_ram(rom, NULL, "mainstone.rom", MAINSTONE_ROM, memory_region_init_rom(rom, NULL, "mainstone.rom", MAINSTONE_ROM,
&error_fatal); &error_fatal);
memory_region_set_readonly(rom, true);
memory_region_add_subregion(address_space_mem, 0, rom); memory_region_add_subregion(address_space_mem, 0, rom);
/* There are two 32MiB flash devices on the board */ /* There are two 32MiB flash devices on the board */

6
hw/arm/msf2-soc.c
View File

@ -96,7 +96,7 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp)
MemoryRegion *nvm_alias = g_new(MemoryRegion, 1); MemoryRegion *nvm_alias = g_new(MemoryRegion, 1);
MemoryRegion *sram = g_new(MemoryRegion, 1); MemoryRegion *sram = g_new(MemoryRegion, 1);
memory_region_init_rom(nvm, NULL, "MSF2.eNVM", s->envm_size, memory_region_init_rom(nvm, OBJECT(dev_soc), "MSF2.eNVM", s->envm_size,
&error_fatal); &error_fatal);
/* /*
* On power-on, the eNVM region 0x60000000 is automatically * On power-on, the eNVM region 0x60000000 is automatically
@ -104,8 +104,8 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp)
* start address (0x0). We do not support remapping other eNVM, * start address (0x0). We do not support remapping other eNVM,
* eSRAM and DDR regions by guest(via Sysreg) currently. * eSRAM and DDR regions by guest(via Sysreg) currently.
*/ */
memory_region_init_alias(nvm_alias, NULL, "MSF2.eNVM", memory_region_init_alias(nvm_alias, OBJECT(dev_soc), "MSF2.eNVM", nvm, 0,
nvm, 0, s->envm_size); s->envm_size);
memory_region_add_subregion(system_memory, ENVM_BASE_ADDRESS, nvm); memory_region_add_subregion(system_memory, ENVM_BASE_ADDRESS, nvm);
memory_region_add_subregion(system_memory, 0, nvm_alias); memory_region_add_subregion(system_memory, 0, nvm_alias);

2
hw/arm/nrf51_soc.c
View File

@ -165,7 +165,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp)
} }
/* STUB Peripherals */ /* STUB Peripherals */
memory_region_init_io(&s->clock, NULL, &clock_ops, NULL, memory_region_init_io(&s->clock, OBJECT(dev_soc), &clock_ops, NULL,
"nrf51_soc.clock", 0x1000); "nrf51_soc.clock", 0x1000);
memory_region_add_subregion_overlap(&s->container, memory_region_add_subregion_overlap(&s->container,
NRF51_IOMEM_BASE, &s->clock, -1); NRF51_IOMEM_BASE, &s->clock, -1);

6
hw/arm/omap_sx1.c
View File

@ -131,9 +131,8 @@ static void sx1_init(MachineState *machine, const int version)
mpu = omap310_mpu_init(machine->ram, machine->cpu_type); mpu = omap310_mpu_init(machine->ram, machine->cpu_type);
/* External Flash (EMIFS) */ /* External Flash (EMIFS) */
memory_region_init_ram(flash, NULL, "omap_sx1.flash0-0", flash_size, memory_region_init_rom(flash, NULL, "omap_sx1.flash0-0", flash_size,
&error_fatal); &error_fatal);
memory_region_set_readonly(flash, true);
memory_region_add_subregion(address_space, OMAP_CS0_BASE, flash); memory_region_add_subregion(address_space, OMAP_CS0_BASE, flash);
memory_region_init_io(&cs[0], NULL, &static_ops, &cs0val, memory_region_init_io(&cs[0], NULL, &static_ops, &cs0val,
@ -167,9 +166,8 @@ static void sx1_init(MachineState *machine, const int version)
if ((version == 1) && if ((version == 1) &&
(dinfo = drive_get(IF_PFLASH, 0, fl_idx)) != NULL) { (dinfo = drive_get(IF_PFLASH, 0, fl_idx)) != NULL) {
MemoryRegion *flash_1 = g_new(MemoryRegion, 1); MemoryRegion *flash_1 = g_new(MemoryRegion, 1);
memory_region_init_ram(flash_1, NULL, "omap_sx1.flash1-0", memory_region_init_rom(flash_1, NULL, "omap_sx1.flash1-0",
flash1_size, &error_fatal); flash1_size, &error_fatal);
memory_region_set_readonly(flash_1, true);
memory_region_add_subregion(address_space, OMAP_CS1_BASE, flash_1); memory_region_add_subregion(address_space, OMAP_CS1_BASE, flash_1);
memory_region_init_io(&cs[1], NULL, &static_ops, &cs1val, memory_region_init_io(&cs[1], NULL, &static_ops, &cs1val,

3
hw/arm/palm.c
View File

@ -213,9 +213,8 @@ static void palmte_init(MachineState *machine)
mpu = omap310_mpu_init(machine->ram, machine->cpu_type); mpu = omap310_mpu_init(machine->ram, machine->cpu_type);
/* External Flash (EMIFS) */ /* External Flash (EMIFS) */
memory_region_init_ram(flash, NULL, "palmte.flash", flash_size, memory_region_init_rom(flash, NULL, "palmte.flash", flash_size,
&error_fatal); &error_fatal);
memory_region_set_readonly(flash, true);
memory_region_add_subregion(address_space_mem, OMAP_CS0_BASE, flash); memory_region_add_subregion(address_space_mem, OMAP_CS0_BASE, flash);
memory_region_init_io(&cs[0], NULL, &static_ops, &cs0val, "palmte-cs0", memory_region_init_io(&cs[0], NULL, &static_ops, &cs0val, "palmte-cs0",

3
hw/arm/spitz.c
View File

@ -929,8 +929,7 @@ static void spitz_common_init(MachineState *machine,
sl_flash_register(mpu, (model == spitz) ? FLASH_128M : FLASH_1024M); sl_flash_register(mpu, (model == spitz) ? FLASH_128M : FLASH_1024M);
memory_region_init_ram(rom, NULL, "spitz.rom", SPITZ_ROM, &error_fatal); memory_region_init_rom(rom, NULL, "spitz.rom", SPITZ_ROM, &error_fatal);
memory_region_set_readonly(rom, true);
memory_region_add_subregion(address_space_mem, 0, rom); memory_region_add_subregion(address_space_mem, 0, rom);
/* Setup peripherals */ /* Setup peripherals */

3
hw/arm/stellaris.c
View File

@ -1300,9 +1300,8 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board)
sram_size = ((board->dc0 >> 18) + 1) * 1024; sram_size = ((board->dc0 >> 18) + 1) * 1024;
/* Flash programming is done via the SCU, so pretend it is ROM. */ /* Flash programming is done via the SCU, so pretend it is ROM. */
memory_region_init_ram(flash, NULL, "stellaris.flash", flash_size, memory_region_init_rom(flash, NULL, "stellaris.flash", flash_size,
&error_fatal); &error_fatal);
memory_region_set_readonly(flash, true);
memory_region_add_subregion(system_memory, 0, flash); memory_region_add_subregion(system_memory, 0, flash);
memory_region_init_ram(sram, NULL, "stellaris.sram", sram_size, memory_region_init_ram(sram, NULL, "stellaris.sram", sram_size,

11
hw/arm/stm32f205_soc.c
View File

@ -93,13 +93,10 @@ static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp)
MemoryRegion *flash = g_new(MemoryRegion, 1); MemoryRegion *flash = g_new(MemoryRegion, 1);
MemoryRegion *flash_alias = g_new(MemoryRegion, 1); MemoryRegion *flash_alias = g_new(MemoryRegion, 1);
memory_region_init_ram(flash, NULL, "STM32F205.flash", FLASH_SIZE, memory_region_init_rom(flash, OBJECT(dev_soc), "STM32F205.flash",
&error_fatal); FLASH_SIZE, &error_fatal);
memory_region_init_alias(flash_alias, NULL, "STM32F205.flash.alias", memory_region_init_alias(flash_alias, OBJECT(dev_soc),
flash, 0, FLASH_SIZE); "STM32F205.flash.alias", flash, 0, FLASH_SIZE);
memory_region_set_readonly(flash, true);
memory_region_set_readonly(flash_alias, true);
memory_region_add_subregion(system_memory, FLASH_BASE_ADDRESS, flash); memory_region_add_subregion(system_memory, FLASH_BASE_ADDRESS, flash);
memory_region_add_subregion(system_memory, 0, flash_alias); memory_region_add_subregion(system_memory, 0, flash_alias);

12
hw/arm/stm32f405_soc.c
View File

@ -95,17 +95,15 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp)
Error *err = NULL; Error *err = NULL;
int i; int i;
memory_region_init_ram(&s->flash, NULL, "STM32F405.flash", FLASH_SIZE, memory_region_init_rom(&s->flash, OBJECT(dev_soc), "STM32F405.flash",
&err); FLASH_SIZE, &err);
if (err != NULL) { if (err != NULL) {
error_propagate(errp, err); error_propagate(errp, err);
return; return;
} }
memory_region_init_alias(&s->flash_alias, NULL, "STM32F405.flash.alias", memory_region_init_alias(&s->flash_alias, OBJECT(dev_soc),
&s->flash, 0, FLASH_SIZE); "STM32F405.flash.alias", &s->flash, 0,
FLASH_SIZE);
memory_region_set_readonly(&s->flash, true);
memory_region_set_readonly(&s->flash_alias, true);
memory_region_add_subregion(system_memory, FLASH_BASE_ADDRESS, &s->flash); memory_region_add_subregion(system_memory, FLASH_BASE_ADDRESS, &s->flash);
memory_region_add_subregion(system_memory, 0, &s->flash_alias); memory_region_add_subregion(system_memory, 0, &s->flash_alias);

3
hw/arm/tosa.c
View File

@ -226,8 +226,7 @@ static void tosa_init(MachineState *machine)
mpu = pxa255_init(address_space_mem, tosa_binfo.ram_size); mpu = pxa255_init(address_space_mem, tosa_binfo.ram_size);
memory_region_init_ram(rom, NULL, "tosa.rom", TOSA_ROM, &error_fatal); memory_region_init_rom(rom, NULL, "tosa.rom", TOSA_ROM, &error_fatal);
memory_region_set_readonly(rom, true);
memory_region_add_subregion(address_space_mem, 0, rom); memory_region_add_subregion(address_space_mem, 0, rom);
tmio = tc6393xb_init(address_space_mem, 0x10000000, tmio = tc6393xb_init(address_space_mem, 0x10000000,

11
hw/arm/xlnx-zynqmp.c
View File

@ -318,9 +318,9 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
ddr_low_size = XLNX_ZYNQMP_MAX_LOW_RAM_SIZE; ddr_low_size = XLNX_ZYNQMP_MAX_LOW_RAM_SIZE;
ddr_high_size = ram_size - XLNX_ZYNQMP_MAX_LOW_RAM_SIZE; ddr_high_size = ram_size - XLNX_ZYNQMP_MAX_LOW_RAM_SIZE;
memory_region_init_alias(&s->ddr_ram_high, NULL, memory_region_init_alias(&s->ddr_ram_high, OBJECT(dev),
"ddr-ram-high", s->ddr_ram, "ddr-ram-high", s->ddr_ram, ddr_low_size,
ddr_low_size, ddr_high_size); ddr_high_size);
memory_region_add_subregion(get_system_memory(), memory_region_add_subregion(get_system_memory(),
XLNX_ZYNQMP_HIGH_RAM_START, XLNX_ZYNQMP_HIGH_RAM_START,
&s->ddr_ram_high); &s->ddr_ram_high);
@ -330,9 +330,8 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
ddr_low_size = ram_size; ddr_low_size = ram_size;
} }
memory_region_init_alias(&s->ddr_ram_low, NULL, memory_region_init_alias(&s->ddr_ram_low, OBJECT(dev), "ddr-ram-low",
"ddr-ram-low", s->ddr_ram, s->ddr_ram, 0, ddr_low_size);
0, ddr_low_size);
memory_region_add_subregion(get_system_memory(), 0, &s->ddr_ram_low); memory_region_add_subregion(get_system_memory(), 0, &s->ddr_ram_low);
/* Create the four OCM banks */ /* Create the four OCM banks */

4
hw/audio/fmopl.c
View File

@ -186,7 +186,7 @@ static int32_t *VIB_TABLE;
/* envelope output curve table */ /* envelope output curve table */
/* attack + decay + OFF */ /* attack + decay + OFF */
static int32_t ENV_CURVE[2*EG_ENT+1]; static int32_t *ENV_CURVE;
/* multiple table */ /* multiple table */
#define ML 2 #define ML 2
@ -1090,6 +1090,7 @@ FM_OPL *OPLCreate(int clock, int rate)
OPL->clock = clock; OPL->clock = clock;
OPL->rate = rate; OPL->rate = rate;
OPL->max_ch = max_ch; OPL->max_ch = max_ch;
ENV_CURVE = g_new(int32_t, 2 * EG_ENT + 1);
/* init grobal tables */ /* init grobal tables */
OPL_initialize(OPL); OPL_initialize(OPL);
/* reset chip */ /* reset chip */
@ -1127,6 +1128,7 @@ void OPLDestroy(FM_OPL *OPL)
#endif #endif
OPL_UnLockTable(); OPL_UnLockTable();
free(OPL); free(OPL);
g_free(ENV_CURVE);
} }
/* ---------- Option handlers ---------- */ /* ---------- Option handlers ---------- */

24
hw/audio/intel-hda.c
View File

@ -181,7 +181,9 @@ struct IntelHDAState {
IntelHDAStream st[8]; IntelHDAStream st[8];
/* state */ /* state */
MemoryRegion container;
MemoryRegion mmio; MemoryRegion mmio;
MemoryRegion alias;
uint32_t rirb_count; uint32_t rirb_count;
int64_t wall_base_ns; int64_t wall_base_ns;
@ -670,12 +672,6 @@ static const struct IntelHDAReg regtab[] = {
.offset = offsetof(IntelHDAState, wall_clk), .offset = offsetof(IntelHDAState, wall_clk),
.rhandler = intel_hda_get_wall_clk, .rhandler = intel_hda_get_wall_clk,
}, },
[ ICH6_REG_WALLCLK + 0x2000 ] = {
.name = "WALLCLK(alias)",
.size = 4,
.offset = offsetof(IntelHDAState, wall_clk),
.rhandler = intel_hda_get_wall_clk,
},
/* dma engine */ /* dma engine */
[ ICH6_REG_CORBLBASE ] = { [ ICH6_REG_CORBLBASE ] = {
@ -837,12 +833,6 @@ static const struct IntelHDAReg regtab[] = {
.size = 4, \ .size = 4, \
.offset = offsetof(IntelHDAState, st[_i].lpib), \ .offset = offsetof(IntelHDAState, st[_i].lpib), \
}, \ }, \
[ ST_REG(_i, ICH6_REG_SD_LPIB) + 0x2000 ] = { \
.stream = _i, \
.name = _t stringify(_i) " LPIB(alias)", \
.size = 4, \
.offset = offsetof(IntelHDAState, st[_i].lpib), \
}, \
[ ST_REG(_i, ICH6_REG_SD_CBL) ] = { \ [ ST_REG(_i, ICH6_REG_SD_CBL) ] = { \
.stream = _i, \ .stream = _i, \
.name = _t stringify(_i) " CBL", \ .name = _t stringify(_i) " CBL", \
@ -1125,9 +1115,15 @@ static void intel_hda_realize(PCIDevice *pci, Error **errp)
error_free(err); error_free(err);
} }
memory_region_init(&d->container, OBJECT(d),
"intel-hda-container", 0x4000);
memory_region_init_io(&d->mmio, OBJECT(d), &intel_hda_mmio_ops, d, memory_region_init_io(&d->mmio, OBJECT(d), &intel_hda_mmio_ops, d,
"intel-hda", 0x4000); "intel-hda", 0x2000);
pci_register_bar(&d->pci, 0, 0, &d->mmio); memory_region_add_subregion(&d->container, 0x0000, &d->mmio);
memory_region_init_alias(&d->alias, OBJECT(d), "intel-hda-alias",
&d->mmio, 0, 0x2000);
memory_region_add_subregion(&d->container, 0x2000, &d->alias);
pci_register_bar(&d->pci, 0, 0, &d->container);
hda_codec_bus_init(DEVICE(pci), &d->codecs, sizeof(d->codecs), hda_codec_bus_init(DEVICE(pci), &d->codecs, sizeof(d->codecs),
intel_hda_response, intel_hda_xfer); intel_hda_response, intel_hda_xfer);

2
hw/char/sclpconsole-lm.c
View File

@ -31,7 +31,7 @@
typedef struct OprtnsCommand { typedef struct OprtnsCommand {
EventBufferHeader header; EventBufferHeader header;
MDMSU message_unit; MDMSU message_unit;
char data[0]; char data[];
} QEMU_PACKED OprtnsCommand; } QEMU_PACKED OprtnsCommand;
/* max size for line-mode data in 4K SCCB page */ /* max size for line-mode data in 4K SCCB page */

2
hw/char/sclpconsole.c
View File

@ -25,7 +25,7 @@
typedef struct ASCIIConsoleData { typedef struct ASCIIConsoleData {
EventBufferHeader ebh; EventBufferHeader ebh;
char data[0]; char data[];
} QEMU_PACKED ASCIIConsoleData; } QEMU_PACKED ASCIIConsoleData;
/* max size for ASCII data in 4K SCCB page */ /* max size for ASCII data in 4K SCCB page */

7
hw/char/serial.c
View File

@ -997,7 +997,7 @@ static void serial_io_realize(DeviceState *dev, Error **errp)
return; return;
} }
memory_region_init_io(&s->io, NULL, &serial_io_ops, s, "serial", 8); memory_region_init_io(&s->io, OBJECT(dev), &serial_io_ops, s, "serial", 8);
sysbus_init_mmio(SYS_BUS_DEVICE(sio), &s->io); sysbus_init_mmio(SYS_BUS_DEVICE(sio), &s->io);
sysbus_init_irq(SYS_BUS_DEVICE(sio), &s->irq); sysbus_init_irq(SYS_BUS_DEVICE(sio), &s->irq);
} }
@ -1106,8 +1106,9 @@ static void serial_mm_realize(DeviceState *dev, Error **errp)
return; return;
} }
memory_region_init_io(&s->io, NULL, &serial_mm_ops[smm->endianness], smm, memory_region_init_io(&s->io, OBJECT(dev),
"serial", 8 << smm->regshift); &serial_mm_ops[smm->endianness], smm, "serial",
8 << smm->regshift);
sysbus_init_mmio(SYS_BUS_DEVICE(smm), &s->io); sysbus_init_mmio(SYS_BUS_DEVICE(smm), &s->io);
sysbus_init_irq(SYS_BUS_DEVICE(smm), &smm->serial.irq); sysbus_init_irq(SYS_BUS_DEVICE(smm), &smm->serial.irq);
} }

25
hw/core/loader.c
View File

@ -1119,19 +1119,26 @@ static void rom_reset(void *unused)
{ {
Rom *rom; Rom *rom;
/*
* We don't need to fill in the RAM with ROM data because we'll fill
* the data in during the next incoming migration in all cases. Note
* that some of those RAMs can actually be modified by the guest on ARM
* so this is probably the only right thing to do here.
*/
if (runstate_check(RUN_STATE_INMIGRATE))
return;
QTAILQ_FOREACH(rom, &roms, next) { QTAILQ_FOREACH(rom, &roms, next) {
if (rom->fw_file) { if (rom->fw_file) {
continue; continue;
} }
/*
* We don't need to fill in the RAM with ROM data because we'll fill
* the data in during the next incoming migration in all cases. Note
* that some of those RAMs can actually be modified by the guest.
*/
if (runstate_check(RUN_STATE_INMIGRATE)) {
if (rom->data && rom->isrom) {
/*
* Free it so that a rom_reset after migration doesn't
* overwrite a potentially modified 'rom'.
*/
rom_free_data(rom);
}
continue;
}
if (rom->data == NULL) { if (rom->data == NULL) {
continue; continue;
} }

3
hw/core/platform-bus.c
View File

@ -187,7 +187,8 @@ static void platform_bus_realize(DeviceState *dev, Error **errp)
d = SYS_BUS_DEVICE(dev); d = SYS_BUS_DEVICE(dev);
pbus = PLATFORM_BUS_DEVICE(dev); pbus = PLATFORM_BUS_DEVICE(dev);
memory_region_init(&pbus->mmio, NULL, "platform bus", pbus->mmio_size); memory_region_init(&pbus->mmio, OBJECT(dev), "platform bus",
pbus->mmio_size);
sysbus_init_mmio(d, &pbus->mmio); sysbus_init_mmio(d, &pbus->mmio);
pbus->used_irqs = bitmap_new(pbus->num_irqs); pbus->used_irqs = bitmap_new(pbus->num_irqs);

5
hw/display/cg3.c
View File

@ -287,9 +287,8 @@ static void cg3_initfn(Object *obj)
SysBusDevice *sbd = SYS_BUS_DEVICE(obj); SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
CG3State *s = CG3(obj); CG3State *s = CG3(obj);
memory_region_init_ram_nomigrate(&s->rom, obj, "cg3.prom", FCODE_MAX_ROM_SIZE, memory_region_init_rom_nomigrate(&s->rom, obj, "cg3.prom",
&error_fatal); FCODE_MAX_ROM_SIZE, &error_fatal);
memory_region_set_readonly(&s->rom, true);
sysbus_init_mmio(sbd, &s->rom); sysbus_init_mmio(sbd, &s->rom);
memory_region_init_io(&s->reg, obj, &cg3_reg_ops, s, "cg3.reg", memory_region_init_io(&s->reg, obj, &cg3_reg_ops, s, "cg3.reg",

3
hw/display/g364fb.c
View File

@ -477,7 +477,8 @@ static void g364fb_init(DeviceState *dev, G364State *s)
s->con = graphic_console_init(dev, 0, &g364fb_ops, s); s->con = graphic_console_init(dev, 0, &g364fb_ops, s);
memory_region_init_io(&s->mem_ctrl, NULL, &g364fb_ctrl_ops, s, "ctrl", 0x180000); memory_region_init_io(&s->mem_ctrl, OBJECT(dev), &g364fb_ctrl_ops, s,
"ctrl", 0x180000);
memory_region_init_ram_ptr(&s->mem_vram, NULL, "vram", memory_region_init_ram_ptr(&s->mem_vram, NULL, "vram",
s->vram_size, s->vram); s->vram_size, s->vram);
vmstate_register_ram(&s->mem_vram, dev); vmstate_register_ram(&s->mem_vram, dev);

4
hw/display/macfb.c
View File

@ -362,8 +362,8 @@ static void macfb_common_realize(DeviceState *dev, MacfbState *s, Error **errp)
return; return;
} }
memory_region_init_io(&s->mem_ctrl, NULL, &macfb_ctrl_ops, s, "macfb-ctrl", memory_region_init_io(&s->mem_ctrl, OBJECT(dev), &macfb_ctrl_ops, s,
0x1000); "macfb-ctrl", 0x1000);
memory_region_init_ram_nomigrate(&s->mem_vram, OBJECT(s), "macfb-vram", memory_region_init_ram_nomigrate(&s->mem_vram, OBJECT(s), "macfb-vram",
MACFB_VRAM_SIZE, errp); MACFB_VRAM_SIZE, errp);

5
hw/display/tcx.c
View File

@ -755,9 +755,8 @@ static void tcx_initfn(Object *obj)
SysBusDevice *sbd = SYS_BUS_DEVICE(obj); SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
TCXState *s = TCX(obj); TCXState *s = TCX(obj);
memory_region_init_ram_nomigrate(&s->rom, obj, "tcx.prom", FCODE_MAX_ROM_SIZE, memory_region_init_rom_nomigrate(&s->rom, obj, "tcx.prom",
&error_fatal); FCODE_MAX_ROM_SIZE, &error_fatal);
memory_region_set_readonly(&s->rom, true);
sysbus_init_mmio(sbd, &s->rom); sysbus_init_mmio(sbd, &s->rom);
/* 2/STIP : Stippler */ /* 2/STIP : Stippler */

2
hw/dma/i8257.c
View File

@ -553,7 +553,7 @@ static void i8257_realize(DeviceState *dev, Error **errp)
I8257State *d = I8257(dev); I8257State *d = I8257(dev);
int i; int i;
memory_region_init_io(&d->channel_io, NULL, &channel_io_ops, d, memory_region_init_io(&d->channel_io, OBJECT(dev), &channel_io_ops, d,
"dma-chan", 8 << d->dshift); "dma-chan", 8 << d->dshift);
memory_region_add_subregion(isa_address_space_io(isa), memory_region_add_subregion(isa_address_space_io(isa),
d->base, &d->channel_io); d->base, &d->channel_io);

4
hw/dma/rc4030.c
View File

@ -679,9 +679,9 @@ static void rc4030_realize(DeviceState *dev, Error **errp)
s->periodic_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, s->periodic_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
rc4030_periodic_timer, s); rc4030_periodic_timer, s);
memory_region_init_io(&s->iomem_chipset, NULL, &rc4030_ops, s, memory_region_init_io(&s->iomem_chipset, o, &rc4030_ops, s,
"rc4030.chipset", 0x300); "rc4030.chipset", 0x300);
memory_region_init_io(&s->iomem_jazzio, NULL, &jazzio_ops, s, memory_region_init_io(&s->iomem_jazzio, o, &jazzio_ops, s,
"rc4030.jazzio", 0x00001000); "rc4030.jazzio", 0x00001000);
memory_region_init_iommu(&s->dma_mr, sizeof(s->dma_mr), memory_region_init_iommu(&s->dma_mr, sizeof(s->dma_mr),

2
hw/dma/soc_dma.c
View File

@ -80,7 +80,7 @@ struct dma_s {
} *memmap; } *memmap;
int memmap_size; int memmap_size;
struct soc_dma_ch_s ch[0]; struct soc_dma_ch_s ch[];
}; };
static void soc_dma_ch_schedule(struct soc_dma_ch_s *ch, int delay_bytes) static void soc_dma_ch_schedule(struct soc_dma_ch_s *ch, int delay_bytes)

6
hw/i386/intel_iommu.c
View File

@ -3094,6 +3094,12 @@ static int vtd_irte_get(IntelIOMMUState *iommu, uint16_t index,
uint16_t mask, source_id; uint16_t mask, source_id;
uint8_t bus, bus_max, bus_min; uint8_t bus, bus_max, bus_min;
if (index >= iommu->intr_size) {
error_report_once("%s: index too large: ind=0x%x",
__func__, index);
return -VTD_FR_IR_INDEX_OVER;
}
addr = iommu->intr_root + index * sizeof(*entry); addr = iommu->intr_root + index * sizeof(*entry);
if (dma_memory_read(&address_space_memory, addr, entry, if (dma_memory_read(&address_space_memory, addr, entry,
sizeof(*entry))) { sizeof(*entry))) {

2
hw/i386/x86.c
View File

@ -328,7 +328,7 @@ struct setup_data {
uint64_t next; uint64_t next;
uint32_t type; uint32_t type;
uint32_t len; uint32_t len;
uint8_t data[0]; uint8_t data[];
} __attribute__((packed)); } __attribute__((packed));

37
hw/isa/lpc_ich9.c
View File

@ -625,36 +625,21 @@ static const MemoryRegionOps ich9_rst_cnt_ops = {
.endianness = DEVICE_LITTLE_ENDIAN .endianness = DEVICE_LITTLE_ENDIAN
}; };
static void ich9_lpc_get_sci_int(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
ICH9LPCState *lpc = ICH9_LPC_DEVICE(obj);
uint32_t value = lpc->sci_gsi;
visit_type_uint32(v, name, &value, errp);
}
static void ich9_lpc_add_properties(ICH9LPCState *lpc)
{
static const uint8_t acpi_enable_cmd = ICH9_APM_ACPI_ENABLE;
static const uint8_t acpi_disable_cmd = ICH9_APM_ACPI_DISABLE;
object_property_add(OBJECT(lpc), ACPI_PM_PROP_SCI_INT, "uint32",
ich9_lpc_get_sci_int,
NULL, NULL, NULL, NULL);
object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_ENABLE_CMD,
&acpi_enable_cmd, NULL);
object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_DISABLE_CMD,
&acpi_disable_cmd, NULL);
ich9_pm_add_properties(OBJECT(lpc), &lpc->pm, NULL);
}
static void ich9_lpc_initfn(Object *obj) static void ich9_lpc_initfn(Object *obj)
{ {
ICH9LPCState *lpc = ICH9_LPC_DEVICE(obj); ICH9LPCState *lpc = ICH9_LPC_DEVICE(obj);
ich9_lpc_add_properties(lpc); static const uint8_t acpi_enable_cmd = ICH9_APM_ACPI_ENABLE;
static const uint8_t acpi_disable_cmd = ICH9_APM_ACPI_DISABLE;
object_property_add_uint8_ptr(obj, ACPI_PM_PROP_SCI_INT,
&lpc->sci_gsi, OBJ_PROP_FLAG_READ, NULL);
object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_ENABLE_CMD,
&acpi_enable_cmd, OBJ_PROP_FLAG_READ, NULL);
object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_DISABLE_CMD,
&acpi_disable_cmd, OBJ_PROP_FLAG_READ, NULL);
ich9_pm_add_properties(obj, &lpc->pm, NULL);
} }
static void ich9_lpc_realize(PCIDevice *d, Error **errp) static void ich9_lpc_realize(PCIDevice *d, Error **errp)

2
hw/m68k/bootinfo.h
View File

@ -14,7 +14,7 @@
struct bi_record { struct bi_record {
uint16_t tag; /* tag ID */ uint16_t tag; /* tag ID */
uint16_t size; /* size of record */ uint16_t size; /* size of record */
uint32_t data[0]; /* data */ uint32_t data[]; /* data */
}; };
/* machine independent tags */ /* machine independent tags */

3
hw/m68k/q800.c
View File

@ -399,13 +399,12 @@ static void q800_init(MachineState *machine)
uint8_t *ptr; uint8_t *ptr;
/* allocate and load BIOS */ /* allocate and load BIOS */
rom = g_malloc(sizeof(*rom)); rom = g_malloc(sizeof(*rom));
memory_region_init_ram(rom, NULL, "m68k_mac.rom", MACROM_SIZE, memory_region_init_rom(rom, NULL, "m68k_mac.rom", MACROM_SIZE,
&error_abort); &error_abort);
if (bios_name == NULL) { if (bios_name == NULL) {
bios_name = MACROM_FILENAME; bios_name = MACROM_FILENAME;
} }
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
memory_region_set_readonly(rom, true);
memory_region_add_subregion(get_system_memory(), MACROM_ADDR, rom); memory_region_add_subregion(get_system_memory(), MACROM_ADDR, rom);
/* Load MacROM binary */ /* Load MacROM binary */

13
hw/misc/edu.c
View File

@ -396,21 +396,14 @@ static void pci_edu_uninit(PCIDevice *pdev)
msi_uninit(pdev); msi_uninit(pdev);
} }
static void edu_obj_uint64(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
uint64_t *val = opaque;
visit_type_uint64(v, name, val, errp);
}
static void edu_instance_init(Object *obj) static void edu_instance_init(Object *obj)
{ {
EduState *edu = EDU(obj); EduState *edu = EDU(obj);
edu->dma_mask = (1UL << 28) - 1; edu->dma_mask = (1UL << 28) - 1;
object_property_add(obj, "dma_mask", "uint64", edu_obj_uint64, object_property_add_uint64_ptr(obj, "dma_mask",
edu_obj_uint64, NULL, &edu->dma_mask, NULL); &edu->dma_mask, OBJ_PROP_FLAG_READWRITE,
NULL);
} }
static void edu_class_init(ObjectClass *class, void *data) static void edu_class_init(ObjectClass *class, void *data)

2
hw/misc/omap_l4.c
View File

@ -24,7 +24,7 @@ struct omap_l4_s {
MemoryRegion *address_space; MemoryRegion *address_space;
hwaddr base; hwaddr base;
int ta_num; int ta_num;
struct omap_target_agent_s ta[0]; struct omap_target_agent_s ta[];
}; };
struct omap_l4_s *omap_l4_init(MemoryRegion *address_space, struct omap_l4_s *omap_l4_init(MemoryRegion *address_space,

5
hw/net/dp8393x.c
View File

@ -986,13 +986,12 @@ static void dp8393x_realize(DeviceState *dev, Error **errp)
s->watchdog = timer_new_ns(QEMU_CLOCK_VIRTUAL, dp8393x_watchdog, s); s->watchdog = timer_new_ns(QEMU_CLOCK_VIRTUAL, dp8393x_watchdog, s);
memory_region_init_ram(&s->prom, OBJECT(dev), memory_region_init_rom(&s->prom, OBJECT(dev), "dp8393x-prom",
"dp8393x-prom", SONIC_PROM_SIZE, &local_err); SONIC_PROM_SIZE, &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
return; return;
} }
memory_region_set_readonly(&s->prom, true);
prom = memory_region_get_ram_ptr(&s->prom); prom = memory_region_get_ram_ptr(&s->prom);
checksum = 0; checksum = 0;
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {

2
hw/nvram/eeprom93xx.c
View File

@ -86,7 +86,7 @@ struct _eeprom_t {
uint8_t addrbits; uint8_t addrbits;
uint16_t size; uint16_t size;
uint16_t data; uint16_t data;
uint16_t contents[0]; uint16_t contents[];
}; };
/* Code for saving and restoring of EEPROM state. */ /* Code for saving and restoring of EEPROM state. */

3
hw/pci-host/prep.c
View File

@ -325,9 +325,8 @@ static void raven_realize(PCIDevice *d, Error **errp)
d->config[0x0D] = 0x10; // latency_timer d->config[0x0D] = 0x10; // latency_timer
d->config[0x34] = 0x00; // capabilities_pointer d->config[0x34] = 0x00; // capabilities_pointer
memory_region_init_ram_nomigrate(&s->bios, OBJECT(s), "bios", BIOS_SIZE, memory_region_init_rom_nomigrate(&s->bios, OBJECT(s), "bios", BIOS_SIZE,
&error_fatal); &error_fatal);
memory_region_set_readonly(&s->bios, true);
memory_region_add_subregion(get_system_memory(), (uint32_t)(-BIOS_SIZE), memory_region_add_subregion(get_system_memory(), (uint32_t)(-BIOS_SIZE),
&s->bios); &s->bios);
if (s->bios_name) { if (s->bios_name) {

14
hw/pci-host/q35.c
View File

@ -166,14 +166,6 @@ static void q35_host_get_pci_hole64_end(Object *obj, Visitor *v,
visit_type_uint64(v, name, &value, errp); visit_type_uint64(v, name, &value, errp);
} }
static void q35_host_get_mmcfg_size(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
PCIExpressHost *e = PCIE_HOST_BRIDGE(obj);
visit_type_uint64(v, name, &e->size, errp);
}
/* /*
* NOTE: setting defaults for the mch.* fields in this table * NOTE: setting defaults for the mch.* fields in this table
* doesn't work, because mch is a separate QOM object that is * doesn't work, because mch is a separate QOM object that is
@ -214,6 +206,7 @@ static void q35_host_initfn(Object *obj)
{ {
Q35PCIHost *s = Q35_HOST_DEVICE(obj); Q35PCIHost *s = Q35_HOST_DEVICE(obj);
PCIHostState *phb = PCI_HOST_BRIDGE(obj); PCIHostState *phb = PCI_HOST_BRIDGE(obj);
PCIExpressHost *pehb = PCIE_HOST_BRIDGE(obj);
memory_region_init_io(&phb->conf_mem, obj, &pci_host_conf_le_ops, phb, memory_region_init_io(&phb->conf_mem, obj, &pci_host_conf_le_ops, phb,
"pci-conf-idx", 4); "pci-conf-idx", 4);
@ -243,9 +236,8 @@ static void q35_host_initfn(Object *obj)
q35_host_get_pci_hole64_end, q35_host_get_pci_hole64_end,
NULL, NULL, NULL, NULL); NULL, NULL, NULL, NULL);
object_property_add(obj, PCIE_HOST_MCFG_SIZE, "uint64", object_property_add_uint64_ptr(obj, PCIE_HOST_MCFG_SIZE,
q35_host_get_mmcfg_size, &pehb->size, OBJ_PROP_FLAG_READ, NULL);
NULL, NULL, NULL, NULL);
object_property_add_link(obj, MCH_HOST_PROP_RAM_MEM, TYPE_MEMORY_REGION, object_property_add_link(obj, MCH_HOST_PROP_RAM_MEM, TYPE_MEMORY_REGION,
(Object **) &s->mch.ram_memory, (Object **) &s->mch.ram_memory,

3
hw/ppc/mac_newworld.c
View File

@ -155,13 +155,12 @@ static void ppc_core99_init(MachineState *machine)
memory_region_add_subregion(get_system_memory(), 0, machine->ram); memory_region_add_subregion(get_system_memory(), 0, machine->ram);
/* allocate and load BIOS */ /* allocate and load BIOS */
memory_region_init_ram(bios, NULL, "ppc_core99.bios", BIOS_SIZE, memory_region_init_rom(bios, NULL, "ppc_core99.bios", BIOS_SIZE,
&error_fatal); &error_fatal);
if (bios_name == NULL) if (bios_name == NULL)
bios_name = PROM_FILENAME; bios_name = PROM_FILENAME;
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
memory_region_set_readonly(bios, true);
memory_region_add_subregion(get_system_memory(), PROM_ADDR, bios); memory_region_add_subregion(get_system_memory(), PROM_ADDR, bios);
/* Load OpenBIOS (ELF) */ /* Load OpenBIOS (ELF) */

3
hw/ppc/mac_oldworld.c
View File

@ -129,13 +129,12 @@ static void ppc_heathrow_init(MachineState *machine)
memory_region_add_subregion(sysmem, 0, machine->ram); memory_region_add_subregion(sysmem, 0, machine->ram);
/* allocate and load BIOS */ /* allocate and load BIOS */
memory_region_init_ram(bios, NULL, "ppc_heathrow.bios", BIOS_SIZE, memory_region_init_rom(bios, NULL, "ppc_heathrow.bios", BIOS_SIZE,
&error_fatal); &error_fatal);
if (bios_name == NULL) if (bios_name == NULL)
bios_name = PROM_FILENAME; bios_name = PROM_FILENAME;
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
memory_region_set_readonly(bios, true);
memory_region_add_subregion(sysmem, PROM_ADDR, bios); memory_region_add_subregion(sysmem, PROM_ADDR, bios);
/* Load OpenBIOS (ELF) */ /* Load OpenBIOS (ELF) */

6
hw/ppc/ppc405_boards.c
View File

@ -199,7 +199,7 @@ static void ref405ep_init(MachineState *machine)
#endif #endif
{ {
bios = g_new(MemoryRegion, 1); bios = g_new(MemoryRegion, 1);
memory_region_init_ram(bios, NULL, "ef405ep.bios", BIOS_SIZE, memory_region_init_rom(bios, NULL, "ef405ep.bios", BIOS_SIZE,
&error_fatal); &error_fatal);
if (bios_name == NULL) if (bios_name == NULL)
@ -223,7 +223,6 @@ static void ref405ep_init(MachineState *machine)
/* Avoid an uninitialized variable warning */ /* Avoid an uninitialized variable warning */
bios_size = -1; bios_size = -1;
} }
memory_region_set_readonly(bios, true);
} }
/* Register FPGA */ /* Register FPGA */
ref405ep_fpga_init(sysmem, 0xF0300000); ref405ep_fpga_init(sysmem, 0xF0300000);
@ -471,7 +470,7 @@ static void taihu_405ep_init(MachineState *machine)
if (bios_name == NULL) if (bios_name == NULL)
bios_name = BIOS_FILENAME; bios_name = BIOS_FILENAME;
bios = g_new(MemoryRegion, 1); bios = g_new(MemoryRegion, 1);
memory_region_init_ram(bios, NULL, "taihu_405ep.bios", BIOS_SIZE, memory_region_init_rom(bios, NULL, "taihu_405ep.bios", BIOS_SIZE,
&error_fatal); &error_fatal);
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
if (filename) { if (filename) {
@ -489,7 +488,6 @@ static void taihu_405ep_init(MachineState *machine)
error_report("Could not load PowerPC BIOS '%s'", bios_name); error_report("Could not load PowerPC BIOS '%s'", bios_name);
exit(1); exit(1);
} }
memory_region_set_readonly(bios, true);
} }
/* Register Linux flash */ /* Register Linux flash */
dinfo = drive_get(IF_PFLASH, 0, fl_idx); dinfo = drive_get(IF_PFLASH, 0, fl_idx);

34
hw/ppc/spapr.c
View File

@ -3223,30 +3223,6 @@ static void spapr_set_resize_hpt(Object *obj, const char *value, Error **errp)
} }
} }
static void spapr_get_vsmt(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
visit_type_uint32(v, name, (uint32_t *)opaque, errp);
}
static void spapr_set_vsmt(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
visit_type_uint32(v, name, (uint32_t *)opaque, errp);
}
static void spapr_get_kernel_addr(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
visit_type_uint64(v, name, (uint64_t *)opaque, errp);
}
static void spapr_set_kernel_addr(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
visit_type_uint64(v, name, (uint64_t *)opaque, errp);
}
static char *spapr_get_ic_mode(Object *obj, Error **errp) static char *spapr_get_ic_mode(Object *obj, Error **errp)
{ {
SpaprMachineState *spapr = SPAPR_MACHINE(obj); SpaprMachineState *spapr = SPAPR_MACHINE(obj);
@ -3344,16 +3320,18 @@ static void spapr_instance_init(Object *obj)
object_property_set_description(obj, "resize-hpt", object_property_set_description(obj, "resize-hpt",
"Resizing of the Hash Page Table (enabled, disabled, required)", "Resizing of the Hash Page Table (enabled, disabled, required)",
NULL); NULL);
object_property_add(obj, "vsmt", "uint32", spapr_get_vsmt, object_property_add_uint32_ptr(obj, "vsmt",
spapr_set_vsmt, NULL, &spapr->vsmt, &error_abort); &spapr->vsmt, OBJ_PROP_FLAG_READWRITE,
&error_abort);
object_property_set_description(obj, "vsmt", object_property_set_description(obj, "vsmt",
"Virtual SMT: KVM behaves as if this were" "Virtual SMT: KVM behaves as if this were"
" the host's SMT mode", &error_abort); " the host's SMT mode", &error_abort);
object_property_add_bool(obj, "vfio-no-msix-emulation", object_property_add_bool(obj, "vfio-no-msix-emulation",
spapr_get_msix_emulation, NULL, NULL); spapr_get_msix_emulation, NULL, NULL);
object_property_add(obj, "kernel-addr", "uint64", spapr_get_kernel_addr, object_property_add_uint64_ptr(obj, "kernel-addr",
spapr_set_kernel_addr, NULL, &spapr->kernel_addr, &spapr->kernel_addr, OBJ_PROP_FLAG_READWRITE,
&error_abort); &error_abort);
object_property_set_description(obj, "kernel-addr", object_property_set_description(obj, "kernel-addr",
stringify(KERNEL_LOAD_ADDR) stringify(KERNEL_LOAD_ADDR)

3
hw/ppc/spapr_drc.c
View File

@ -583,7 +583,8 @@ static void spapr_dr_connector_instance_init(Object *obj)
SpaprDrc *drc = SPAPR_DR_CONNECTOR(obj); SpaprDrc *drc = SPAPR_DR_CONNECTOR(obj);
SpaprDrcClass *drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc); SpaprDrcClass *drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc);
object_property_add_uint32_ptr(obj, "id", &drc->id, NULL); object_property_add_uint32_ptr(obj, "id", &drc->id, OBJ_PROP_FLAG_READ,
NULL);
object_property_add(obj, "index", "uint32", prop_get_index, object_property_add(obj, "index", "uint32", prop_get_index,
NULL, NULL, NULL, NULL); NULL, NULL, NULL, NULL);
object_property_add(obj, "fdt", "struct", prop_get_fdt, object_property_add(obj, "fdt", "struct", prop_get_fdt,

4
hw/rdma/vmw/pvrdma_qp_ops.c
View File

@ -34,13 +34,13 @@ typedef struct CompHandlerCtx {
/* Send Queue WQE */ /* Send Queue WQE */
typedef struct PvrdmaSqWqe { typedef struct PvrdmaSqWqe {
struct pvrdma_sq_wqe_hdr hdr; struct pvrdma_sq_wqe_hdr hdr;
struct pvrdma_sge sge[0]; struct pvrdma_sge sge[];
} PvrdmaSqWqe; } PvrdmaSqWqe;
/* Recv Queue WQE */ /* Recv Queue WQE */
typedef struct PvrdmaRqWqe { typedef struct PvrdmaRqWqe {
struct pvrdma_rq_wqe_hdr hdr; struct pvrdma_rq_wqe_hdr hdr;
struct pvrdma_sge sge[0]; struct pvrdma_sge sge[];
} PvrdmaRqWqe; } PvrdmaRqWqe;
/* /*

5
hw/riscv/sifive_e.c
View File

@ -145,7 +145,7 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev, Error **errp)
&error_abort); &error_abort);
/* Mask ROM */ /* Mask ROM */
memory_region_init_rom(&s->mask_rom, NULL, "riscv.sifive.e.mrom", memory_region_init_rom(&s->mask_rom, OBJECT(dev), "riscv.sifive.e.mrom",
memmap[SIFIVE_E_MROM].size, &error_fatal); memmap[SIFIVE_E_MROM].size, &error_fatal);
memory_region_add_subregion(sys_mem, memory_region_add_subregion(sys_mem,
memmap[SIFIVE_E_MROM].base, &s->mask_rom); memmap[SIFIVE_E_MROM].base, &s->mask_rom);
@ -208,9 +208,8 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev, Error **errp)
memmap[SIFIVE_E_PWM2].base, memmap[SIFIVE_E_PWM2].size); memmap[SIFIVE_E_PWM2].base, memmap[SIFIVE_E_PWM2].size);
/* Flash memory */ /* Flash memory */
memory_region_init_ram(&s->xip_mem, NULL, "riscv.sifive.e.xip", memory_region_init_rom(&s->xip_mem, OBJECT(dev), "riscv.sifive.e.xip",
memmap[SIFIVE_E_XIP].size, &error_fatal); memmap[SIFIVE_E_XIP].size, &error_fatal);
memory_region_set_readonly(&s->xip_mem, true);
memory_region_add_subregion(sys_mem, memmap[SIFIVE_E_XIP].base, memory_region_add_subregion(sys_mem, memmap[SIFIVE_E_XIP].base,
&s->xip_mem); &s->xip_mem);
} }

2
hw/riscv/sifive_u.c
View File

@ -501,7 +501,7 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp)
&error_abort); &error_abort);
/* boot rom */ /* boot rom */
memory_region_init_rom(mask_rom, NULL, "riscv.sifive.u.mrom", memory_region_init_rom(mask_rom, OBJECT(dev), "riscv.sifive.u.mrom",
memmap[SIFIVE_U_MROM].size, &error_fatal); memmap[SIFIVE_U_MROM].size, &error_fatal);
memory_region_add_subregion(system_memory, memmap[SIFIVE_U_MROM].base, memory_region_add_subregion(system_memory, memmap[SIFIVE_U_MROM].base,
mask_rom); mask_rom);

2
hw/s390x/virtio-ccw.c
View File

@ -193,7 +193,7 @@ typedef struct VirtioThinintInfo {
typedef struct VirtioRevInfo { typedef struct VirtioRevInfo {
uint16_t revision; uint16_t revision;
uint16_t length; uint16_t length;
uint8_t data[0]; uint8_t data[];
} QEMU_PACKED VirtioRevInfo; } QEMU_PACKED VirtioRevInfo;
/* Specify where the virtqueues for the subchannel are in guest memory. */ /* Specify where the virtqueues for the subchannel are in guest memory. */

3
hw/sh4/shix.c
View File

@ -53,8 +53,7 @@ static void shix_init(MachineState *machine)
cpu = SUPERH_CPU(cpu_create(machine->cpu_type)); cpu = SUPERH_CPU(cpu_create(machine->cpu_type));
/* Allocate memory space */ /* Allocate memory space */
memory_region_init_ram(rom, NULL, "shix.rom", 0x4000, &error_fatal); memory_region_init_rom(rom, NULL, "shix.rom", 0x4000, &error_fatal);
memory_region_set_readonly(rom, true);
memory_region_add_subregion(sysmem, 0x00000000, rom); memory_region_add_subregion(sysmem, 0x00000000, rom);
memory_region_init_ram(&sdram[0], NULL, "shix.sdram1", 0x01000000, memory_region_init_ram(&sdram[0], NULL, "shix.sdram1", 0x01000000,
&error_fatal); &error_fatal);

3
hw/sparc/leon3.c
View File

@ -255,8 +255,7 @@ static void leon3_generic_hw_init(MachineState *machine)
/* Allocate BIOS */ /* Allocate BIOS */
prom_size = 8 * MiB; prom_size = 8 * MiB;
memory_region_init_ram(prom, NULL, "Leon3.bios", prom_size, &error_fatal); memory_region_init_rom(prom, NULL, "Leon3.bios", prom_size, &error_fatal);
memory_region_set_readonly(prom, true);
memory_region_add_subregion(address_space_mem, LEON3_PROM_OFFSET, prom); memory_region_add_subregion(address_space_mem, LEON3_PROM_OFFSET, prom);
/* Load boot prom */ /* Load boot prom */

2
hw/usb/dev-network.c
View File

@ -626,7 +626,7 @@ static const uint32_t oid_supported_list[] =
struct rndis_response { struct rndis_response {
QTAILQ_ENTRY(rndis_response) entries; QTAILQ_ENTRY(rndis_response) entries;
uint32_t length; uint32_t length;
uint8_t buf[0]; uint8_t buf[];
}; };
typedef struct USBNetState { typedef struct USBNetState {

4
hw/usb/dev-smartcard-reader.c
View File

@ -227,7 +227,7 @@ typedef struct QEMU_PACKED CCID_Parameter {
typedef struct QEMU_PACKED CCID_DataBlock { typedef struct QEMU_PACKED CCID_DataBlock {
CCID_BULK_IN b; CCID_BULK_IN b;
uint8_t bChainParameter; uint8_t bChainParameter;
uint8_t abData[0]; uint8_t abData[];
} CCID_DataBlock; } CCID_DataBlock;
/* 6.1.4 PC_to_RDR_XfrBlock */ /* 6.1.4 PC_to_RDR_XfrBlock */
@ -235,7 +235,7 @@ typedef struct QEMU_PACKED CCID_XferBlock {
CCID_Header hdr; CCID_Header hdr;
uint8_t bBWI; /* Block Waiting Timeout */ uint8_t bBWI; /* Block Waiting Timeout */
uint16_t wLevelParameter; /* XXX currently unused */ uint16_t wLevelParameter; /* XXX currently unused */
uint8_t abData[0]; uint8_t abData[];
} CCID_XferBlock; } CCID_XferBlock;
typedef struct QEMU_PACKED CCID_IccPowerOn { typedef struct QEMU_PACKED CCID_IccPowerOn {

4
hw/usb/quirks.c
View File

@ -22,10 +22,10 @@ static bool usb_id_match(const struct usb_device_id *ids,
uint8_t interface_protocol) { uint8_t interface_protocol) {
int i; int i;
for (i = 0; ids[i].vendor_id != -1; i++) { for (i = 0; ids[i].terminating_entry == 0; i++) {
if (ids[i].vendor_id == vendor_id && if (ids[i].vendor_id == vendor_id &&
ids[i].product_id == product_id && ids[i].product_id == product_id &&
(ids[i].interface_class == -1 || (ids[i].interface_protocol_used == 0 ||
(ids[i].interface_class == interface_class && (ids[i].interface_class == interface_class &&
ids[i].interface_subclass == interface_subclass && ids[i].interface_subclass == interface_subclass &&
ids[i].interface_protocol == interface_protocol))) { ids[i].interface_protocol == interface_protocol))) {

22
hw/usb/quirks.h
View File

@ -21,19 +21,23 @@
#include "quirks-pl2303-ids.h" #include "quirks-pl2303-ids.h"
struct usb_device_id { struct usb_device_id {
int vendor_id; uint16_t vendor_id;
int product_id; uint16_t product_id;
int interface_class; uint8_t interface_class;
int interface_subclass; uint8_t interface_subclass;
int interface_protocol; uint8_t interface_protocol;
uint8_t interface_protocol_used:1,
terminating_entry:1,
reserved:6;
}; };
#define USB_DEVICE(vendor, product) \ #define USB_DEVICE(vendor, product) \
.vendor_id = vendor, .product_id = product, .interface_class = -1, .vendor_id = vendor, .product_id = product, .interface_protocol_used = 0,
#define USB_DEVICE_AND_INTERFACE_INFO(vend, prod, iclass, isubclass, iproto) \ #define USB_DEVICE_AND_INTERFACE_INFO(vend, prod, iclass, isubclass, iproto) \
.vendor_id = vend, .product_id = prod, .interface_class = iclass, \ .vendor_id = vend, .product_id = prod, .interface_class = iclass, \
.interface_subclass = isubclass, .interface_protocol = iproto .interface_subclass = isubclass, .interface_protocol = iproto, \
.interface_protocol_used = 1
static const struct usb_device_id usbredir_raw_serial_ids[] = { static const struct usb_device_id usbredir_raw_serial_ids[] = {
/* /*
@ -206,7 +210,7 @@ static const struct usb_device_id usbredir_raw_serial_ids[] = {
{ USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530_PRODUCT_ID) }, { USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530_PRODUCT_ID) },
{ USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) }, { USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) },
{ USB_DEVICE(-1, -1) } /* Terminating Entry */ { .terminating_entry = 1 } /* Terminating Entry */
}; };
static const struct usb_device_id usbredir_ftdi_serial_ids[] = { static const struct usb_device_id usbredir_ftdi_serial_ids[] = {
@ -906,7 +910,7 @@ static const struct usb_device_id usbredir_ftdi_serial_ids[] = {
{ USB_DEVICE(FTDI_VID, FTDI_DISTORTEC_JTAG_LOCK_PICK_PID) }, { USB_DEVICE(FTDI_VID, FTDI_DISTORTEC_JTAG_LOCK_PICK_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_LUMEL_PD12_PID) }, { USB_DEVICE(FTDI_VID, FTDI_LUMEL_PD12_PID) },
{ USB_DEVICE(-1, -1) } /* Terminating Entry */ { .terminating_entry = 1 } /* Terminating Entry */
}; };
#undef USB_DEVICE #undef USB_DEVICE

4
hw/virtio/virtio.c
View File

@ -54,7 +54,7 @@ typedef struct VRingAvail
{ {
uint16_t flags; uint16_t flags;
uint16_t idx; uint16_t idx;
uint16_t ring[0]; uint16_t ring[];
} VRingAvail; } VRingAvail;
typedef struct VRingUsedElem typedef struct VRingUsedElem
@ -67,7 +67,7 @@ typedef struct VRingUsed
{ {
uint16_t flags; uint16_t flags;
uint16_t idx; uint16_t idx;
VRingUsedElem ring[0]; VRingUsedElem ring[];
} VRingUsed; } VRingUsed;
typedef struct VRingMemoryRegionCaches { typedef struct VRingMemoryRegionCaches {

2
hw/xen/xen_pt.h
View File

@ -203,7 +203,7 @@ typedef struct XenPTMSIX {
uint64_t mmio_base_addr; uint64_t mmio_base_addr;
MemoryRegion mmio; MemoryRegion mmio;
void *phys_iomem_base; void *phys_iomem_base;
XenPTMSIXEntry msix_entry[0]; XenPTMSIXEntry msix_entry[];
} XenPTMSIX; } XenPTMSIX;
struct XenPCIPassthroughState { struct XenPCIPassthroughState {

16
include/hw/acpi/acpi-defs.h
View File

@ -152,7 +152,7 @@ typedef struct AcpiSerialPortConsoleRedirection
*/ */
struct AcpiRsdtDescriptorRev1 { struct AcpiRsdtDescriptorRev1 {
ACPI_TABLE_HEADER_DEF /* ACPI common table header */ ACPI_TABLE_HEADER_DEF /* ACPI common table header */
uint32_t table_offset_entry[0]; /* Array of pointers to other */ uint32_t table_offset_entry[]; /* Array of pointers to other */
/* ACPI tables */ /* ACPI tables */
} QEMU_PACKED; } QEMU_PACKED;
typedef struct AcpiRsdtDescriptorRev1 AcpiRsdtDescriptorRev1; typedef struct AcpiRsdtDescriptorRev1 AcpiRsdtDescriptorRev1;
@ -162,7 +162,7 @@ typedef struct AcpiRsdtDescriptorRev1 AcpiRsdtDescriptorRev1;
*/ */
struct AcpiXsdtDescriptorRev2 { struct AcpiXsdtDescriptorRev2 {
ACPI_TABLE_HEADER_DEF /* ACPI common table header */ ACPI_TABLE_HEADER_DEF /* ACPI common table header */
uint64_t table_offset_entry[0]; /* Array of pointers to other */ uint64_t table_offset_entry[]; /* Array of pointers to other */
/* ACPI tables */ /* ACPI tables */
} QEMU_PACKED; } QEMU_PACKED;
typedef struct AcpiXsdtDescriptorRev2 AcpiXsdtDescriptorRev2; typedef struct AcpiXsdtDescriptorRev2 AcpiXsdtDescriptorRev2;
@ -518,7 +518,7 @@ struct AcpiDmarDeviceScope {
struct { struct {
uint8_t device; uint8_t device;
uint8_t function; uint8_t function;
} path[0]; } path[];
} QEMU_PACKED; } QEMU_PACKED;
typedef struct AcpiDmarDeviceScope AcpiDmarDeviceScope; typedef struct AcpiDmarDeviceScope AcpiDmarDeviceScope;
@ -530,7 +530,7 @@ struct AcpiDmarHardwareUnit {
uint8_t reserved; uint8_t reserved;
uint16_t pci_segment; /* The PCI Segment associated with this unit */ uint16_t pci_segment; /* The PCI Segment associated with this unit */
uint64_t address; /* Base address of remapping hardware register-set */ uint64_t address; /* Base address of remapping hardware register-set */
AcpiDmarDeviceScope scope[0]; AcpiDmarDeviceScope scope[];
} QEMU_PACKED; } QEMU_PACKED;
typedef struct AcpiDmarHardwareUnit AcpiDmarHardwareUnit; typedef struct AcpiDmarHardwareUnit AcpiDmarHardwareUnit;
@ -541,7 +541,7 @@ struct AcpiDmarRootPortATS {
uint8_t flags; uint8_t flags;
uint8_t reserved; uint8_t reserved;
uint16_t pci_segment; uint16_t pci_segment;
AcpiDmarDeviceScope scope[0]; AcpiDmarDeviceScope scope[];
} QEMU_PACKED; } QEMU_PACKED;
typedef struct AcpiDmarRootPortATS AcpiDmarRootPortATS; typedef struct AcpiDmarRootPortATS AcpiDmarRootPortATS;
@ -604,7 +604,7 @@ typedef struct AcpiIortMemoryAccess AcpiIortMemoryAccess;
struct AcpiIortItsGroup { struct AcpiIortItsGroup {
ACPI_IORT_NODE_HEADER_DEF ACPI_IORT_NODE_HEADER_DEF
uint32_t its_count; uint32_t its_count;
uint32_t identifiers[0]; uint32_t identifiers[];
} QEMU_PACKED; } QEMU_PACKED;
typedef struct AcpiIortItsGroup AcpiIortItsGroup; typedef struct AcpiIortItsGroup AcpiIortItsGroup;
@ -621,7 +621,7 @@ struct AcpiIortSmmu3 {
uint32_t pri_gsiv; uint32_t pri_gsiv;
uint32_t gerr_gsiv; uint32_t gerr_gsiv;
uint32_t sync_gsiv; uint32_t sync_gsiv;
AcpiIortIdMapping id_mapping_array[0]; AcpiIortIdMapping id_mapping_array[];
} QEMU_PACKED; } QEMU_PACKED;
typedef struct AcpiIortSmmu3 AcpiIortSmmu3; typedef struct AcpiIortSmmu3 AcpiIortSmmu3;
@ -630,7 +630,7 @@ struct AcpiIortRC {
AcpiIortMemoryAccess memory_properties; AcpiIortMemoryAccess memory_properties;
uint32_t ats_attribute; uint32_t ats_attribute;
uint32_t pci_segment_number; uint32_t pci_segment_number;
AcpiIortIdMapping id_mapping_array[0]; AcpiIortIdMapping id_mapping_array[];
} QEMU_PACKED; } QEMU_PACKED;
typedef struct AcpiIortRC AcpiIortRC; typedef struct AcpiIortRC AcpiIortRC;

2
include/hw/arm/smmu-common.h
View File

@ -85,7 +85,7 @@ typedef struct SMMUDevice {
typedef struct SMMUPciBus { typedef struct SMMUPciBus {
PCIBus *bus; PCIBus *bus;
SMMUDevice *pbdev[0]; /* Parent array is sparse, so dynamically alloc */ SMMUDevice *pbdev[]; /* Parent array is sparse, so dynamically alloc */
} SMMUPciBus; } SMMUPciBus;
typedef struct SMMUIOTLBKey { typedef struct SMMUIOTLBKey {

2
include/hw/boards.h
View File

@ -71,7 +71,7 @@ typedef struct CPUArchId {
*/ */
typedef struct { typedef struct {
int len; int len;
CPUArchId cpus[0]; CPUArchId cpus[];
} CPUArchIdList; } CPUArchIdList;
/** /**

3
include/hw/i386/intel_iommu.h
View File

@ -114,7 +114,8 @@ struct VTDAddressSpace {
struct VTDBus { struct VTDBus {
PCIBus* bus; /* A reference to the bus to provide translation for */ PCIBus* bus; /* A reference to the bus to provide translation for */
VTDAddressSpace *dev_as[0]; /* A table of VTDAddressSpace objects indexed by devfn */ /* A table of VTDAddressSpace objects indexed by devfn */
VTDAddressSpace *dev_as[];
}; };
struct VTDIOTLBEntry { struct VTDIOTLBEntry {

2
include/hw/s390x/event-facility.h
View File

@ -122,7 +122,7 @@ typedef struct MDBO {
typedef struct MDB { typedef struct MDB {
MdbHeader header; MdbHeader header;
MDBO mdbo[0]; MDBO mdbo[];
} QEMU_PACKED MDB; } QEMU_PACKED MDB;
typedef struct SclpMsg { typedef struct SclpMsg {

8
include/hw/s390x/sclp.h
View File

@ -132,7 +132,7 @@ typedef struct ReadInfo {
uint16_t highest_cpu; uint16_t highest_cpu;
uint8_t _reserved5[124 - 122]; /* 122-123 */ uint8_t _reserved5[124 - 122]; /* 122-123 */
uint32_t hmfai; uint32_t hmfai;
struct CPUEntry entries[0]; struct CPUEntry entries[];
} QEMU_PACKED ReadInfo; } QEMU_PACKED ReadInfo;
typedef struct ReadCpuInfo { typedef struct ReadCpuInfo {
@ -142,7 +142,7 @@ typedef struct ReadCpuInfo {
uint16_t nr_standby; /* 12-13 */ uint16_t nr_standby; /* 12-13 */
uint16_t offset_standby; /* 14-15 */ uint16_t offset_standby; /* 14-15 */
uint8_t reserved0[24-16]; /* 16-23 */ uint8_t reserved0[24-16]; /* 16-23 */
struct CPUEntry entries[0]; struct CPUEntry entries[];
} QEMU_PACKED ReadCpuInfo; } QEMU_PACKED ReadCpuInfo;
typedef struct ReadStorageElementInfo { typedef struct ReadStorageElementInfo {
@ -151,7 +151,7 @@ typedef struct ReadStorageElementInfo {
uint16_t assigned; uint16_t assigned;
uint16_t standby; uint16_t standby;
uint8_t _reserved0[16 - 14]; /* 14-15 */ uint8_t _reserved0[16 - 14]; /* 14-15 */
uint32_t entries[0]; uint32_t entries[];
} QEMU_PACKED ReadStorageElementInfo; } QEMU_PACKED ReadStorageElementInfo;
typedef struct AttachStorageElement { typedef struct AttachStorageElement {
@ -159,7 +159,7 @@ typedef struct AttachStorageElement {
uint8_t _reserved0[10 - 8]; /* 8-9 */ uint8_t _reserved0[10 - 8]; /* 8-9 */
uint16_t assigned; uint16_t assigned;
uint8_t _reserved1[16 - 12]; /* 12-15 */ uint8_t _reserved1[16 - 12]; /* 12-15 */
uint32_t entries[0]; uint32_t entries[];
} QEMU_PACKED AttachStorageElement; } QEMU_PACKED AttachStorageElement;
typedef struct AssignStorage { typedef struct AssignStorage {

2
include/hw/virtio/virtio-iommu.h
View File

@ -41,7 +41,7 @@ typedef struct IOMMUDevice {
typedef struct IOMMUPciBus { typedef struct IOMMUPciBus {
PCIBus *bus; PCIBus *bus;
IOMMUDevice *pbdev[0]; /* Parent array is sparse, so dynamically alloc */ IOMMUDevice *pbdev[]; /* Parent array is sparse, so dynamically alloc */
} IOMMUPciBus; } IOMMUPciBus;
typedef struct VirtIOIOMMU { typedef struct VirtIOIOMMU {

3
include/qemu/cpuid.h
View File

@ -45,6 +45,9 @@
#ifndef bit_AVX2 #ifndef bit_AVX2
#define bit_AVX2 (1 << 5) #define bit_AVX2 (1 << 5)
#endif #endif
#ifndef bit_AVX512F
#define bit_AVX512F (1 << 16)
#endif
#ifndef bit_BMI2 #ifndef bit_BMI2
#define bit_BMI2 (1 << 8) #define bit_BMI2 (1 << 8)
#endif #endif

86
include/qemu/lockable.h
View File

@ -50,6 +50,7 @@ qemu_make_lockable(void *x, QemuLockable *lockable)
#define QEMU_LOCK_FUNC(x) ((QemuLockUnlockFunc *) \ #define QEMU_LOCK_FUNC(x) ((QemuLockUnlockFunc *) \
QEMU_GENERIC(x, \ QEMU_GENERIC(x, \
(QemuMutex *, qemu_mutex_lock), \ (QemuMutex *, qemu_mutex_lock), \
(QemuRecMutex *, qemu_rec_mutex_lock), \
(CoMutex *, qemu_co_mutex_lock), \ (CoMutex *, qemu_co_mutex_lock), \
(QemuSpin *, qemu_spin_lock), \ (QemuSpin *, qemu_spin_lock), \
unknown_lock_type)) unknown_lock_type))
@ -57,6 +58,7 @@ qemu_make_lockable(void *x, QemuLockable *lockable)
#define QEMU_UNLOCK_FUNC(x) ((QemuLockUnlockFunc *) \ #define QEMU_UNLOCK_FUNC(x) ((QemuLockUnlockFunc *) \
QEMU_GENERIC(x, \ QEMU_GENERIC(x, \
(QemuMutex *, qemu_mutex_unlock), \ (QemuMutex *, qemu_mutex_unlock), \
(QemuRecMutex *, qemu_rec_mutex_unlock), \
(CoMutex *, qemu_co_mutex_unlock), \ (CoMutex *, qemu_co_mutex_unlock), \
(QemuSpin *, qemu_spin_unlock), \ (QemuSpin *, qemu_spin_unlock), \
unknown_lock_type)) unknown_lock_type))
@ -65,7 +67,7 @@ qemu_make_lockable(void *x, QemuLockable *lockable)
* In C++ it would be different, but then C++ wouldn't need QemuLockable * In C++ it would be different, but then C++ wouldn't need QemuLockable
* either... * either...
*/ */
#define QEMU_MAKE_LOCKABLE_(x) qemu_make_lockable((x), &(QemuLockable) { \ #define QEMU_MAKE_LOCKABLE_(x) (&(QemuLockable) { \
.object = (x), \ .object = (x), \
.lock = QEMU_LOCK_FUNC(x), \ .lock = QEMU_LOCK_FUNC(x), \
.unlock = QEMU_UNLOCK_FUNC(x), \ .unlock = QEMU_UNLOCK_FUNC(x), \
@ -73,12 +75,25 @@ qemu_make_lockable(void *x, QemuLockable *lockable)
/* QEMU_MAKE_LOCKABLE - Make a polymorphic QemuLockable /* QEMU_MAKE_LOCKABLE - Make a polymorphic QemuLockable
* *
* @x: a lock object (currently one of QemuMutex, CoMutex, QemuSpin). * @x: a lock object (currently one of QemuMutex, QemuRecMutex, CoMutex, QemuSpin).
*
* Returns a QemuLockable object that can be passed around
* to a function that can operate with locks of any kind, or
* NULL if @x is %NULL.
*/
#define QEMU_MAKE_LOCKABLE(x) \
QEMU_GENERIC(x, \
(QemuLockable *, (x)), \
qemu_make_lockable((x), QEMU_MAKE_LOCKABLE_(x)))
/* QEMU_MAKE_LOCKABLE_NONNULL - Make a polymorphic QemuLockable
*
* @x: a lock object (currently one of QemuMutex, QemuRecMutex, CoMutex, QemuSpin).
* *
* Returns a QemuLockable object that can be passed around * Returns a QemuLockable object that can be passed around
* to a function that can operate with locks of any kind. * to a function that can operate with locks of any kind.
*/ */
#define QEMU_MAKE_LOCKABLE(x) \ #define QEMU_MAKE_LOCKABLE_NONNULL(x) \
QEMU_GENERIC(x, \ QEMU_GENERIC(x, \
(QemuLockable *, (x)), \ (QemuLockable *, (x)), \
QEMU_MAKE_LOCKABLE_(x)) QEMU_MAKE_LOCKABLE_(x))
@ -93,4 +108,69 @@ static inline void qemu_lockable_unlock(QemuLockable *x)
x->unlock(x->object); x->unlock(x->object);
} }
static inline QemuLockable *qemu_lockable_auto_lock(QemuLockable *x)
{
qemu_lockable_lock(x);
return x;
}
static inline void qemu_lockable_auto_unlock(QemuLockable *x)
{
if (x) {
qemu_lockable_unlock(x);
}
}
G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuLockable, qemu_lockable_auto_unlock)
#define WITH_QEMU_LOCK_GUARD_(x, var) \
for (g_autoptr(QemuLockable) var = \
qemu_lockable_auto_lock(QEMU_MAKE_LOCKABLE_NONNULL((x))); \
var; \
qemu_lockable_auto_unlock(var), var = NULL)
/**
* WITH_QEMU_LOCK_GUARD - Lock a lock object for scope
*
* @x: a lock object (currently one of QemuMutex, CoMutex, QemuSpin).
*
* This macro defines a lock scope such that entering the scope takes the lock
* and leaving the scope releases the lock. Return statements are allowed
* within the scope and release the lock. Break and continue statements leave
* the scope early and release the lock.
*
* WITH_QEMU_LOCK_GUARD(&mutex) {
* ...
* if (error) {
* return; <-- mutex is automatically unlocked
* }
*
* if (early_exit) {
* break; <-- leave this scope early
* }
* ...
* }
*/
#define WITH_QEMU_LOCK_GUARD(x) \
WITH_QEMU_LOCK_GUARD_((x), qemu_lockable_auto##__COUNTER__)
/**
* QEMU_LOCK_GUARD - Lock an object until the end of the scope
*
* @x: a lock object (currently one of QemuMutex, CoMutex, QemuSpin).
*
* This macro takes a lock until the end of the scope. Return statements
* release the lock.
*
* ... <-- mutex not locked
* QEMU_LOCK_GUARD(&mutex); <-- mutex locked from here onwards
* ...
* if (error) {
* return; <-- mutex is automatically unlocked
* }
*/
#define QEMU_LOCK_GUARD(x) \
g_autoptr(QemuLockable) qemu_lockable_auto##__COUNTER__ = \
qemu_lockable_auto_lock(QEMU_MAKE_LOCKABLE((x)))
#endif #endif

48
include/qom/object.h
View File

@ -1664,69 +1664,101 @@ ObjectProperty *object_class_property_add_tm(ObjectClass *klass,
void (*get)(Object *, struct tm *, Error **), void (*get)(Object *, struct tm *, Error **),
Error **errp); Error **errp);
typedef enum {
/* Automatically add a getter to the property */
OBJ_PROP_FLAG_READ = 1 << 0,
/* Automatically add a setter to the property */
OBJ_PROP_FLAG_WRITE = 1 << 1,
/* Automatically add a getter and a setter to the property */
OBJ_PROP_FLAG_READWRITE = (OBJ_PROP_FLAG_READ | OBJ_PROP_FLAG_WRITE),
} ObjectPropertyFlags;
/** /**
* object_property_add_uint8_ptr: * object_property_add_uint8_ptr:
* @obj: the object to add a property to * @obj: the object to add a property to
* @name: the name of the property * @name: the name of the property
* @v: pointer to value * @v: pointer to value
* @flags: bitwise-or'd ObjectPropertyFlags
* @errp: if an error occurs, a pointer to an area to store the error * @errp: if an error occurs, a pointer to an area to store the error
* *
* Add an integer property in memory. This function will add a * Add an integer property in memory. This function will add a
* property of type 'uint8'. * property of type 'uint8'.
*/ */
void object_property_add_uint8_ptr(Object *obj, const char *name, void object_property_add_uint8_ptr(Object *obj, const char *name,
const uint8_t *v, Error **errp); const uint8_t *v, ObjectPropertyFlags flags,
Error **errp);
ObjectProperty *object_class_property_add_uint8_ptr(ObjectClass *klass, ObjectProperty *object_class_property_add_uint8_ptr(ObjectClass *klass,
const char *name, const char *name,
const uint8_t *v, Error **errp); const uint8_t *v,
ObjectPropertyFlags flags,
Error **errp);
/** /**
* object_property_add_uint16_ptr: * object_property_add_uint16_ptr:
* @obj: the object to add a property to * @obj: the object to add a property to
* @name: the name of the property * @name: the name of the property
* @v: pointer to value * @v: pointer to value
* @flags: bitwise-or'd ObjectPropertyFlags
* @errp: if an error occurs, a pointer to an area to store the error * @errp: if an error occurs, a pointer to an area to store the error
* *
* Add an integer property in memory. This function will add a * Add an integer property in memory. This function will add a
* property of type 'uint16'. * property of type 'uint16'.
*/ */
void object_property_add_uint16_ptr(Object *obj, const char *name, void object_property_add_uint16_ptr(Object *obj, const char *name,
const uint16_t *v, Error **errp); const uint16_t *v,
ObjectPropertyFlags flags,
Error **errp);
ObjectProperty *object_class_property_add_uint16_ptr(ObjectClass *klass, ObjectProperty *object_class_property_add_uint16_ptr(ObjectClass *klass,
const char *name, const char *name,
const uint16_t *v, Error **errp); const uint16_t *v,
ObjectPropertyFlags flags,
Error **errp);
/** /**
* object_property_add_uint32_ptr: * object_property_add_uint32_ptr:
* @obj: the object to add a property to * @obj: the object to add a property to
* @name: the name of the property * @name: the name of the property
* @v: pointer to value * @v: pointer to value
* @flags: bitwise-or'd ObjectPropertyFlags
* @errp: if an error occurs, a pointer to an area to store the error * @errp: if an error occurs, a pointer to an area to store the error
* *
* Add an integer property in memory. This function will add a * Add an integer property in memory. This function will add a
* property of type 'uint32'. * property of type 'uint32'.
*/ */
void object_property_add_uint32_ptr(Object *obj, const char *name, void object_property_add_uint32_ptr(Object *obj, const char *name,
const uint32_t *v, Error **errp); const uint32_t *v,
ObjectPropertyFlags flags,
Error **errp);
ObjectProperty *object_class_property_add_uint32_ptr(ObjectClass *klass, ObjectProperty *object_class_property_add_uint32_ptr(ObjectClass *klass,
const char *name, const char *name,
const uint32_t *v, Error **errp); const uint32_t *v,
ObjectPropertyFlags flags,
Error **errp);
/** /**
* object_property_add_uint64_ptr: * object_property_add_uint64_ptr:
* @obj: the object to add a property to * @obj: the object to add a property to
* @name: the name of the property * @name: the name of the property
* @v: pointer to value * @v: pointer to value
* @flags: bitwise-or'd ObjectPropertyFlags
* @errp: if an error occurs, a pointer to an area to store the error * @errp: if an error occurs, a pointer to an area to store the error
* *
* Add an integer property in memory. This function will add a * Add an integer property in memory. This function will add a
* property of type 'uint64'. * property of type 'uint64'.
*/ */
void object_property_add_uint64_ptr(Object *obj, const char *name, void object_property_add_uint64_ptr(Object *obj, const char *name,
const uint64_t *v, Error **errp); const uint64_t *v,
ObjectPropertyFlags flags,
Error **Errp);
ObjectProperty *object_class_property_add_uint64_ptr(ObjectClass *klass, ObjectProperty *object_class_property_add_uint64_ptr(ObjectClass *klass,
const char *name, const char *name,
const uint64_t *v, Error **errp); const uint64_t *v,
ObjectPropertyFlags flags,
Error **Errp);
/** /**
* object_property_add_alias: * object_property_add_alias:

2
include/sysemu/cryptodev.h
View File

@ -143,7 +143,7 @@ typedef struct CryptoDevBackendSymOpInfo {
uint8_t *dst; uint8_t *dst;
uint8_t *aad_data; uint8_t *aad_data;
uint8_t *digest_result; uint8_t *digest_result;
uint8_t data[0]; uint8_t data[];
} CryptoDevBackendSymOpInfo; } CryptoDevBackendSymOpInfo;
typedef struct CryptoDevBackendClass { typedef struct CryptoDevBackendClass {

7
include/sysemu/whpx.h
View File

@ -35,4 +35,11 @@ int whpx_enabled(void);
#endif /* CONFIG_WHPX */ #endif /* CONFIG_WHPX */
/* state subset only touched by the VCPU itself during runtime */
#define WHPX_SET_RUNTIME_STATE 1
/* state subset modified during VCPU reset */
#define WHPX_SET_RESET_STATE 2
/* full state set, modified during initialization or on vmload */
#define WHPX_SET_FULL_STATE 3
#endif /* QEMU_WHPX_H */ #endif /* QEMU_WHPX_H */

2
include/tcg/tcg.h
View File

@ -267,7 +267,7 @@ struct TCGLabel {
typedef struct TCGPool { typedef struct TCGPool {
struct TCGPool *next; struct TCGPool *next;
int size; int size;
uint8_t data[0] __attribute__ ((aligned)); uint8_t data[] __attribute__ ((aligned));
} TCGPool; } TCGPool;
#define TCG_POOL_CHUNK_SIZE 32768 #define TCG_POOL_CHUNK_SIZE 32768

31
memory.c
View File

@ -1170,15 +1170,6 @@ void memory_region_init(MemoryRegion *mr,
memory_region_do_init(mr, owner, name, size); memory_region_do_init(mr, owner, name, size);
} }
static void memory_region_get_addr(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
MemoryRegion *mr = MEMORY_REGION(obj);
uint64_t value = mr->addr;
visit_type_uint64(v, name, &value, errp);
}
static void memory_region_get_container(Object *obj, Visitor *v, static void memory_region_get_container(Object *obj, Visitor *v,
const char *name, void *opaque, const char *name, void *opaque,
Error **errp) Error **errp)
@ -1242,10 +1233,8 @@ static void memory_region_initfn(Object *obj)
NULL, NULL, &error_abort); NULL, NULL, &error_abort);
op->resolve = memory_region_resolve_container; op->resolve = memory_region_resolve_container;
object_property_add(OBJECT(mr), "addr", "uint64", object_property_add_uint64_ptr(OBJECT(mr), "addr",
memory_region_get_addr, &mr->addr, OBJ_PROP_FLAG_READ, &error_abort);
NULL, /* memory_region_set_addr */
NULL, NULL, &error_abort);
object_property_add(OBJECT(mr), "priority", "uint32", object_property_add(OBJECT(mr), "priority", "uint32",
memory_region_get_priority, memory_region_get_priority,
NULL, /* memory_region_set_priority */ NULL, /* memory_region_set_priority */
@ -1671,19 +1660,8 @@ void memory_region_init_rom_nomigrate(MemoryRegion *mr,
uint64_t size, uint64_t size,
Error **errp) Error **errp)
{ {
Error *err = NULL; memory_region_init_ram_shared_nomigrate(mr, owner, name, size, false, errp);
memory_region_init(mr, owner, name, size);
mr->ram = true;
mr->readonly = true; mr->readonly = true;
mr->terminates = true;
mr->destructor = memory_region_destructor_ram;
mr->ram_block = qemu_ram_alloc(size, false, mr, &err);
mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0;
if (err) {
mr->size = int128_zero();
object_unparent(OBJECT(mr));
error_propagate(errp, err);
}
} }
void memory_region_init_rom_device_nomigrate(MemoryRegion *mr, void memory_region_init_rom_device_nomigrate(MemoryRegion *mr,
@ -2830,6 +2808,9 @@ void address_space_destroy(AddressSpace *as)
static const char *memory_region_type(MemoryRegion *mr) static const char *memory_region_type(MemoryRegion *mr)
{ {
if (mr->alias) {
return memory_region_type(mr->alias);
}
if (memory_region_is_ram_device(mr)) { if (memory_region_is_ram_device(mr)) {
return "ramd"; return "ramd";
} else if (memory_region_is_romd(mr)) { } else if (memory_region_is_romd(mr)) {

2
net/queue.c
View File

@ -46,7 +46,7 @@ struct NetPacket {
unsigned flags; unsigned flags;
int size; int size;
NetPacketSent *sent_cb; NetPacketSent *sent_cb;
uint8_t data[0]; uint8_t data[];
}; };
struct NetQueue { struct NetQueue {

2
pc-bios/optionrom/pvh_main.c
View File

@ -29,7 +29,7 @@ asm (".code32"); /* this code will be executed in protected mode */
#define RSDP_SIGNATURE 0x2052545020445352LL /* "RSD PTR " */ #define RSDP_SIGNATURE 0x2052545020445352LL /* "RSD PTR " */
#define RSDP_AREA_ADDR 0x000E0000 #define RSDP_AREA_ADDR 0x000E0000
#define RSDP_AREA_SIZE 2048 #define RSDP_AREA_SIZE 0x00020000
#define EBDA_BASE_ADDR 0x0000040E #define EBDA_BASE_ADDR 0x0000040E
#define EBDA_SIZE 1024 #define EBDA_SIZE 1024

2
pc-bios/s390-ccw/bootmap.h
View File

@ -136,7 +136,7 @@ typedef struct BootMapScriptHeader {
typedef struct BootMapScript { typedef struct BootMapScript {
BootMapScriptHeader header; BootMapScriptHeader header;
BootMapScriptEntry entry[0]; BootMapScriptEntry entry[];
} __attribute__ ((packed)) BootMapScript; } __attribute__ ((packed)) BootMapScript;
/* /*

2
pc-bios/s390-ccw/sclp.h
View File

@ -95,7 +95,7 @@ typedef struct EventBufferHeader {
typedef struct WriteEventData { typedef struct WriteEventData {
SCCBHeader h; SCCBHeader h;
EventBufferHeader ebh; EventBufferHeader ebh;
char data[0]; char data[];
} __attribute__((packed)) WriteEventData; } __attribute__((packed)) WriteEventData;
typedef struct ReadEventData { typedef struct ReadEventData {

7
plugins/core.c
View File

@ -15,6 +15,7 @@
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/config-file.h" #include "qemu/config-file.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/lockable.h"
#include "qemu/option.h" #include "qemu/option.h"
#include "qemu/rcu_queue.h" #include "qemu/rcu_queue.h"
#include "qemu/xxhash.h" #include "qemu/xxhash.h"
@ -150,11 +151,11 @@ do_plugin_register_cb(qemu_plugin_id_t id, enum qemu_plugin_event ev,
{ {
struct qemu_plugin_ctx *ctx; struct qemu_plugin_ctx *ctx;
qemu_rec_mutex_lock(&plugin.lock); QEMU_LOCK_GUARD(&plugin.lock);
ctx = plugin_id_to_ctx_locked(id); ctx = plugin_id_to_ctx_locked(id);
/* if the plugin is on its way out, ignore this request */ /* if the plugin is on its way out, ignore this request */
if (unlikely(ctx->uninstalling)) { if (unlikely(ctx->uninstalling)) {
goto out_unlock; return;
} }
if (func) { if (func) {
struct qemu_plugin_cb *cb = ctx->callbacks[ev]; struct qemu_plugin_cb *cb = ctx->callbacks[ev];
@ -178,8 +179,6 @@ do_plugin_register_cb(qemu_plugin_id_t id, enum qemu_plugin_event ev,
} else { } else {
plugin_unregister_cb__locked(ctx, ev); plugin_unregister_cb__locked(ctx, ev);
} }
out_unlock:
qemu_rec_mutex_unlock(&plugin.lock);
} }
void plugin_register_cb(qemu_plugin_id_t id, enum qemu_plugin_event ev, void plugin_register_cb(qemu_plugin_id_t id, enum qemu_plugin_event ev,

6
plugins/loader.c
View File

@ -19,6 +19,7 @@
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/config-file.h" #include "qemu/config-file.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/lockable.h"
#include "qemu/option.h" #include "qemu/option.h"
#include "qemu/rcu_queue.h" #include "qemu/rcu_queue.h"
#include "qemu/qht.h" #include "qemu/qht.h"
@ -367,15 +368,14 @@ void plugin_reset_uninstall(qemu_plugin_id_t id,
struct qemu_plugin_reset_data *data; struct qemu_plugin_reset_data *data;
struct qemu_plugin_ctx *ctx; struct qemu_plugin_ctx *ctx;
qemu_rec_mutex_lock(&plugin.lock); WITH_QEMU_LOCK_GUARD(&plugin.lock) {
ctx = plugin_id_to_ctx_locked(id); ctx = plugin_id_to_ctx_locked(id);
if (ctx->uninstalling || (reset && ctx->resetting)) { if (ctx->uninstalling || (reset && ctx->resetting)) {
qemu_rec_mutex_unlock(&plugin.lock);
return; return;
} }
ctx->resetting = reset; ctx->resetting = reset;
ctx->uninstalling = !reset; ctx->uninstalling = !reset;
qemu_rec_mutex_unlock(&plugin.lock); }
data = g_new(struct qemu_plugin_reset_data, 1); data = g_new(struct qemu_plugin_reset_data, 1);
data->ctx = ctx; data->ctx = ctx;

214
qom/object.c
View File

@ -2498,6 +2498,22 @@ static void property_get_uint8_ptr(Object *obj, Visitor *v, const char *name,
visit_type_uint8(v, name, &value, errp); visit_type_uint8(v, name, &value, errp);
} }
static void property_set_uint8_ptr(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
uint8_t *field = opaque;
uint8_t value;
Error *local_err = NULL;
visit_type_uint8(v, name, &value, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
}
*field = value;
}
static void property_get_uint16_ptr(Object *obj, Visitor *v, const char *name, static void property_get_uint16_ptr(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp) void *opaque, Error **errp)
{ {
@ -2505,6 +2521,22 @@ static void property_get_uint16_ptr(Object *obj, Visitor *v, const char *name,
visit_type_uint16(v, name, &value, errp); visit_type_uint16(v, name, &value, errp);
} }
static void property_set_uint16_ptr(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
uint16_t *field = opaque;
uint16_t value;
Error *local_err = NULL;
visit_type_uint16(v, name, &value, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
}
*field = value;
}
static void property_get_uint32_ptr(Object *obj, Visitor *v, const char *name, static void property_get_uint32_ptr(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp) void *opaque, Error **errp)
{ {
@ -2512,6 +2544,22 @@ static void property_get_uint32_ptr(Object *obj, Visitor *v, const char *name,
visit_type_uint32(v, name, &value, errp); visit_type_uint32(v, name, &value, errp);
} }
static void property_set_uint32_ptr(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
uint32_t *field = opaque;
uint32_t value;
Error *local_err = NULL;
visit_type_uint32(v, name, &value, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
}
*field = value;
}
static void property_get_uint64_ptr(Object *obj, Visitor *v, const char *name, static void property_get_uint64_ptr(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp) void *opaque, Error **errp)
{ {
@ -2519,68 +2567,184 @@ static void property_get_uint64_ptr(Object *obj, Visitor *v, const char *name,
visit_type_uint64(v, name, &value, errp); visit_type_uint64(v, name, &value, errp);
} }
void object_property_add_uint8_ptr(Object *obj, const char *name, static void property_set_uint64_ptr(Object *obj, Visitor *v, const char *name,
const uint8_t *v, Error **errp) void *opaque, Error **errp)
{ {
object_property_add(obj, name, "uint8", property_get_uint8_ptr, uint64_t *field = opaque;
NULL, NULL, (void *)v, errp); uint64_t value;
Error *local_err = NULL;
visit_type_uint64(v, name, &value, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
}
*field = value;
}
void object_property_add_uint8_ptr(Object *obj, const char *name,
const uint8_t *v,
ObjectPropertyFlags flags,
Error **errp)
{
ObjectPropertyAccessor *getter = NULL;
ObjectPropertyAccessor *setter = NULL;
if ((flags & OBJ_PROP_FLAG_READ) == OBJ_PROP_FLAG_READ) {
getter = property_get_uint8_ptr;
}
if ((flags & OBJ_PROP_FLAG_WRITE) == OBJ_PROP_FLAG_WRITE) {
setter = property_set_uint8_ptr;
}
object_property_add(obj, name, "uint8",
getter, setter, NULL, (void *)v, errp);
} }
ObjectProperty * ObjectProperty *
object_class_property_add_uint8_ptr(ObjectClass *klass, const char *name, object_class_property_add_uint8_ptr(ObjectClass *klass, const char *name,
const uint8_t *v, Error **errp) const uint8_t *v,
ObjectPropertyFlags flags,
Error **errp)
{ {
ObjectPropertyAccessor *getter = NULL;
ObjectPropertyAccessor *setter = NULL;
if ((flags & OBJ_PROP_FLAG_READ) == OBJ_PROP_FLAG_READ) {
getter = property_get_uint8_ptr;
}
if ((flags & OBJ_PROP_FLAG_WRITE) == OBJ_PROP_FLAG_WRITE) {
setter = property_set_uint8_ptr;
}
return object_class_property_add(klass, name, "uint8", return object_class_property_add(klass, name, "uint8",
property_get_uint8_ptr, getter, setter, NULL, (void *)v, errp);
NULL, NULL, (void *)v, errp);
} }
void object_property_add_uint16_ptr(Object *obj, const char *name, void object_property_add_uint16_ptr(Object *obj, const char *name,
const uint16_t *v, Error **errp) const uint16_t *v,
ObjectPropertyFlags flags,
Error **errp)
{ {
object_property_add(obj, name, "uint16", property_get_uint16_ptr, ObjectPropertyAccessor *getter = NULL;
NULL, NULL, (void *)v, errp); ObjectPropertyAccessor *setter = NULL;
if ((flags & OBJ_PROP_FLAG_READ) == OBJ_PROP_FLAG_READ) {
getter = property_get_uint16_ptr;
}
if ((flags & OBJ_PROP_FLAG_WRITE) == OBJ_PROP_FLAG_WRITE) {
setter = property_set_uint16_ptr;
}
object_property_add(obj, name, "uint16",
getter, setter, NULL, (void *)v, errp);
} }
ObjectProperty * ObjectProperty *
object_class_property_add_uint16_ptr(ObjectClass *klass, const char *name, object_class_property_add_uint16_ptr(ObjectClass *klass, const char *name,
const uint16_t *v, Error **errp) const uint16_t *v,
ObjectPropertyFlags flags,
Error **errp)
{ {
ObjectPropertyAccessor *getter = NULL;
ObjectPropertyAccessor *setter = NULL;
if ((flags & OBJ_PROP_FLAG_READ) == OBJ_PROP_FLAG_READ) {
getter = property_get_uint16_ptr;
}
if ((flags & OBJ_PROP_FLAG_WRITE) == OBJ_PROP_FLAG_WRITE) {
setter = property_set_uint16_ptr;
}
return object_class_property_add(klass, name, "uint16", return object_class_property_add(klass, name, "uint16",
property_get_uint16_ptr, getter, setter, NULL, (void *)v, errp);
NULL, NULL, (void *)v, errp);
} }
void object_property_add_uint32_ptr(Object *obj, const char *name, void object_property_add_uint32_ptr(Object *obj, const char *name,
const uint32_t *v, Error **errp) const uint32_t *v,
ObjectPropertyFlags flags,
Error **errp)
{ {
object_property_add(obj, name, "uint32", property_get_uint32_ptr, ObjectPropertyAccessor *getter = NULL;
NULL, NULL, (void *)v, errp); ObjectPropertyAccessor *setter = NULL;
if ((flags & OBJ_PROP_FLAG_READ) == OBJ_PROP_FLAG_READ) {
getter = property_get_uint32_ptr;
}
if ((flags & OBJ_PROP_FLAG_WRITE) == OBJ_PROP_FLAG_WRITE) {
setter = property_set_uint32_ptr;
}
object_property_add(obj, name, "uint32",
getter, setter, NULL, (void *)v, errp);
} }
ObjectProperty * ObjectProperty *
object_class_property_add_uint32_ptr(ObjectClass *klass, const char *name, object_class_property_add_uint32_ptr(ObjectClass *klass, const char *name,
const uint32_t *v, Error **errp) const uint32_t *v,
ObjectPropertyFlags flags,
Error **errp)
{ {
ObjectPropertyAccessor *getter = NULL;
ObjectPropertyAccessor *setter = NULL;
if ((flags & OBJ_PROP_FLAG_READ) == OBJ_PROP_FLAG_READ) {
getter = property_get_uint32_ptr;
}
if ((flags & OBJ_PROP_FLAG_WRITE) == OBJ_PROP_FLAG_WRITE) {
setter = property_set_uint32_ptr;
}
return object_class_property_add(klass, name, "uint32", return object_class_property_add(klass, name, "uint32",
property_get_uint32_ptr, getter, setter, NULL, (void *)v, errp);
NULL, NULL, (void *)v, errp);
} }
void object_property_add_uint64_ptr(Object *obj, const char *name, void object_property_add_uint64_ptr(Object *obj, const char *name,
const uint64_t *v, Error **errp) const uint64_t *v,
ObjectPropertyFlags flags,
Error **errp)
{ {
object_property_add(obj, name, "uint64", property_get_uint64_ptr, ObjectPropertyAccessor *getter = NULL;
NULL, NULL, (void *)v, errp); ObjectPropertyAccessor *setter = NULL;
if ((flags & OBJ_PROP_FLAG_READ) == OBJ_PROP_FLAG_READ) {
getter = property_get_uint64_ptr;
}
if ((flags & OBJ_PROP_FLAG_WRITE) == OBJ_PROP_FLAG_WRITE) {
setter = property_set_uint64_ptr;
}
object_property_add(obj, name, "uint64",
getter, setter, NULL, (void *)v, errp);
} }
ObjectProperty * ObjectProperty *
object_class_property_add_uint64_ptr(ObjectClass *klass, const char *name, object_class_property_add_uint64_ptr(ObjectClass *klass, const char *name,
const uint64_t *v, Error **errp) const uint64_t *v,
ObjectPropertyFlags flags,
Error **errp)
{ {
ObjectPropertyAccessor *getter = NULL;
ObjectPropertyAccessor *setter = NULL;
if ((flags & OBJ_PROP_FLAG_READ) == OBJ_PROP_FLAG_READ) {
getter = property_get_uint64_ptr;
}
if ((flags & OBJ_PROP_FLAG_WRITE) == OBJ_PROP_FLAG_WRITE) {
setter = property_set_uint64_ptr;
}
return object_class_property_add(klass, name, "uint64", return object_class_property_add(klass, name, "uint64",
property_get_uint64_ptr, getter, setter, NULL, (void *)v, errp);
NULL, NULL, (void *)v, errp);
} }
typedef struct { typedef struct {

159
scripts/coccinelle/memory-region-housekeeping.cocci Normal file
View File

@ -0,0 +1,159 @@
/*
Usage:
spatch \
--macro-file scripts/cocci-macro-file.h \
--sp-file scripts/coccinelle/memory-region-housekeeping.cocci \
--keep-comments \
--in-place \
--dir .
*/
// Replace memory_region_init_ram(readonly) by memory_region_init_rom()
@@
expression E1, E2, E3, E4, E5;
symbol true;
@@
(
- memory_region_init_ram(E1, E2, E3, E4, E5);
+ memory_region_init_rom(E1, E2, E3, E4, E5);
... WHEN != E1
- memory_region_set_readonly(E1, true);
|
- memory_region_init_ram_nomigrate(E1, E2, E3, E4, E5);
+ memory_region_init_rom_nomigrate(E1, E2, E3, E4, E5);
... WHEN != E1
- memory_region_set_readonly(E1, true);
)
@possible_memory_region_init_rom@
expression E1, E2, E3, E4, E5;
position p;
@@
(
memory_region_init_ram@p(E1, E2, E3, E4, E5);
...
memory_region_set_readonly(E1, true);
|
memory_region_init_ram_nomigrate@p(E1, E2, E3, E4, E5);
...
memory_region_set_readonly(E1, true);
)
@script:python@
p << possible_memory_region_init_rom.p;
@@
cocci.print_main("potential use of memory_region_init_rom*() in ", p)
// Do not call memory_region_set_readonly() on ROM alias
@@
expression ROM, E1, E2, E3, E4;
expression ALIAS, E5, E6, E7, E8;
@@
(
memory_region_init_rom(ROM, E1, E2, E3, E4);
|
memory_region_init_rom_nomigrate(ROM, E1, E2, E3, E4);
)
...
memory_region_init_alias(ALIAS, E5, E6, ROM, E7, E8);
- memory_region_set_readonly(ALIAS, true);
// Replace by-hand memory_region_init_ram_nomigrate/vmstate_register_ram
// code sequences with use of the new memory_region_init_ram function.
// Similarly for the _rom and _rom_device functions.
// We don't try to replace sequences with a non-NULL owner, because
// there are none in the tree that can be automatically converted
// (and only a handful that can be manually converted).
@@
expression MR;
expression NAME;
expression SIZE;
expression ERRP;
@@
-memory_region_init_ram_nomigrate(MR, NULL, NAME, SIZE, ERRP);
+memory_region_init_ram(MR, NULL, NAME, SIZE, ERRP);
...
-vmstate_register_ram_global(MR);
@@
expression MR;
expression NAME;
expression SIZE;
expression ERRP;
@@
-memory_region_init_rom_nomigrate(MR, NULL, NAME, SIZE, ERRP);
+memory_region_init_rom(MR, NULL, NAME, SIZE, ERRP);
...
-vmstate_register_ram_global(MR);
@@
expression MR;
expression OPS;
expression OPAQUE;
expression NAME;
expression SIZE;
expression ERRP;
@@
-memory_region_init_rom_device_nomigrate(MR, NULL, OPS, OPAQUE, NAME, SIZE, ERRP);
+memory_region_init_rom_device(MR, NULL, OPS, OPAQUE, NAME, SIZE, ERRP);
...
-vmstate_register_ram_global(MR);
// Device is owner
@@
typedef DeviceState;
identifier device_fn, dev, obj;
expression E1, E2, E3, E4, E5;
@@
static void device_fn(DeviceState *dev, ...)
{
...
Object *obj = OBJECT(dev);
<+...
(
- memory_region_init(E1, NULL, E2, E3);
+ memory_region_init(E1, obj, E2, E3);
|
- memory_region_init_io(E1, NULL, E2, E3, E4, E5);
+ memory_region_init_io(E1, obj, E2, E3, E4, E5);
|
- memory_region_init_alias(E1, NULL, E2, E3, E4, E5);
+ memory_region_init_alias(E1, obj, E2, E3, E4, E5);
|
- memory_region_init_rom(E1, NULL, E2, E3, E4);
+ memory_region_init_rom(E1, obj, E2, E3, E4);
|
- memory_region_init_ram_shared_nomigrate(E1, NULL, E2, E3, E4, E5);
+ memory_region_init_ram_shared_nomigrate(E1, obj, E2, E3, E4, E5);
)
...+>
}
@@
identifier device_fn, dev;
expression E1, E2, E3, E4, E5;
@@
static void device_fn(DeviceState *dev, ...)
{
<+...
(
- memory_region_init(E1, NULL, E2, E3);
+ memory_region_init(E1, OBJECT(dev), E2, E3);
|
- memory_region_init_io(E1, NULL, E2, E3, E4, E5);
+ memory_region_init_io(E1, OBJECT(dev), E2, E3, E4, E5);
|
- memory_region_init_alias(E1, NULL, E2, E3, E4, E5);
+ memory_region_init_alias(E1, OBJECT(dev), E2, E3, E4, E5);
|
- memory_region_init_rom(E1, NULL, E2, E3, E4);
+ memory_region_init_rom(E1, OBJECT(dev), E2, E3, E4);
|
- memory_region_init_ram_shared_nomigrate(E1, NULL, E2, E3, E4, E5);
+ memory_region_init_ram_shared_nomigrate(E1, OBJECT(dev), E2, E3, E4, E5);
)
...+>
}

38
scripts/coccinelle/memory-region-init-ram.cocci
View File

@ -1,38 +0,0 @@
// Replace by-hand memory_region_init_ram_nomigrate/vmstate_register_ram
// code sequences with use of the new memory_region_init_ram function.
// Similarly for the _rom and _rom_device functions.
// We don't try to replace sequences with a non-NULL owner, because
// there are none in the tree that can be automatically converted
// (and only a handful that can be manually converted).
@@
expression MR;
expression NAME;
expression SIZE;
expression ERRP;
@@
-memory_region_init_ram_nomigrate(MR, NULL, NAME, SIZE, ERRP);
+memory_region_init_ram(MR, NULL, NAME, SIZE, ERRP);
...
-vmstate_register_ram_global(MR);
@@
expression MR;
expression NAME;
expression SIZE;
expression ERRP;
@@
-memory_region_init_rom_nomigrate(MR, NULL, NAME, SIZE, ERRP);
+memory_region_init_rom(MR, NULL, NAME, SIZE, ERRP);
...
-vmstate_register_ram_global(MR);
@@
expression MR;
expression OPS;
expression OPAQUE;
expression NAME;
expression SIZE;
expression ERRP;
@@
-memory_region_init_rom_device_nomigrate(MR, NULL, OPS, OPAQUE, NAME, SIZE, ERRP);
+memory_region_init_rom_device(MR, NULL, OPS, OPAQUE, NAME, SIZE, ERRP);
...
-vmstate_register_ram_global(MR);

17
scsi/qemu-pr-helper.c
View File

@ -421,10 +421,13 @@ static int multipath_pr_out(int fd, const uint8_t *cdb, uint8_t *sense,
int rq_servact = cdb[1]; int rq_servact = cdb[1];
int rq_scope = cdb[2] >> 4; int rq_scope = cdb[2] >> 4;
int rq_type = cdb[2] & 0xf; int rq_type = cdb[2] & 0xf;
struct prout_param_descriptor paramp; g_autofree struct prout_param_descriptor *paramp = NULL;
char transportids[PR_HELPER_DATA_SIZE]; char transportids[PR_HELPER_DATA_SIZE];
int r; int r;
paramp = g_malloc0(sizeof(struct prout_param_descriptor)
+ sizeof(struct transportid *) * MPATH_MX_TIDS);
if (sz < PR_OUT_FIXED_PARAM_SIZE) { if (sz < PR_OUT_FIXED_PARAM_SIZE) {
/* Illegal request, Parameter list length error. This isn't fatal; /* Illegal request, Parameter list length error. This isn't fatal;
* we have read the data, send an error without closing the socket. * we have read the data, send an error without closing the socket.
@ -454,10 +457,9 @@ static int multipath_pr_out(int fd, const uint8_t *cdb, uint8_t *sense,
* used by libmpathpersist (which, of course, will immediately * used by libmpathpersist (which, of course, will immediately
* do the opposite). * do the opposite).
*/ */
memset(&paramp, 0, sizeof(paramp)); memcpy(&paramp->key, &param[0], 8);
memcpy(&paramp.key, &param[0], 8); memcpy(&paramp->sa_key, &param[8], 8);
memcpy(&paramp.sa_key, &param[8], 8); paramp->sa_flags = param[20];
paramp.sa_flags = param[20];
if (sz > PR_OUT_FIXED_PARAM_SIZE) { if (sz > PR_OUT_FIXED_PARAM_SIZE) {
size_t transportid_len; size_t transportid_len;
int i, j; int i, j;
@ -520,12 +522,13 @@ static int multipath_pr_out(int fd, const uint8_t *cdb, uint8_t *sense,
return CHECK_CONDITION; return CHECK_CONDITION;
} }
paramp.trnptid_list[paramp.num_transportid++] = id; assert(paramp->num_transportid < MPATH_MX_TIDS);
paramp->trnptid_list[paramp->num_transportid++] = id;
} }
} }
r = mpath_persistent_reserve_out(fd, rq_servact, rq_scope, rq_type, r = mpath_persistent_reserve_out(fd, rq_servact, rq_scope, rq_type,
&paramp, noisy, verbose); paramp, noisy, verbose);
return mpath_reconstruct_sense(fd, r, sense); return mpath_reconstruct_sense(fd, r, sense);
} }
#endif #endif

Some files were not shown because too many files have changed in this diff Show More