From 8ff5b30b38cae61f7709114307b04bab879f3f04 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Thu, 11 Jan 2018 17:20:16 +0300 Subject: [PATCH 01/17] qapi-schema.json: spelling (independant comparation) Signed-off-by: Michael Tokarev Reviewed-by: Eric Blake --- qapi-schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index 5c06745c79..0262b9f20b 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2023,7 +2023,7 @@ # # @static: Expand to a static CPU model, a combination of a static base # model name and property delta changes. As the static base model will -# never change, the expanded CPU model will be the same, independant of +# never change, the expanded CPU model will be the same, independent of # independent of QEMU version, machine type, machine options, and # accelerator options. Therefore, the resulting model can be used by # tooling without having to specify a compatibility machine - e.g. when @@ -2102,7 +2102,7 @@ ## # @CpuModelCompareResult: # -# An enumeration of CPU model comparation results. The result is usually +# An enumeration of CPU model comparison results. The result is usually # calculated using e.g. CPU features or CPU generations. # # @incompatible: If model A is incompatible to model B, model A is not From 8c2486a5122e50a5f88f2ecb47c5086ad52c716e Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Thu, 11 Jan 2018 17:31:06 +0300 Subject: [PATCH 02/17] scripts/argparse.py: spelling (independant) Signed-off-by: Michael Tokarev Reviewed-by: Eric Blake --- scripts/argparse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/argparse.py b/scripts/argparse.py index 288c1f06c0..27d1f28935 100644 --- a/scripts/argparse.py +++ b/scripts/argparse.py @@ -76,7 +76,7 @@ considered public as object names -- the API of the formatter objects is still considered an implementation detail.) """ -__version__ = '1.4.0' # we use our own version number independant of the +__version__ = '1.4.0' # we use our own version number independent of the # one in stdlib and we release this on pypi. __external_lib__ = True # to make sure the tests really test THIS lib, From e80200c567ceb01a6f133cb0bf4fade09c395251 Mon Sep 17 00:00:00 2001 From: Alexey Kardashevskiy Date: Thu, 26 Oct 2017 12:41:39 +1100 Subject: [PATCH 03/17] machine: Polish -machine xxx,help The "-machine xxx,help" prints kernel-irqchip possible values as "OnOffSplit", this adds separators to the printed line. Also, since only lower case letters are specified in qapi/common.json, this changes the letter cases too. Signed-off-by: Alexey Kardashevskiy Signed-off-by: Michael Tokarev --- hw/core/machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index cdc1163dc6..5d445839e8 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -520,7 +520,7 @@ static void machine_class_init(ObjectClass *oc, void *data) object_class_property_set_description(oc, "accel", "Accelerator list", &error_abort); - object_class_property_add(oc, "kernel-irqchip", "OnOffSplit", + object_class_property_add(oc, "kernel-irqchip", "on|off|split", NULL, machine_set_kernel_irqchip, NULL, NULL, &error_abort); object_class_property_set_description(oc, "kernel-irqchip", From 38272f2d02fb855a2f76c510d4386f699b88cae5 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 7 Feb 2018 10:03:02 -0600 Subject: [PATCH 04/17] Drop unneeded system header includes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit is a non-standard obsolete header that was long ago replaced by . is a non-standard header; it is not obsolete (we must use it for malloc_trim, for example), but generally should not be used in files that just need malloc() and friends, where is the standard header. And since osdep.h already guarantees string.h and stdlib.h, we can drop these unusual system header includes as redundant rather than replacing them. Signed-off-by: Eric Blake Signed-off-by: Michael Tokarev Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- target/i386/hax-windows.h | 2 -- target/i386/hvf/x86_mmu.c | 1 - 2 files changed, 3 deletions(-) diff --git a/target/i386/hax-windows.h b/target/i386/hax-windows.h index 004f867694..20e2f85407 100644 --- a/target/i386/hax-windows.h +++ b/target/i386/hax-windows.h @@ -20,8 +20,6 @@ #ifndef TARGET_I386_HAX_WINDOWS_H #define TARGET_I386_HAX_WINDOWS_H -#include -#include #include #include diff --git a/target/i386/hvf/x86_mmu.c b/target/i386/hvf/x86_mmu.c index c6be2cca35..d5a0efe718 100644 --- a/target/i386/hvf/x86_mmu.c +++ b/target/i386/hvf/x86_mmu.c @@ -17,7 +17,6 @@ */ #include "qemu/osdep.h" -#include #include "panic.h" #include "qemu-common.h" #include "cpu.h" From 57bf554cf4f486d2e89860cf285cc8502ef61d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Fri, 2 Feb 2018 18:26:59 +0000 Subject: [PATCH 05/17] =?UTF-8?q?mailmap:=20set=20preferred=20spelling=20f?= =?UTF-8?q?or=20Daniel=20Berrang=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé Signed-off-by: Michael Tokarev --- .mailmap | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.mailmap b/.mailmap index ee81ac801e..cf689b9ec9 100644 --- a/.mailmap +++ b/.mailmap @@ -18,3 +18,7 @@ malc malc # There is also a: # (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162> # for the cvs2svn initialization commit e63c3dc74bf. +# +# Also list preferred name forms where people have changed their +# git author config +Daniel P. Berrangé From 16fdc56a690be9dec55435365a4afbb52befb956 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Tue, 30 Jan 2018 10:36:21 +0100 Subject: [PATCH 06/17] qemu-options.hx: Remove confusing spaces in parameter listings The spaces between the parameters in the chardev and tpmdev sections are rather confusing than helpful, and prevent that the lists can be copy-n-pasted easily for real usage. We also don't use such spaces in other sections in the documentation, e.g. with the -netdev option, so let's be consistent and remove the spaces in the chardev and tpmdev sections, too. Signed-off-by: Thomas Huth Signed-off-by: Michael Tokarev Reviewed-by: Stefan Berger Reviewed-by: Paolo Bonzini --- qemu-options.hx | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index d15c1713d1..5050a49a5e 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2522,7 +2522,7 @@ STEXI The general form of a character device option is: @table @option -@item -chardev @var{backend} ,id=@var{id} [,mux=on|off] [,@var{options}] +@item -chardev @var{backend},id=@var{id}[,mux=on|off][,@var{options}] @findex -chardev Backend is one of: @option{null}, @@ -2541,7 +2541,7 @@ Backend is one of: @option{tty}, @option{parallel}, @option{parport}, -@option{spicevmc}. +@option{spicevmc}, @option{spiceport}. The specific backend will determine the applicable options. @@ -2605,11 +2605,11 @@ opened. The available backends are: @table @option -@item -chardev null ,id=@var{id} +@item -chardev null,id=@var{id} A void device. This device will not emit any data, and will drop any data it receives. The null backend does not take any options. -@item -chardev socket ,id=@var{id} [@var{TCP options} or @var{unix options}] [,server] [,nowait] [,telnet] [,reconnect=@var{seconds}] [,tls-creds=@var{id}] +@item -chardev socket,id=@var{id}[,@var{TCP options} or @var{unix options}][,server][,nowait][,telnet][,reconnect=@var{seconds}][,tls-creds=@var{id}] Create a two-way stream socket, which can be either a TCP or a unix socket. A unix socket will be created if @option{path} is specified. Behaviour is @@ -2636,7 +2636,7 @@ TCP and unix socket options are given below: @table @option -@item TCP options: port=@var{port} [,host=@var{host}] [,to=@var{to}] [,ipv4] [,ipv6] [,nodelay] +@item TCP options: port=@var{port}[,host=@var{host}][,to=@var{to}][,ipv4][,ipv6][,nodelay] @option{host} for a listening socket specifies the local address to be bound. For a connecting socket species the remote host to connect to. @option{host} is @@ -2664,7 +2664,7 @@ required. @end table -@item -chardev udp ,id=@var{id} [,host=@var{host}] ,port=@var{port} [,localaddr=@var{localaddr}] [,localport=@var{localport}] [,ipv4] [,ipv6] +@item -chardev udp,id=@var{id}[,host=@var{host}],port=@var{port}[,localaddr=@var{localaddr}][,localport=@var{localport}][,ipv4][,ipv6] Sends all traffic from the guest to a remote host over UDP. @@ -2683,12 +2683,12 @@ available local port will be used. @option{ipv4} and @option{ipv6} specify that either IPv4 or IPv6 must be used. If neither is specified the device may use either protocol. -@item -chardev msmouse ,id=@var{id} +@item -chardev msmouse,id=@var{id} Forward QEMU's emulated msmouse events to the guest. @option{msmouse} does not take any options. -@item -chardev vc ,id=@var{id} [[,width=@var{width}] [,height=@var{height}]] [[,cols=@var{cols}] [,rows=@var{rows}]] +@item -chardev vc,id=@var{id}[[,width=@var{width}][,height=@var{height}]][[,cols=@var{cols}][,rows=@var{rows}]] Connect to a QEMU text console. @option{vc} may optionally be given a specific size. @@ -2699,12 +2699,12 @@ the console, in pixels. @option{cols} and @option{rows} specify that the console be sized to fit a text console with the given dimensions. -@item -chardev ringbuf ,id=@var{id} [,size=@var{size}] +@item -chardev ringbuf,id=@var{id}[,size=@var{size}] Create a ring buffer with fixed size @option{size}. @var{size} must be a power of two and defaults to @code{64K}. -@item -chardev file ,id=@var{id} ,path=@var{path} +@item -chardev file,id=@var{id},path=@var{path} Log all traffic received from the guest to a file. @@ -2712,7 +2712,7 @@ Log all traffic received from the guest to a file. created if it does not already exist, and overwritten if it does. @option{path} is required. -@item -chardev pipe ,id=@var{id} ,path=@var{path} +@item -chardev pipe,id=@var{id},path=@var{path} Create a two-way connection to the guest. The behaviour differs slightly between Windows hosts and other hosts: @@ -2729,14 +2729,14 @@ be present. @option{path} forms part of the pipe path as described above. @option{path} is required. -@item -chardev console ,id=@var{id} +@item -chardev console,id=@var{id} Send traffic from the guest to QEMU's standard output. @option{console} does not take any options. @option{console} is only available on Windows hosts. -@item -chardev serial ,id=@var{id} ,path=@option{path} +@item -chardev serial,id=@var{id},path=@option{path} Send traffic from the guest to a serial device on the host. @@ -2745,33 +2745,33 @@ not only serial lines. @option{path} specifies the name of the serial device to open. -@item -chardev pty ,id=@var{id} +@item -chardev pty,id=@var{id} Create a new pseudo-terminal on the host and connect to it. @option{pty} does not take any options. @option{pty} is not available on Windows hosts. -@item -chardev stdio ,id=@var{id} [,signal=on|off] +@item -chardev stdio,id=@var{id}[,signal=on|off] Connect to standard input and standard output of the QEMU process. @option{signal} controls if signals are enabled on the terminal, that includes exiting QEMU with the key sequence @key{Control-c}. This option is enabled by default, use @option{signal=off} to disable it. -@item -chardev braille ,id=@var{id} +@item -chardev braille,id=@var{id} Connect to a local BrlAPI server. @option{braille} does not take any options. -@item -chardev tty ,id=@var{id} ,path=@var{path} +@item -chardev tty,id=@var{id},path=@var{path} @option{tty} is only available on Linux, Sun, FreeBSD, NetBSD, OpenBSD and DragonFlyBSD hosts. It is an alias for @option{serial}. @option{path} specifies the path to the tty. @option{path} is required. -@item -chardev parallel ,id=@var{id} ,path=@var{path} -@itemx -chardev parport ,id=@var{id} ,path=@var{path} +@item -chardev parallel,id=@var{id},path=@var{path} +@itemx -chardev parport,id=@var{id},path=@var{path} @option{parallel} is only available on Linux, FreeBSD and DragonFlyBSD hosts. @@ -2780,7 +2780,7 @@ Connect to a local parallel port. @option{path} specifies the path to the parallel port device. @option{path} is required. -@item -chardev spicevmc ,id=@var{id} ,debug=@var{debug}, name=@var{name} +@item -chardev spicevmc,id=@var{id},debug=@var{debug},name=@var{name} @option{spicevmc} is only available when spice support is built in. @@ -2790,7 +2790,7 @@ required. Connect to a spice virtual machine channel, such as vdiport. -@item -chardev spiceport ,id=@var{id} ,debug=@var{debug}, name=@var{name} +@item -chardev spiceport,id=@var{id},debug=@var{debug},name=@var{name} @option{spiceport} is only available when spice support is built in. @@ -2898,7 +2898,7 @@ STEXI The general form of a TPM device option is: @table @option -@item -tpmdev @var{backend} ,id=@var{id} [,@var{options}] +@item -tpmdev @var{backend},id=@var{id}[,@var{options}] @findex -tpmdev The specific backend type will determine the applicable options. @@ -2913,7 +2913,7 @@ The available backends are: @table @option -@item -tpmdev passthrough, id=@var{id}, path=@var{path}, cancel-path=@var{cancel-path} +@item -tpmdev passthrough,id=@var{id},path=@var{path},cancel-path=@var{cancel-path} (Linux-host only) Enable access to the host's TPM using the passthrough driver. @@ -2950,7 +2950,7 @@ To create a passthrough TPM use the following two options: Note that the @code{-tpmdev} id is @code{tpm0} and is referenced by @code{tpmdev=tpm0} in the device option. -@item -tpmdev emulator, id=@var{id}, chardev=@var{dev} +@item -tpmdev emulator,id=@var{id},chardev=@var{dev} (Linux-host only) Enable access to a TPM emulator using Unix domain socket based chardev backend. From d0081e8f260d012d050405d1e549b445948d1451 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 30 Jan 2018 14:33:35 -0500 Subject: [PATCH 07/17] scripts/make-release: Don't archive .git files As was last done in 379e21c25, we don't want .git files for submodules here, which we aren't presently doing for capstone and keycodemapdb. Rather than delete the offending files before archiving, ask tar to --exclude=.git Signed-off-by: Cole Robinson Signed-off-by: Michael Tokarev Reviewed-by: Thomas Huth --- scripts/make-release | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/make-release b/scripts/make-release index 3917df7142..04fa9defdc 100755 --- a/scripts/make-release +++ b/scripts/make-release @@ -19,11 +19,10 @@ pushd ${destination} git checkout "v${version}" git submodule update --init (cd roms/seabios && git describe --tags --long --dirty > .version) -rm -rf .git roms/*/.git dtc/.git pixman/.git # FIXME: The following line is a workaround for avoiding filename collisions # when unpacking u-boot sources on case-insensitive filesystems. Once we # update to something with u-boot commit 610eec7f0 we can drop this line. -tar cfj roms/u-boot.tar.bz2 -C roms u-boot && rm -rf roms/u-boot +tar --exclude=.git -cjf roms/u-boot.tar.bz2 -C roms u-boot && rm -rf roms/u-boot popd -tar cfj ${destination}.tar.bz2 ${destination} +tar --exclude=.git -cjf ${destination}.tar.bz2 ${destination} rm -rf ${destination} From 123ac0bba97597ae79915c4691b95515b60f00e7 Mon Sep 17 00:00:00 2001 From: Alexey Kardashevskiy Date: Mon, 15 Jan 2018 13:35:01 +1100 Subject: [PATCH 08/17] configure: Allow capstone=git only if git update is not disabled Even with --disable-git-update, ./configure tries updating the capstone submodule instead of marking it "no"; this disables capstone submodule if git update is disabled. Signed-off-by: Alexey Kardashevskiy Signed-off-by: Michael Tokarev Reviewed-by: Thomas Huth --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 62562f08cf..c1bbf17559 100755 --- a/configure +++ b/configure @@ -4568,7 +4568,7 @@ case "$capstone" in "" | yes) if $pkg_config capstone; then capstone=system - elif test -e "${source_path}/.git" ; then + elif test -e "${source_path}/.git" -a $git_update = 'yes' ; then capstone=git elif test -e "${source_path}/capstone/Makefile" ; then capstone=internal From bff8a0bbe95900b49f3c0113c0b9a330869acaca Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Fri, 19 Jan 2018 11:32:33 +0100 Subject: [PATCH 09/17] build: fix typo in error message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Laurent Vivier Signed-off-by: Michael Tokarev Reviewed-by: Philippe Mathieu-Daudé Fixes: f62bbee55d503f639ee9498878ebf42ff4f4299a --- scripts/git-submodule.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh index bc7224a27f..807ca0b4f8 100755 --- a/scripts/git-submodule.sh +++ b/scripts/git-submodule.sh @@ -28,7 +28,7 @@ error() { echo echo "and then manually update submodules prior to running make, with:" echo - echo " $ scripts/git-sbumodule.sh update $modules" + echo " $ scripts/git-submodule.sh update $modules" echo exit 1 } From a348f64d4652d68212886019ca74825aa1667969 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 29 Nov 2017 09:25:10 -0600 Subject: [PATCH 10/17] maint: Mention web site maintenance in README Now that we have a website that accepts patches on the list, the main project should make it easier to find information about that process. Signed-off-by: Eric Blake Signed-off-by: Michael Tokarev Reviewed-by: Fam Zheng --- README | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README b/README index b92a07a61a..2c8e1c8cc4 100644 --- a/README +++ b/README @@ -68,6 +68,10 @@ the QEMU website https://qemu.org/Contribute/SubmitAPatch https://qemu.org/Contribute/TrivialPatches +The QEMU website is also maintained under source control. + + git clone git://git.qemu.org/qemu-web.git + https://www.qemu.org/2017/02/04/the-new-qemu-website-is-up/ Bug reporting ============= From 9bc5a7193fb422ee53187601eba577ee5d195522 Mon Sep 17 00:00:00 2001 From: Andreas Gustafsson Date: Thu, 4 Jan 2018 19:39:36 +0200 Subject: [PATCH 11/17] oslib-posix: check for posix_memalign in configure script Check for the presence of posix_memalign() in the configure script, not using "defined(_POSIX_C_SOURCE) && !defined(__sun__)". This lets qemu use posix_memalign() on NetBSD versions that have it, instead of falling back to valloc() which is wasteful when the required alignment is smaller than a page. Signed-off-by: Andreas Gustafsson Signed-off-by: Michael Tokarev Reviewed-by: Kamil Rytarowski Reviewed-by: Peter Maydell --- configure | 19 +++++++++++++++++++ util/oslib-posix.c | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/configure b/configure index c1bbf17559..fe9eea9218 100755 --- a/configure +++ b/configure @@ -4658,6 +4658,21 @@ if compile_prog "" "" ; then posix_madvise=yes fi +########################################## +# check if we have posix_memalign() + +posix_memalign=no +cat > $TMPC << EOF +#include +int main(void) { + void *p; + return posix_memalign(&p, 8, 8); +} +EOF +if compile_prog "" "" ; then + posix_memalign=yes +fi + ########################################## # check if we have posix_syslog @@ -5746,6 +5761,7 @@ echo "preadv support $preadv" echo "fdatasync $fdatasync" echo "madvise $madvise" echo "posix_madvise $posix_madvise" +echo "posix_memalign $posix_memalign" echo "libcap-ng support $cap_ng" echo "vhost-net support $vhost_net" echo "vhost-scsi support $vhost_scsi" @@ -6232,6 +6248,9 @@ fi if test "$posix_madvise" = "yes" ; then echo "CONFIG_POSIX_MADVISE=y" >> $config_host_mak fi +if test "$posix_memalign" = "yes" ; then + echo "CONFIG_POSIX_MEMALIGN=y" >> $config_host_mak +fi if test "$spice" = "yes" ; then echo "CONFIG_SPICE=y" >> $config_host_mak diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 77369c92ce..4655bc1f89 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -105,7 +105,7 @@ void *qemu_try_memalign(size_t alignment, size_t size) alignment = sizeof(void*); } -#if defined(_POSIX_C_SOURCE) && !defined(__sun__) +#if defined(CONFIG_POSIX_MEMALIGN) int ret; ret = posix_memalign(&ptr, alignment, size); if (ret != 0) { From e5dd987522b6c421e045d0890cbcd2656092cf22 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Tue, 2 Jan 2018 17:25:26 +0100 Subject: [PATCH 12/17] MAINTAINERS: Add qemu-binfmt-conf.sh script qemu-binfmt-conf.sh is used for the Linux usermode emulation, so let's add this file to that section in the MAINTAINERS file. Signed-off-by: Thomas Huth Signed-off-by: Michael Tokarev Reviewed-by: Laurent Vivier --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 54feb95646..57358a08e2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1761,6 +1761,7 @@ R: Laurent Vivier S: Maintained F: linux-user/ F: default-configs/*-linux-user.mak +F: scripts/qemu-binfmt-conf.sh Tiny Code Generator (TCG) ------------------------- From 01a6df1b689d28341711aefd2406935d783643f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 18 Jul 2017 03:09:57 -0300 Subject: [PATCH 13/17] qga: use ARRAY_SIZE macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Applied using the Coccinelle semantic patch scripts/coccinelle/use_osdep.cocci Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Michael Tokarev Reviewed-by: Marc-André Lureau --- qga/commands-posix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 88807f3c78..967061444a 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -901,7 +901,7 @@ static void build_guest_fsinfo_for_real_device(char const *syspath, if (p && sscanf(q, "%u", &host) == 1) { has_host = true; nhosts = build_hosts(syspath, p, has_ata, hosts, - sizeof(hosts) / sizeof(hosts[0]), errp); + ARRAY_SIZE(hosts), errp); if (nhosts < 0) { goto cleanup; } From 8f801baf3a6835a27ea7d0d807041f8916c60fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 18 Jul 2017 03:09:59 -0300 Subject: [PATCH 14/17] async: use ARRAY_SIZE macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Applied using the Coccinelle semantic patch scripts/coccinelle/use_osdep.cocci Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Michael Tokarev Reviewed-by: Marc-André Lureau --- util/aio-posix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/aio-posix.c b/util/aio-posix.c index 1427f49b4a..d8f0cb4af8 100644 --- a/util/aio-posix.c +++ b/util/aio-posix.c @@ -119,7 +119,7 @@ static int aio_epoll(AioContext *ctx, GPollFD *pfds, } if (timeout <= 0 || ret > 0) { ret = epoll_wait(ctx->epollfd, events, - sizeof(events) / sizeof(events[0]), + ARRAY_SIZE(events), timeout); if (ret <= 0) { goto out; From f96c18965ced5f5502c9547d12f07a255062e4f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 18 Jul 2017 03:10:03 -0300 Subject: [PATCH 15/17] tests/hbitmap: use ARRAY_SIZE macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Applied using the Coccinelle semantic patch scripts/coccinelle/use_osdep.cocci Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Michael Tokarev Reviewed-by: Marc-André Lureau Reviewed-by: John Snow --- tests/test-hbitmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test-hbitmap.c b/tests/test-hbitmap.c index 9091c639b3..f29631f939 100644 --- a/tests/test-hbitmap.c +++ b/tests/test-hbitmap.c @@ -813,7 +813,7 @@ static void test_hbitmap_serialize_basic(TestHBitmapData *data, size_t buf_size; uint8_t *buf; uint64_t positions[] = { 0, 1, L1 - 1, L1, L2 - 1, L2, L2 + 1, L3 - 1 }; - int num_positions = sizeof(positions) / sizeof(positions[0]); + int num_positions = ARRAY_SIZE(positions); hbitmap_test_init(data, L3, 0); g_assert(hbitmap_is_serializable(data->hb)); @@ -838,7 +838,7 @@ static void test_hbitmap_serialize_part(TestHBitmapData *data, size_t buf_size; uint8_t *buf; uint64_t positions[] = { 0, 1, L1 - 1, L1, L2 - 1, L2, L2 + 1, L3 - 1 }; - int num_positions = sizeof(positions) / sizeof(positions[0]); + int num_positions = ARRAY_SIZE(positions); hbitmap_test_init(data, L3, 0); buf_size = L2; @@ -880,7 +880,7 @@ static void test_hbitmap_serialize_zeroes(TestHBitmapData *data, int64_t next; uint64_t min_l1 = MAX(L1, 64); uint64_t positions[] = { 0, min_l1, L2, L3 - min_l1}; - int num_positions = sizeof(positions) / sizeof(positions[0]); + int num_positions = ARRAY_SIZE(positions); hbitmap_test_init(data, L3, 0); From 9a6555e21a80498aeac28d3276bbde61ddb30c05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 18 Jul 2017 03:10:04 -0300 Subject: [PATCH 16/17] tests/qapi: use QEMU_IS_ALIGNED macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Applied using the Coccinelle semantic patch scripts/coccinelle/use_osdep.cocci Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Michael Tokarev Reviewed-by: Marc-André Lureau --- tests/test-qobject-output-visitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-output-visitor.c index 3cf942414c..11e8c5aa40 100644 --- a/tests/test-qobject-output-visitor.c +++ b/tests/test-qobject-output-visitor.c @@ -572,7 +572,7 @@ static void init_native_list(UserDefNativeListUnion *cvalue) boolList **list = &cvalue->u.boolean.data; for (i = 0; i < 32; i++) { *list = g_new0(boolList, 1); - (*list)->value = (i % 3 == 0); + (*list)->value = QEMU_IS_ALIGNED(i, 3); (*list)->next = NULL; list = &(*list)->next; } From d40d74a645feea0ad01482da2358804f6574dce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 18 Jul 2017 03:10:05 -0300 Subject: [PATCH 17/17] tests/qapi: use ARRAY_SIZE macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Applied using the Coccinelle semantic patch scripts/coccinelle/use_osdep.cocci Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Michael Tokarev Reviewed-by: Marc-André Lureau --- tests/test-string-output-visitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-string-output-visitor.c b/tests/test-string-output-visitor.c index fa4b4ca288..02766c0f65 100644 --- a/tests/test-string-output-visitor.c +++ b/tests/test-string-output-visitor.c @@ -95,7 +95,7 @@ static void test_visitor_out_intList(TestOutputVisitorData *data, Error *err = NULL; char *str; - for (i = 0; i < sizeof(value) / sizeof(value[0]); i++) { + for (i = 0; i < ARRAY_SIZE(value); i++) { *tmp = g_malloc0(sizeof(**tmp)); (*tmp)->value = value[i]; tmp = &(*tmp)->next;