* [PULL 01/17] mailmap: Add entry for Yu-Chen Lin
2020-02-19 10:15 [PULL 00/17] Trivial branch patches Laurent Vivier
@ 2020-02-19 10:15 ` Laurent Vivier
2020-02-19 10:15 ` [PULL 02/17] Report stringified errno in VFIO related errors Laurent Vivier
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Laurent Vivier @ 2020-02-19 10:15 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Jason Wang, Michael Tokarev,
Yuval Shaia, Max Filippov, Gerd Hoffmann, Edgar E. Iglesias,
Marek Vasut, qemu-block, qemu-trivial, Yu-Chen Lin,
Philippe Mathieu-Daudé, Laurent Vivier, Thomas Huth,
Jiri Pirko, Eduardo Habkost, Alistair Francis, Alex Williamson,
qemu-arm, Richard Henderson, Kevin Wolf, Yu-Chen Lin, Thomas Huth,
Chris Wulff, Laurent Vivier, Max Reitz, Paolo Bonzini
From: Yu-Chen Lin <npes87184@gmail.com>
I have two mail address, add entries for
showing author and email correctly.
Signed-off-by: Yu-Chen Lin <npes87184@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Yu-Chen Lin <yuchenlin@synology.com>
Message-Id: <20200206125504.7150-1-npes87184@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
.mailmap | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.mailmap b/.mailmap
index a521c17b4430..76154c7d8abc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -152,7 +152,8 @@ Xiaoqiang Zhao <zxq_yx_007@163.com>
Xinhua Cao <caoxinhua@huawei.com>
Xiong Zhang <xiong.y.zhang@intel.com>
Yin Yin <yin.yin@cs2c.com.cn>
-yuchenlin <npes87184@gmail.com>
+Yu-Chen Lin <npes87184@gmail.com>
+Yu-Chen Lin <npes87184@gmail.com> <yuchenlin@synology.com>
YunQiang Su <syq@debian.org>
YunQiang Su <ysu@wavecomp.com>
Yuri Pudgorodskiy <yur@virtuozzo.com>
--
2.24.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 02/17] Report stringified errno in VFIO related errors
2020-02-19 10:15 [PULL 00/17] Trivial branch patches Laurent Vivier
2020-02-19 10:15 ` [PULL 01/17] mailmap: Add entry for Yu-Chen Lin Laurent Vivier
@ 2020-02-19 10:15 ` Laurent Vivier
2020-02-19 10:15 ` [PULL 03/17] scripts/checkpatch.pl: Detect superfluous semicolon in C code Laurent Vivier
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Laurent Vivier @ 2020-02-19 10:15 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Cornelia Huck, Michal Privoznik,
Jason Wang, Michael Tokarev, Yuval Shaia, Max Filippov,
Gerd Hoffmann, Edgar E. Iglesias, Marek Vasut, qemu-block,
qemu-trivial, Philippe Mathieu-Daudé, Laurent Vivier,
Thomas Huth, Jiri Pirko, Eduardo Habkost, Alistair Francis,
Eric Auger, Alex Williamson, qemu-arm, Richard Henderson,
Kevin Wolf, Ján Tomko, Thomas Huth, Chris Wulff,
Laurent Vivier, Max Reitz, Paolo Bonzini
From: Michal Privoznik <mprivozn@redhat.com>
In a few places we report errno formatted as a negative integer.
This is not as user friendly as it can be. Use strerror() and/or
error_setg_errno() instead.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
Message-Id: <4949c3ecf1a32189b8a4b5eb4b0fd04c1122501d.1581674006.git.mprivozn@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/vfio/common.c | 4 ++--
util/vfio-helpers.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 5ca11488d676..0b3593b3c0c4 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -319,7 +319,7 @@ static int vfio_dma_unmap(VFIOContainer *container,
unmap.size -= 1ULL << ctz64(container->pgsizes);
continue;
}
- error_report("VFIO_UNMAP_DMA: %d", -errno);
+ error_report("VFIO_UNMAP_DMA failed: %s", strerror(errno));
return -errno;
}
@@ -352,7 +352,7 @@ static int vfio_dma_map(VFIOContainer *container, hwaddr iova,
return 0;
}
- error_report("VFIO_MAP_DMA: %d", -errno);
+ error_report("VFIO_MAP_DMA failed: %s", strerror(errno));
return -errno;
}
diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c
index 813f7ec56427..ddd9a96e7672 100644
--- a/util/vfio-helpers.c
+++ b/util/vfio-helpers.c
@@ -545,7 +545,7 @@ static int qemu_vfio_do_mapping(QEMUVFIOState *s, void *host, size_t size,
trace_qemu_vfio_do_mapping(s, host, size, iova);
if (ioctl(s->container, VFIO_IOMMU_MAP_DMA, &dma_map)) {
- error_report("VFIO_MAP_DMA: %d", -errno);
+ error_report("VFIO_MAP_DMA failed: %s", strerror(errno));
return -errno;
}
return 0;
@@ -570,7 +570,7 @@ static void qemu_vfio_undo_mapping(QEMUVFIOState *s, IOVAMapping *mapping,
assert(QEMU_IS_ALIGNED(mapping->size, qemu_real_host_page_size));
assert(index >= 0 && index < s->nr_mappings);
if (ioctl(s->container, VFIO_IOMMU_UNMAP_DMA, &unmap)) {
- error_setg(errp, "VFIO_UNMAP_DMA failed: %d", -errno);
+ error_setg_errno(errp, errno, "VFIO_UNMAP_DMA failed");
}
memmove(mapping, &s->mappings[index + 1],
sizeof(s->mappings[0]) * (s->nr_mappings - index - 1));
@@ -669,7 +669,7 @@ int qemu_vfio_dma_reset_temporary(QEMUVFIOState *s)
trace_qemu_vfio_dma_reset_temporary(s);
qemu_mutex_lock(&s->lock);
if (ioctl(s->container, VFIO_IOMMU_UNMAP_DMA, &unmap)) {
- error_report("VFIO_UNMAP_DMA: %d", -errno);
+ error_report("VFIO_UNMAP_DMA failed: %s", strerror(errno));
qemu_mutex_unlock(&s->lock);
return -errno;
}
--
2.24.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 03/17] scripts/checkpatch.pl: Detect superfluous semicolon in C code
2020-02-19 10:15 [PULL 00/17] Trivial branch patches Laurent Vivier
2020-02-19 10:15 ` [PULL 01/17] mailmap: Add entry for Yu-Chen Lin Laurent Vivier
2020-02-19 10:15 ` [PULL 02/17] Report stringified errno in VFIO related errors Laurent Vivier
@ 2020-02-19 10:15 ` Laurent Vivier
2020-02-19 10:15 ` [PULL 04/17] audio/alsaaudio: Remove superfluous semicolons Laurent Vivier
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Laurent Vivier @ 2020-02-19 10:15 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Jason Wang, Michael Tokarev,
Yuval Shaia, Max Filippov, Gerd Hoffmann, Edgar E. Iglesias,
Marek Vasut, qemu-block, Juan Quintela, qemu-trivial,
Philippe Mathieu-Daudé, Laurent Vivier, Thomas Huth,
Jiri Pirko, Eduardo Habkost, Alistair Francis,
Dr . David Alan Gilbert, Alex Williamson, qemu-arm,
Richard Henderson, Kevin Wolf, Thomas Huth, Chris Wulff,
Laurent Vivier, Max Reitz, Paolo Bonzini, Luc Michel
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Display error when a commit contains superfluous semicolon:
$ git show 6663a0a3376 | scripts/checkpatch.pl -q -
ERROR: superfluous trailing semicolon
#276: FILE: block/io_uring.c:186:
+ ret = -ENOSPC;;
total: 1 errors, 1 warnings, 485 lines checked
Reported-by: Luc Michel <luc.michel@greensocs.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Luc Michel <luc.michel@greensocs.com>
Message-Id: <20200218094402.26625-2-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
scripts/checkpatch.pl | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index ce43a306f867..11512a8a09b8 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1830,6 +1830,11 @@ sub process {
ERROR("suspicious ; after while (0)\n" . $herecurr);
}
+# Check superfluous trailing ';'
+ if ($line =~ /;;$/) {
+ ERROR("superfluous trailing semicolon\n" . $herecurr);
+ }
+
# Check relative indent for conditionals and blocks.
if ($line =~ /\b(?:(?:if|while|for)\s*\(|do\b)/ && $line !~ /^.\s*#/ && $line !~ /\}\s*while\s*/) {
my ($s, $c) = ($stat, $cond);
--
2.24.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 04/17] audio/alsaaudio: Remove superfluous semicolons
2020-02-19 10:15 [PULL 00/17] Trivial branch patches Laurent Vivier
` (2 preceding siblings ...)
2020-02-19 10:15 ` [PULL 03/17] scripts/checkpatch.pl: Detect superfluous semicolon in C code Laurent Vivier
@ 2020-02-19 10:15 ` Laurent Vivier
2020-02-19 10:16 ` [PULL 05/17] hw/arm/xlnx-versal: Remove superfluous semicolon Laurent Vivier
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Laurent Vivier @ 2020-02-19 10:15 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Jason Wang, Michael Tokarev,
Yuval Shaia, Max Filippov, Gerd Hoffmann, Edgar E. Iglesias,
Marek Vasut, qemu-block, Juan Quintela, qemu-trivial,
Philippe Mathieu-Daudé, Laurent Vivier, Thomas Huth,
Jiri Pirko, Eduardo Habkost, Alistair Francis,
Dr . David Alan Gilbert, Alex Williamson, qemu-arm,
Richard Henderson, Kevin Wolf, Thomas Huth, Chris Wulff,
Laurent Vivier, Max Reitz, Paolo Bonzini
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Fixes: 286a5d201e4
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20200218094402.26625-3-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
audio/alsaaudio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index a23a5a0b60a1..a8e62542f97e 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -819,7 +819,7 @@ static size_t alsa_read(HWVoiceIn *hw, void *buf, size_t len)
switch (nread) {
case 0:
trace_alsa_read_zero(len);
- return pos;;
+ return pos;
case -EPIPE:
if (alsa_recover(alsa->handle)) {
@@ -835,7 +835,7 @@ static size_t alsa_read(HWVoiceIn *hw, void *buf, size_t len)
default:
alsa_logerr(nread, "Failed to read %zu frames to %p\n",
len, dst);
- return pos;;
+ return pos;
}
}
--
2.24.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 05/17] hw/arm/xlnx-versal: Remove superfluous semicolon
2020-02-19 10:15 [PULL 00/17] Trivial branch patches Laurent Vivier
` (3 preceding siblings ...)
2020-02-19 10:15 ` [PULL 04/17] audio/alsaaudio: Remove superfluous semicolons Laurent Vivier
@ 2020-02-19 10:16 ` Laurent Vivier
2020-02-19 10:16 ` [PULL 06/17] hw/m68k/next-cube: " Laurent Vivier
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Laurent Vivier @ 2020-02-19 10:16 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Jason Wang, Michael Tokarev,
Yuval Shaia, Max Filippov, Gerd Hoffmann, Edgar E. Iglesias,
Marek Vasut, qemu-block, Juan Quintela, qemu-trivial,
Philippe Mathieu-Daudé, Laurent Vivier, Thomas Huth,
Jiri Pirko, Eduardo Habkost, Alistair Francis,
Dr . David Alan Gilbert, Alex Williamson, qemu-arm,
Richard Henderson, Kevin Wolf, Thomas Huth, Chris Wulff,
Laurent Vivier, Max Reitz, Paolo Bonzini
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Fixes: 6f16da53ffe
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20200218094402.26625-6-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/arm/xlnx-versal-virt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c
index 462493c46711..0d2e3bdda169 100644
--- a/hw/arm/xlnx-versal-virt.c
+++ b/hw/arm/xlnx-versal-virt.c
@@ -350,7 +350,7 @@ static void create_virtio_regions(VersalVirt *s)
int i;
for (i = 0; i < NUM_VIRTIO_TRANSPORT; i++) {
- char *name = g_strdup_printf("virtio%d", i);;
+ char *name = g_strdup_printf("virtio%d", i);
hwaddr base = MM_TOP_RSVD + i * virtio_mmio_size;
int irq = VERSAL_RSVD_IRQ_FIRST + i;
MemoryRegion *mr;
--
2.24.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 06/17] hw/m68k/next-cube: Remove superfluous semicolon
2020-02-19 10:15 [PULL 00/17] Trivial branch patches Laurent Vivier
` (4 preceding siblings ...)
2020-02-19 10:16 ` [PULL 05/17] hw/arm/xlnx-versal: Remove superfluous semicolon Laurent Vivier
@ 2020-02-19 10:16 ` Laurent Vivier
2020-02-19 10:16 ` [PULL 07/17] hw/scsi/esp: " Laurent Vivier
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Laurent Vivier @ 2020-02-19 10:16 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Jason Wang, Michael Tokarev,
Yuval Shaia, Max Filippov, Gerd Hoffmann, Edgar E. Iglesias,
Marek Vasut, qemu-block, Juan Quintela, qemu-trivial,
Philippe Mathieu-Daudé, Laurent Vivier, Thomas Huth,
Jiri Pirko, Eduardo Habkost, Alistair Francis,
Dr . David Alan Gilbert, Alex Williamson, qemu-arm,
Richard Henderson, Kevin Wolf, Thomas Huth, Chris Wulff,
Laurent Vivier, Max Reitz, Paolo Bonzini
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Fixes: 956a78118bf
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20200218094402.26625-7-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/m68k/next-cube.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index e5343348d076..350c6fec78f9 100644
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -734,7 +734,7 @@ void next_irq(void *opaque, int number, int level)
switch (number) {
/* level 3 - floppy, kbd/mouse, power, ether rx/tx, scsi, clock */
case NEXT_FD_I:
- shift = 7;;
+ shift = 7;
break;
case NEXT_KBD_I:
shift = 3;
--
2.24.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 07/17] hw/scsi/esp: Remove superfluous semicolon
2020-02-19 10:15 [PULL 00/17] Trivial branch patches Laurent Vivier
` (5 preceding siblings ...)
2020-02-19 10:16 ` [PULL 06/17] hw/m68k/next-cube: " Laurent Vivier
@ 2020-02-19 10:16 ` Laurent Vivier
2020-02-19 10:16 ` [PULL 08/17] hw/vfio/display: " Laurent Vivier
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Laurent Vivier @ 2020-02-19 10:16 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Jason Wang, Michael Tokarev,
Yuval Shaia, Max Filippov, Gerd Hoffmann, Edgar E. Iglesias,
Marek Vasut, qemu-block, Juan Quintela, qemu-trivial,
Philippe Mathieu-Daudé, Laurent Vivier, Thomas Huth,
Jiri Pirko, Eduardo Habkost, Alistair Francis,
Dr . David Alan Gilbert, Alex Williamson, qemu-arm,
Richard Henderson, Kevin Wolf, Thomas Huth, Chris Wulff,
Laurent Vivier, Max Reitz, Paolo Bonzini
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Fixes: 74d71ea16bc
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20200218094402.26625-8-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/scsi/esp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index f8fc30cccbd4..405f8b7cbcf7 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -293,7 +293,7 @@ static void handle_satn_stop(ESPState *s)
s->dma_cb = handle_satn_stop;
return;
}
- s->pdma_cb = satn_stop_pdma_cb;;
+ s->pdma_cb = satn_stop_pdma_cb;
s->cmdlen = get_cmd(s, s->cmdbuf, sizeof(s->cmdbuf));
if (s->cmdlen) {
trace_esp_handle_satn_stop(s->cmdlen);
--
2.24.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 08/17] hw/vfio/display: Remove superfluous semicolon
2020-02-19 10:15 [PULL 00/17] Trivial branch patches Laurent Vivier
` (6 preceding siblings ...)
2020-02-19 10:16 ` [PULL 07/17] hw/scsi/esp: " Laurent Vivier
@ 2020-02-19 10:16 ` Laurent Vivier
2020-02-19 10:16 ` [PULL 09/17] ui/input-barrier: " Laurent Vivier
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Laurent Vivier @ 2020-02-19 10:16 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Jason Wang, Michael Tokarev,
Yuval Shaia, Max Filippov, Gerd Hoffmann, Edgar E. Iglesias,
Marek Vasut, qemu-block, Juan Quintela, qemu-trivial,
Philippe Mathieu-Daudé, Laurent Vivier, Thomas Huth,
Jiri Pirko, Eduardo Habkost, Alistair Francis,
Dr . David Alan Gilbert, Alex Williamson, qemu-arm,
Richard Henderson, Kevin Wolf, Thomas Huth, Chris Wulff,
Laurent Vivier, Max Reitz, Paolo Bonzini
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Fixes: 8b818e059bf
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20200218094402.26625-9-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/vfio/display.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/vfio/display.c b/hw/vfio/display.c
index a5a608c5b226..f4977c66e1b5 100644
--- a/hw/vfio/display.c
+++ b/hw/vfio/display.c
@@ -287,7 +287,7 @@ static void vfio_display_dmabuf_update(void *opaque)
VFIOPCIDevice *vdev = opaque;
VFIODisplay *dpy = vdev->dpy;
VFIODMABuf *primary, *cursor;
- bool free_bufs = false, new_cursor = false;;
+ bool free_bufs = false, new_cursor = false;
primary = vfio_display_get_dmabuf(vdev, DRM_PLANE_TYPE_PRIMARY);
if (primary == NULL) {
--
2.24.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 09/17] ui/input-barrier: Remove superfluous semicolon
2020-02-19 10:15 [PULL 00/17] Trivial branch patches Laurent Vivier
` (7 preceding siblings ...)
2020-02-19 10:16 ` [PULL 08/17] hw/vfio/display: " Laurent Vivier
@ 2020-02-19 10:16 ` Laurent Vivier
2020-02-19 10:16 ` [PULL 10/17] target/i386/whpx: " Laurent Vivier
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Laurent Vivier @ 2020-02-19 10:16 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Jason Wang, Michael Tokarev,
Yuval Shaia, Max Filippov, Gerd Hoffmann, Edgar E. Iglesias,
Marek Vasut, qemu-block, Juan Quintela, qemu-trivial,
Philippe Mathieu-Daudé, Laurent Vivier, Thomas Huth,
Jiri Pirko, Eduardo Habkost, Alistair Francis,
Dr . David Alan Gilbert, Alex Williamson, qemu-arm,
Richard Henderson, Kevin Wolf, Thomas Huth, Chris Wulff,
Laurent Vivier, Max Reitz, Paolo Bonzini
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Fixes: 6105683da35
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20200218094402.26625-11-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
ui/input-barrier.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/input-barrier.c b/ui/input-barrier.c
index fe35049b83a2..527c75e130ee 100644
--- a/ui/input-barrier.c
+++ b/ui/input-barrier.c
@@ -455,7 +455,7 @@ static gboolean writecmd(InputBarrier *ib, struct barrierMsg *msg)
break;
default:
write_cmd(p, barrierCmdEUnknown, avail);
- break;;
+ break;
}
len = MAX_HELLO_LENGTH - avail - sizeof(int);
--
2.24.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 10/17] target/i386/whpx: Remove superfluous semicolon
2020-02-19 10:15 [PULL 00/17] Trivial branch patches Laurent Vivier
` (8 preceding siblings ...)
2020-02-19 10:16 ` [PULL 09/17] ui/input-barrier: " Laurent Vivier
@ 2020-02-19 10:16 ` Laurent Vivier
2020-02-19 10:16 ` [PULL 11/17] tests/qtest/libqos/qgraph: Remove superfluous semicolons Laurent Vivier
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Laurent Vivier @ 2020-02-19 10:16 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Jason Wang, Michael Tokarev,
Yuval Shaia, Max Filippov, Gerd Hoffmann, Edgar E. Iglesias,
Marek Vasut, qemu-block, Juan Quintela, qemu-trivial,
Philippe Mathieu-Daudé, Laurent Vivier, Thomas Huth,
Jiri Pirko, Eduardo Habkost, Alistair Francis,
Dr . David Alan Gilbert, Alex Williamson, qemu-arm,
Richard Henderson, Kevin Wolf, Thomas Huth, Chris Wulff,
Laurent Vivier, Max Reitz, Paolo Bonzini
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Fixes: 812d49f2a3e
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20200218094402.26625-12-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
target/i386/whpx-all.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c
index 3ed2aa1892a1..35601b81766f 100644
--- a/target/i386/whpx-all.c
+++ b/target/i386/whpx-all.c
@@ -511,7 +511,7 @@ static void whpx_get_registers(CPUState *cpu)
/* WHvX64RegisterPat - Skipped */
assert(whpx_register_names[idx] == WHvX64RegisterSysenterCs);
- env->sysenter_cs = vcxt.values[idx++].Reg64;;
+ env->sysenter_cs = vcxt.values[idx++].Reg64;
assert(whpx_register_names[idx] == WHvX64RegisterSysenterEip);
env->sysenter_eip = vcxt.values[idx++].Reg64;
assert(whpx_register_names[idx] == WHvX64RegisterSysenterEsp);
--
2.24.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 11/17] tests/qtest/libqos/qgraph: Remove superfluous semicolons
2020-02-19 10:15 [PULL 00/17] Trivial branch patches Laurent Vivier
` (9 preceding siblings ...)
2020-02-19 10:16 ` [PULL 10/17] target/i386/whpx: " Laurent Vivier
@ 2020-02-19 10:16 ` Laurent Vivier
2020-02-19 10:16 ` [PULL 12/17] contrib/rdmacm-mux: Remove superfluous semicolon Laurent Vivier
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Laurent Vivier @ 2020-02-19 10:16 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Jason Wang, Michael Tokarev,
Yuval Shaia, Max Filippov, Gerd Hoffmann, Edgar E. Iglesias,
Marek Vasut, qemu-block, Juan Quintela, qemu-trivial,
Philippe Mathieu-Daudé, Laurent Vivier, Thomas Huth,
Jiri Pirko, Eduardo Habkost, Alistair Francis,
Dr . David Alan Gilbert, Alex Williamson, qemu-arm,
Richard Henderson, Kevin Wolf, Thomas Huth, Chris Wulff,
Laurent Vivier, Max Reitz, Paolo Bonzini
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Fixes: fc281c80202
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20200218094402.26625-13-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
tests/qtest/libqos/qgraph.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/qtest/libqos/qgraph.c b/tests/qtest/libqos/qgraph.c
index 7a7ae2a19edc..ca01de07437b 100644
--- a/tests/qtest/libqos/qgraph.c
+++ b/tests/qtest/libqos/qgraph.c
@@ -474,7 +474,7 @@ QOSEdgeType qos_graph_edge_get_type(QOSGraphEdge *edge)
if (!edge) {
return -1;
}
- return edge->type;;
+ return edge->type;
}
char *qos_graph_edge_get_dest(QOSGraphEdge *edge)
@@ -590,7 +590,7 @@ void qos_add_test(const char *name, const char *interface,
QOSTestFunc test_func, QOSGraphTestOptions *opts)
{
QOSGraphNode *node;
- char *test_name = g_strdup_printf("%s-tests/%s", interface, name);;
+ char *test_name = g_strdup_printf("%s-tests/%s", interface, name);
QOSGraphTestOptions def_opts = { };
if (!opts) {
--
2.24.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 12/17] contrib/rdmacm-mux: Remove superfluous semicolon
2020-02-19 10:15 [PULL 00/17] Trivial branch patches Laurent Vivier
` (10 preceding siblings ...)
2020-02-19 10:16 ` [PULL 11/17] tests/qtest/libqos/qgraph: Remove superfluous semicolons Laurent Vivier
@ 2020-02-19 10:16 ` Laurent Vivier
2020-02-19 10:16 ` [PULL 13/17] hw/display/qxl: Remove unneeded variable assignment Laurent Vivier
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Laurent Vivier @ 2020-02-19 10:16 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Jason Wang, Michael Tokarev,
Yuval Shaia, Max Filippov, Gerd Hoffmann, Edgar E. Iglesias,
Marek Vasut, qemu-block, Juan Quintela, qemu-trivial,
Philippe Mathieu-Daudé, Laurent Vivier, Thomas Huth,
Jiri Pirko, Eduardo Habkost, Alistair Francis,
Dr . David Alan Gilbert, Alex Williamson, qemu-arm,
Richard Henderson, Kevin Wolf, Thomas Huth, Chris Wulff,
Laurent Vivier, Max Reitz, Paolo Bonzini
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Fixes: a5d2f6f8773
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20200218094402.26625-14-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
contrib/rdmacm-mux/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/rdmacm-mux/main.c b/contrib/rdmacm-mux/main.c
index de53048f0619..bd82abbad35e 100644
--- a/contrib/rdmacm-mux/main.c
+++ b/contrib/rdmacm-mux/main.c
@@ -490,7 +490,7 @@ static int read_and_process(int fd)
static int accept_all(void)
{
- int fd, rc = 0;;
+ int fd, rc = 0;
pthread_rwlock_wrlock(&server.lock);
--
2.24.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 13/17] hw/display/qxl: Remove unneeded variable assignment
2020-02-19 10:15 [PULL 00/17] Trivial branch patches Laurent Vivier
` (11 preceding siblings ...)
2020-02-19 10:16 ` [PULL 12/17] contrib/rdmacm-mux: Remove superfluous semicolon Laurent Vivier
@ 2020-02-19 10:16 ` Laurent Vivier
2020-02-19 10:16 ` [PULL 14/17] hw/block/pflash_cfi02: " Laurent Vivier
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Laurent Vivier @ 2020-02-19 10:16 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Jason Wang, Michael Tokarev,
Yuval Shaia, Max Filippov, Gerd Hoffmann, Edgar E. Iglesias,
Marek Vasut, qemu-block, qemu-trivial,
Philippe Mathieu-Daudé, Laurent Vivier, Thomas Huth,
Jiri Pirko, Eduardo Habkost, Alistair Francis, Richard Henderson,
Alex Williamson, qemu-arm, Richard Henderson, Kevin Wolf,
Thomas Huth, Chris Wulff, Laurent Vivier, Max Reitz,
Paolo Bonzini
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Fix warning reported by Clang static code analyzer:
hw/display/qxl.c:1634:14: warning: Value stored to 'orig_io_port' during its initialization is never read
uint32_t orig_io_port = io_port;
^~~~~~~~~~~~ ~~~~~~~
Reported-by: Clang Static Analyzer
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200215161557.4077-3-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/display/qxl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 64884da70857..21a43a1d5ec2 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -1631,7 +1631,7 @@ static void ioport_write(void *opaque, hwaddr addr,
PCIQXLDevice *d = opaque;
uint32_t io_port = addr;
qxl_async_io async = QXL_SYNC;
- uint32_t orig_io_port = io_port;
+ uint32_t orig_io_port;
if (d->guest_bug && io_port != QXL_IO_RESET) {
return;
--
2.24.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 14/17] hw/block/pflash_cfi02: Remove unneeded variable assignment
2020-02-19 10:15 [PULL 00/17] Trivial branch patches Laurent Vivier
` (12 preceding siblings ...)
2020-02-19 10:16 ` [PULL 13/17] hw/display/qxl: Remove unneeded variable assignment Laurent Vivier
@ 2020-02-19 10:16 ` Laurent Vivier
2020-02-19 10:16 ` [PULL 15/17] hw/net/rocker: Report unimplemented feature with qemu_log_mask(UNIMP) Laurent Vivier
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Laurent Vivier @ 2020-02-19 10:16 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Jason Wang, Michael Tokarev,
Yuval Shaia, Max Filippov, Gerd Hoffmann, Edgar E. Iglesias,
Marek Vasut, qemu-block, qemu-trivial,
Philippe Mathieu-Daudé, Laurent Vivier, Thomas Huth,
Jiri Pirko, Eduardo Habkost, Alistair Francis, Richard Henderson,
Alex Williamson, qemu-arm, Richard Henderson, Kevin Wolf,
Thomas Huth, Chris Wulff, Laurent Vivier, Max Reitz,
Paolo Bonzini
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Fix warning reported by Clang static code analyzer:
CC hw/block/pflash_cfi02.o
hw/block/pflash_cfi02.c:311:5: warning: Value stored to 'ret' is never read
ret = -1;
^ ~~
Reported-by: Clang Static Analyzer
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200215161557.4077-4-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/block/pflash_cfi02.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
index 7c4744c020c1..12f18d401a85 100644
--- a/hw/block/pflash_cfi02.c
+++ b/hw/block/pflash_cfi02.c
@@ -308,7 +308,6 @@ static uint64_t pflash_read(void *opaque, hwaddr offset, unsigned int width)
hwaddr boff;
uint64_t ret;
- ret = -1;
/* Lazy reset to ROMD mode after a certain amount of read accesses */
if (!pfl->rom_mode && pfl->wcycle == 0 &&
++pfl->read_counter > PFLASH_LAZY_ROMD_THRESHOLD) {
--
2.24.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 15/17] hw/net/rocker: Report unimplemented feature with qemu_log_mask(UNIMP)
2020-02-19 10:15 [PULL 00/17] Trivial branch patches Laurent Vivier
` (13 preceding siblings ...)
2020-02-19 10:16 ` [PULL 14/17] hw/block/pflash_cfi02: " Laurent Vivier
@ 2020-02-19 10:16 ` Laurent Vivier
2020-02-19 10:16 ` [PULL 16/17] hw/nios2:fix leak of fdevice tree blob Laurent Vivier
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Laurent Vivier @ 2020-02-19 10:16 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Jason Wang, Michael Tokarev,
Yuval Shaia, Max Filippov, Gerd Hoffmann, Edgar E. Iglesias,
Marek Vasut, qemu-block, qemu-trivial,
Philippe Mathieu-Daudé, Laurent Vivier, Thomas Huth,
Jiri Pirko, Eduardo Habkost, Alistair Francis, Alex Williamson,
qemu-arm, Stefan Hajnoczi, Richard Henderson, Kevin Wolf,
Thomas Huth, Chris Wulff, Laurent Vivier, Max Reitz,
Paolo Bonzini
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Fix warnings reported by Clang static code analyzer:
CC hw/net/rocker/rocker.o
hw/net/rocker/rocker.c:213:9: warning: Value stored to 'tx_tso_mss' is never read
tx_tso_mss = rocker_tlv_get_le16(tlvs[ROCKER_TLV_TX_TSO_MSS]);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
hw/net/rocker/rocker.c:217:9: warning: Value stored to 'tx_tso_hdr_len' is never read
tx_tso_hdr_len = rocker_tlv_get_le16(tlvs[ROCKER_TLV_TX_TSO_HDR_LEN]);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
hw/net/rocker/rocker.c:255:9: warning: Value stored to 'tx_l3_csum_off' is never read
tx_l3_csum_off += tx_tso_mss = tx_tso_hdr_len = 0;
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Fixes: dc488f888
Reported-by: Clang Static Analyzer
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20200217101637.27558-1-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/net/rocker/rocker.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
index 81dd3b5f141d..15d66f6cbcf0 100644
--- a/hw/net/rocker/rocker.c
+++ b/hw/net/rocker/rocker.c
@@ -27,6 +27,7 @@
#include "qemu/iov.h"
#include "qemu/module.h"
#include "qemu/bitops.h"
+#include "qemu/log.h"
#include "rocker.h"
#include "rocker_hw.h"
@@ -207,14 +208,22 @@ static int tx_consume(Rocker *r, DescInfo *info)
if (tlvs[ROCKER_TLV_TX_L3_CSUM_OFF]) {
tx_l3_csum_off = rocker_tlv_get_le16(tlvs[ROCKER_TLV_TX_L3_CSUM_OFF]);
+ qemu_log_mask(LOG_UNIMP, "rocker %s: L3 not implemented"
+ " (cksum off: %u)\n",
+ __func__, tx_l3_csum_off);
}
if (tlvs[ROCKER_TLV_TX_TSO_MSS]) {
tx_tso_mss = rocker_tlv_get_le16(tlvs[ROCKER_TLV_TX_TSO_MSS]);
+ qemu_log_mask(LOG_UNIMP, "rocker %s: TSO not implemented (MSS: %u)\n",
+ __func__, tx_tso_mss);
}
if (tlvs[ROCKER_TLV_TX_TSO_HDR_LEN]) {
tx_tso_hdr_len = rocker_tlv_get_le16(tlvs[ROCKER_TLV_TX_TSO_HDR_LEN]);
+ qemu_log_mask(LOG_UNIMP, "rocker %s: TSO not implemented"
+ " (hdr length: %u)\n",
+ __func__, tx_tso_hdr_len);
}
rocker_tlv_for_each_nested(tlv_frag, tlvs[ROCKER_TLV_TX_FRAGS], rem) {
@@ -249,12 +258,6 @@ static int tx_consume(Rocker *r, DescInfo *info)
iovcnt++;
}
- if (iovcnt) {
- /* XXX perform Tx offloads */
- /* XXX silence compiler for now */
- tx_l3_csum_off += tx_tso_mss = tx_tso_hdr_len = 0;
- }
-
err = fp_port_eg(r->fp_port[port], iov, iovcnt);
err_too_many_frags:
--
2.24.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 16/17] hw/nios2:fix leak of fdevice tree blob
2020-02-19 10:15 [PULL 00/17] Trivial branch patches Laurent Vivier
` (14 preceding siblings ...)
2020-02-19 10:16 ` [PULL 15/17] hw/net/rocker: Report unimplemented feature with qemu_log_mask(UNIMP) Laurent Vivier
@ 2020-02-19 10:16 ` Laurent Vivier
2020-02-19 10:16 ` [PULL 17/17] hw/xtensa/xtfpga:fix " Laurent Vivier
2020-02-20 17:35 ` [PULL 00/17] Trivial branch patches Peter Maydell
17 siblings, 0 replies; 19+ messages in thread
From: Laurent Vivier @ 2020-02-19 10:16 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Jason Wang, Michael Tokarev,
Yuval Shaia, Max Filippov, Gerd Hoffmann, Edgar E. Iglesias,
Marek Vasut, qemu-block, qemu-trivial,
Philippe Mathieu-Daudé, Laurent Vivier, Thomas Huth,
Jiri Pirko, Eduardo Habkost, Alistair Francis, Alex Williamson,
qemu-arm, Chen Qun, Richard Henderson, Kevin Wolf, Thomas Huth,
Chris Wulff, Laurent Vivier, Max Reitz, Euler Robot,
Paolo Bonzini
From: Chen Qun <kuhn.chenqun@huawei.com>
The device tree blob returned by load_device_tree is malloced.
We should free it after cpu_physical_memory_write().
Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Chen Qun <kuhn.chenqun@huawei.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200218091154.21696-2-kuhn.chenqun@huawei.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/nios2/boot.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c
index 46b834987691..88224aa84c8b 100644
--- a/hw/nios2/boot.c
+++ b/hw/nios2/boot.c
@@ -109,6 +109,7 @@ static int nios2_load_dtb(struct nios2_boot_info bi, const uint32_t ramsize,
}
cpu_physical_memory_write(bi.fdt, fdt, fdt_size);
+ g_free(fdt);
return fdt_size;
}
--
2.24.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 17/17] hw/xtensa/xtfpga:fix leak of fdevice tree blob
2020-02-19 10:15 [PULL 00/17] Trivial branch patches Laurent Vivier
` (15 preceding siblings ...)
2020-02-19 10:16 ` [PULL 16/17] hw/nios2:fix leak of fdevice tree blob Laurent Vivier
@ 2020-02-19 10:16 ` Laurent Vivier
2020-02-20 17:35 ` [PULL 00/17] Trivial branch patches Peter Maydell
17 siblings, 0 replies; 19+ messages in thread
From: Laurent Vivier @ 2020-02-19 10:16 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Jason Wang, Michael Tokarev,
Yuval Shaia, Max Filippov, Gerd Hoffmann, Edgar E. Iglesias,
Marek Vasut, qemu-block, qemu-trivial,
Philippe Mathieu-Daudé, Laurent Vivier, Thomas Huth,
Jiri Pirko, Eduardo Habkost, Alistair Francis, Alex Williamson,
qemu-arm, Chen Qun, Richard Henderson, Kevin Wolf, Thomas Huth,
Chris Wulff, Laurent Vivier, Max Reitz, Euler Robot,
Paolo Bonzini
From: Chen Qun <kuhn.chenqun@huawei.com>
The device tree blob returned by load_device_tree is malloced.
We should free it after cpu_physical_memory_write().
Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Chen Qun <kuhn.chenqun@huawei.com>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200218091154.21696-4-kuhn.chenqun@huawei.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/xtensa/xtfpga.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index 8e2dd1327a46..60ccc74f5f1d 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -380,6 +380,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
cur_tagptr = put_tag(cur_tagptr, BP_TAG_FDT,
sizeof(dtb_addr), &dtb_addr);
cur_lowmem = QEMU_ALIGN_UP(cur_lowmem + fdt_size, 4 * KiB);
+ g_free(fdt);
}
#else
if (dtb_filename) {
--
2.24.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PULL 00/17] Trivial branch patches
2020-02-19 10:15 [PULL 00/17] Trivial branch patches Laurent Vivier
` (16 preceding siblings ...)
2020-02-19 10:16 ` [PULL 17/17] hw/xtensa/xtfpga:fix " Laurent Vivier
@ 2020-02-20 17:35 ` Peter Maydell
17 siblings, 0 replies; 19+ messages in thread
From: Peter Maydell @ 2020-02-20 17:35 UTC (permalink / raw)
To: Laurent Vivier
Cc: Fam Zheng, Jason Wang, Michael Tokarev, QEMU Developers,
Max Filippov, Gerd Hoffmann, Edgar E. Iglesias, Marek Vasut,
Qemu-block, QEMU Trivial, Philippe Mathieu-Daudé,
Laurent Vivier, Thomas Huth, Jiri Pirko, Eduardo Habkost,
Alistair Francis, Yuval Shaia, Alex Williamson, qemu-arm,
Richard Henderson, Kevin Wolf, Thomas Huth, Chris Wulff,
Max Reitz, Paolo Bonzini
On Wed, 19 Feb 2020 at 10:16, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 6c599282f8ab382fe59f03a6cae755b89561a7b3:
>
> Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2020-02-15-v2' into staging (2020-02-17 13:32:25 +0000)
>
> are available in the Git repository at:
>
> git://github.com/vivier/qemu.git tags/trivial-branch-pull-request
>
> for you to fetch changes up to d1cb67841ca213802ee789957188ec87e8b7996d:
>
> hw/xtensa/xtfpga:fix leak of fdevice tree blob (2020-02-19 10:33:38 +0100)
>
> ----------------------------------------------------------------
> Fix memory leak with fdt
> cosmetic change in code and logs
> update mailmap
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 19+ messages in thread