From 326c4c3c48fdd4a5bf4f14abc95787440ac1acec Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 26 Sep 2017 09:03:31 +0300 Subject: [PATCH 01/14] qemu-doc.texi: remove trailing whitespace Remove trailing whitespace in qemu-doc.texi, as it causes reproducibility issues depending on the echo implementation used by the Makefile. Reported-By: Vagrant Cascadian Signed-off-by: Michael Tokarev Reviewed-by: Stefan Hajnoczi --- qemu-doc.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu-doc.texi b/qemu-doc.texi index d8bb2c664f..8c10956a66 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -105,7 +105,7 @@ QEMU full system emulation has the following features: QEMU uses a full software MMU for maximum portability. @item -QEMU can optionally use an in-kernel accelerator, like kvm. The accelerators +QEMU can optionally use an in-kernel accelerator, like kvm. The accelerators execute most of the guest code natively, while continuing to emulate the rest of the machine. From 2de123a1ecbc3d364a808a5c2de1301a2c43338c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= Date: Mon, 25 Sep 2017 21:14:20 -0700 Subject: [PATCH 02/14] linux-user: remove duplicate break in syscall MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit likely introduced in 3532fa7402cda16f7b95261b0339c58630051f0b Signed-off-by: Carlo Marcelo Arenas Belón Reviewed-by: Laurent Vivier Signed-off-by: Michael Tokarev --- linux-user/syscall.c | 1 - 1 file changed, 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 9b6364a266..3ef4d1c568 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -3131,7 +3131,6 @@ set_timeout: case TARGET_SO_RCVLOWAT: optname = SO_RCVLOWAT; break; - break; default: goto unimplemented; } From 439e91af8f24c308e753b9417d6c599d6007595a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= Date: Tue, 26 Sep 2017 14:07:23 -0700 Subject: [PATCH 03/14] gitignore: ignore check-qlit test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit test introduced in 382176b4d78e070d119af8e0dcd00884c11bbec2 Signed-off-by: Carlo Marcelo Arenas Belón Reviewed-by: Eric Blake Signed-off-by: Michael Tokarev --- tests/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/.gitignore b/tests/.gitignore index cf6d99c91e..53cb2efaee 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -6,6 +6,7 @@ check-qdict check-qnum check-qjson check-qlist +check-qlit check-qnull check-qstring check-qom-interface From 70857ad6212276dcda364e36b30258222bdb31bc Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Tue, 10 Oct 2017 11:24:18 +0100 Subject: [PATCH 04/14] ui/gtk: Fix deprecation of vte_terminal_copy_clipboard vte_terminal_copy_clipboard() is deprecated in VTE 0.50. Signed-off-by: Anthony PERARD Reviewed-by: Daniel P. Berrange Signed-off-by: Michael Tokarev --- ui/gtk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ui/gtk.c b/ui/gtk.c index 5bd87c265a..342e96fbe9 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1702,7 +1702,12 @@ static void gd_menu_copy(GtkMenuItem *item, void *opaque) GtkDisplayState *s = opaque; VirtualConsole *vc = gd_vc_find_current(s); +#if VTE_CHECK_VERSION(0, 50, 0) + vte_terminal_copy_clipboard_format(VTE_TERMINAL(vc->vte.terminal), + VTE_FORMAT_TEXT); +#else vte_terminal_copy_clipboard(VTE_TERMINAL(vc->vte.terminal)); +#endif } static void gd_vc_adjustment_changed(GtkAdjustment *adjustment, void *opaque) From f3245d63a0df51184fdf12f483436329ef322d35 Mon Sep 17 00:00:00 2001 From: "Emilio G. Cota" Date: Fri, 13 Oct 2017 17:30:20 -0400 Subject: [PATCH 05/14] futex: add missing header guards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The header file was introduced by fbcc3e5 ("qemu-thread: optimize QemuLockCnt with futexes on Linux", 2017-01-16) without header guards. Add them. Signed-off-by: Emilio G. Cota Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Michael Tokarev --- include/qemu/futex.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/qemu/futex.h b/include/qemu/futex.h index bb7dc9e296..91ae88966e 100644 --- a/include/qemu/futex.h +++ b/include/qemu/futex.h @@ -11,6 +11,9 @@ * */ +#ifndef QEMU_FUTEX_H +#define QEMU_FUTEX_H + #include #include @@ -34,3 +37,5 @@ static inline void qemu_futex_wait(void *f, unsigned val) } } } + +#endif /* QEMU_FUTEX_H */ From d6d6d6fe17fa75fb83025ddb02b2c724ba0c1403 Mon Sep 17 00:00:00 2001 From: Marco A L Barbosa Date: Thu, 5 Oct 2017 10:55:30 -0300 Subject: [PATCH 06/14] linux-user: Add some random ioctls Signed-off-by: Marco A L Barbosa Reviewed-by: Laurent Vivier Signed-off-by: Michael Tokarev --- linux-user/ioctls.h | 5 +++++ linux-user/syscall.c | 1 + linux-user/syscall_defs.h | 7 +++++++ 3 files changed, 13 insertions(+) diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h index e6997ff230..35cad6f944 100644 --- a/linux-user/ioctls.h +++ b/linux-user/ioctls.h @@ -173,6 +173,11 @@ IOCTL(SIOCGSTAMP, IOC_R, MK_PTR(MK_STRUCT(STRUCT_timeval))) IOCTL(SIOCGSTAMPNS, IOC_R, MK_PTR(MK_STRUCT(STRUCT_timespec))) + IOCTL(RNDGETENTCNT, IOC_R, MK_PTR(TYPE_INT)) + IOCTL(RNDADDTOENTCNT, IOC_W, MK_PTR(TYPE_INT)) + IOCTL(RNDZAPENTCNT, 0, TYPE_NULL) + IOCTL(RNDCLEARPOOL, 0, TYPE_NULL) + IOCTL(CDROMPAUSE, 0, TYPE_NULL) IOCTL(CDROMSTART, 0, TYPE_NULL) IOCTL(CDROMSTOP, 0, TYPE_NULL) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 3ef4d1c568..9d4cc4cf5d 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -59,6 +59,7 @@ int __clone2(int (*fn)(void *), void *child_stack_base, #include #include #include +#include #include "qemu-common.h" #ifdef CONFIG_TIMERFD #include diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 40c5027e93..b3d55e35ac 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -1060,6 +1060,13 @@ struct target_pollfd { #define TARGET_SIOCGIWNAME 0x8B01 /* get name == wireless protocol */ +/* From */ + +#define TARGET_RNDGETENTCNT TARGET_IOR('R', 0x00, int) +#define TARGET_RNDADDTOENTCNT TARGET_IOW('R', 0x01, int) +#define TARGET_RNDZAPENTCNT TARGET_IO('R', 0x04) +#define TARGET_RNDCLEARPOOL TARGET_IO('R', 0x06) + /* From */ #define TARGET_BLKROSET TARGET_IO(0x12,93) /* set device read-only (0 = read-write) */ From 429cc0d31f5a5063caedc4567b97999c7191374e Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 2 Oct 2017 17:25:47 +0200 Subject: [PATCH 07/14] os-posix: Drop misleading comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Comments explaining why we include a header tend to go bad. This one's almost comical: not only doesn't qemu-options.hx use MAP_POPULATE anymore (since commit ef36fa1, v2.0.0, 2013), even the include it applies to got moved away in commit 02d0e09 (v2.7.0). Signed-off-by: Markus Armbruster Reviewed-by: Marc-André Lureau Signed-off-by: Michael Tokarev --- os-posix.c | 1 - 1 file changed, 1 deletion(-) diff --git a/os-posix.c b/os-posix.c index 92e9d85215..b9c2343b1e 100644 --- a/os-posix.c +++ b/os-posix.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include -/*needed for MAP_POPULATE before including qemu-options.h */ #include #include #include From 52aa5644e8e89ebfc3b1d0abdb7cc502ce9db599 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 7 Oct 2017 16:56:09 +0200 Subject: [PATCH 08/14] io: Add missing GCC_FMT_ATTR (fix -Werror=suggest-attribute=format) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a compiler warning: /qemu/io/channel-websock.c:163:5: error: function might be possible candidate for ‘gnu_printf’ format attribute [-Werror=suggest-attribute=format] Signed-off-by: Stefan Weil Acked-by: Daniel P. Berrange Signed-off-by: Michael Tokarev --- io/channel-websock.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/io/channel-websock.c b/io/channel-websock.c index d1d471f86e..7bf1340958 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -151,9 +151,10 @@ enum { QIO_CHANNEL_WEBSOCK_OPCODE_PONG = 0xA }; -static void qio_channel_websock_handshake_send_res(QIOChannelWebsock *ioc, - const char *resmsg, - ...) +static void GCC_FMT_ATTR(2, 3) +qio_channel_websock_handshake_send_res(QIOChannelWebsock *ioc, + const char *resmsg, + ...) { va_list vargs; char *response; From 69fa4f9568b18b9b1726a3e51a0bc48478798ad4 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Thu, 12 Oct 2017 14:17:47 +0100 Subject: [PATCH 09/14] include/hw/or-irq.h: Drop unused in_irqs field The struct OrIRQState has an unused member field in_irqs. This is a legacy of earlier versions of the patch; the code that used it was dropped from the final version of the code that went into master, but we forgot to delete the no-longer-used struct field. Do so now. Signed-off-by: Peter Maydell Reviewed-by: Alistair Francis Signed-off-by: Michael Tokarev --- include/hw/or-irq.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/hw/or-irq.h b/include/hw/or-irq.h index d400a8120b..fd900fcf19 100644 --- a/include/hw/or-irq.h +++ b/include/hw/or-irq.h @@ -38,7 +38,6 @@ struct OrIRQState { DeviceState parent_obj; qemu_irq out_irq; - qemu_irq *in_irqs; bool levels[MAX_OR_LINES]; uint16_t num_lines; }; From 43621fafc2605f81ff101eddd57feaeeec9b3b99 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Fri, 13 Oct 2017 16:53:53 +0800 Subject: [PATCH 10/14] MAINTAINERS: Clean up SCSI device section 1. Remove nonexistent file util/scsi*. 2. Drop useless section for LSI53C895A. 3. Leave include/scsi to "Block SCSI subsystem" section. Suggested-by: Thomas Huth Reviewed-by: Thomas Huth Signed-off-by: Fam Zheng Signed-off-by: Michael Tokarev --- MAINTAINERS | 6 ------ 1 file changed, 6 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9cff9737d3..86c9ec9cde 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -980,16 +980,10 @@ SCSI M: Paolo Bonzini S: Supported F: include/hw/scsi/* -F: include/scsi/* F: hw/scsi/* -F: util/scsi* F: tests/virtio-scsi-test.c T: git git://github.com/bonzini/qemu.git scsi-next -LSI53C895A -S: Orphan -F: hw/scsi/lsi53c895a.c - SSI M: Peter Crosthwaite M: Alistair Francis From 626e4a4b69d7f3952b526a5d0aa8a4a040a7cd52 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Fri, 13 Oct 2017 16:53:54 +0800 Subject: [PATCH 11/14] MAINTAINERS: Fix Sun4v file Suggested-by: Thomas Huth Reviewed-by: Thomas Huth Signed-off-by: Fam Zheng Acked-By: Artyom Tarasenko Signed-off-by: Michael Tokarev --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 86c9ec9cde..6ce393f50d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -778,7 +778,7 @@ F: pc-bios/openbios-sparc64 Sun4v M: Artyom Tarasenko S: Maintained -F: hw/sparc64/sun4v.c +F: hw/sparc64/niagara.c F: hw/timer/sun4v-rtc.c F: include/hw/timer/sun4v-rtc.h From 534fd8142fae81b621ff61524f319163d2bb1f7b Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Fri, 13 Oct 2017 16:53:55 +0800 Subject: [PATCH 12/14] MAINTAINERS: Track default-configs/pci.mak Suggested-by: Thomas Huth Reviewed-by: Thomas Huth Signed-off-by: Fam Zheng Signed-off-by: Michael Tokarev --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 6ce393f50d..162e914a2d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -934,6 +934,7 @@ F: hw/pci/* F: hw/pci-bridge/* F: docs/pci* F: docs/specs/*pci* +F: default-configs/pci.mak ACPI/SMBIOS M: Michael S. Tsirkin From aa1530dec499f7525d2ccaa0e3a876dc8089ed1e Mon Sep 17 00:00:00 2001 From: Eduardo Otubo Date: Fri, 29 Sep 2017 14:03:39 +0200 Subject: [PATCH 13/14] filter-mirror: segfault when specifying non existent device When using filter-mirror like the example below where the interface 'ndev0' does not exist on the host, QEMU crashes into segmentation fault. $ qemu-system-x86_64 -S -machine pc -netdev user,id=ndev0 -object filter-mirror,id=test-object,netdev=ndev0 This happens because the function filter_mirror_setup() does not check if the device actually exists and still keep on processing calling qemu_chr_find(). This patch fixes this issue. Signed-off-by: Eduardo Otubo Signed-off-by: Michael Tokarev --- net/filter-mirror.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/filter-mirror.c b/net/filter-mirror.c index 90e2c92337..ce0dc23c2a 100644 --- a/net/filter-mirror.c +++ b/net/filter-mirror.c @@ -213,6 +213,12 @@ static void filter_mirror_setup(NetFilterState *nf, Error **errp) MirrorState *s = FILTER_MIRROR(nf); Chardev *chr; + if (s->outdev == NULL) { + error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, "filter-mirror parameter"\ + " 'outdev' cannot be empty"); + return; + } + chr = qemu_chr_find(s->outdev); if (chr == NULL) { error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, From 6b4f250bfc529bdf73a10ca6873a460175e666cc Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Thu, 7 Sep 2017 16:16:24 -0400 Subject: [PATCH 14/14] Add myself as maintainer for TPM code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also add backends/tpm.c to the list of files. Signed-off-by: Stefan Berger Acked-by: Markus Armbruster Acked-by: Marc-André Lureau Signed-off-by: Michael Tokarev --- MAINTAINERS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 162e914a2d..cee32914bd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1535,12 +1535,14 @@ F: docs/devel/tracing.txt T: git git://github.com/stefanha/qemu.git tracing TPM -S: Orphan +M: Stefan Berger +S: Maintained F: tpm.c F: hw/tpm/* F: include/hw/acpi/tpm.h F: include/sysemu/tpm* F: qapi/tpm.json +F: backends/tpm.c Checkpatch S: Odd Fixes