* [PULL 1/8] vhost-vdpa: fix indentation in vdpa_ops
2020-09-28 9:15 [PULL 0/8] Trivial branch for 5.2 patches Laurent Vivier
@ 2020-09-28 9:15 ` Laurent Vivier
2020-09-28 9:15 ` [PULL 2/8] meson: fix static flag summary Laurent Vivier
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Laurent Vivier @ 2020-09-28 9:15 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Li Qiang, Michael Tokarev, Laurent Vivier,
Stefano Garzarella
From: Stefano Garzarella <sgarzare@redhat.com>
This patch fixes wrong indentation of some vdpa_ops fields introduced
with the initial commit 108a64818e ("vhost-vdpa: introduce vhost-vdpa
backend")
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200916152634.56917-1-sgarzare@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/virtio/vhost-vdpa.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 4580f3efd8a2..e123837a55de 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -469,6 +469,6 @@ const VhostOps vdpa_ops = {
.vhost_send_device_iotlb_msg = NULL,
.vhost_dev_start = vhost_vdpa_dev_start,
.vhost_get_device_id = vhost_vdpa_get_device_id,
- .vhost_vq_get_addr = vhost_vdpa_vq_get_addr,
- .vhost_force_iommu = vhost_vdpa_force_iommu,
+ .vhost_vq_get_addr = vhost_vdpa_vq_get_addr,
+ .vhost_force_iommu = vhost_vdpa_force_iommu,
};
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 2/8] meson: fix static flag summary
2020-09-28 9:15 [PULL 0/8] Trivial branch for 5.2 patches Laurent Vivier
2020-09-28 9:15 ` [PULL 1/8] vhost-vdpa: fix indentation in vdpa_ops Laurent Vivier
@ 2020-09-28 9:15 ` Laurent Vivier
2020-09-28 9:15 ` [PULL 3/8] virtio: vdpa: omit check return of g_malloc Laurent Vivier
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Laurent Vivier @ 2020-09-28 9:15 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Laurent Vivier, Michael Tokarev, Laurent Vivier,
Philippe Mathieu-Daudé
From: Laurent Vivier <lvivier@redhat.com>
'static build:' must display value of CONFIG_STATIC rather than value of
CONFIG_TOOLS.
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200917140700.673171-1-lvivier@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index f4d1ab109680..b26c8bffc6fe 100644
--- a/meson.build
+++ b/meson.build
@@ -1368,7 +1368,7 @@ summary_info += {'gprof enabled': config_host.has_key('CONFIG_GPROF')}
summary_info += {'sparse enabled': meson.get_compiler('c').cmd_array().contains('cgcc')}
summary_info += {'strip binaries': get_option('strip')}
summary_info += {'profiler': config_host.has_key('CONFIG_PROFILER')}
-summary_info += {'static build': config_host.has_key('CONFIG_TOOLS')}
+summary_info += {'static build': config_host.has_key('CONFIG_STATIC')}
if targetos == 'darwin'
summary_info += {'Cocoa support': config_host.has_key('CONFIG_COCOA')}
endif
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 3/8] virtio: vdpa: omit check return of g_malloc
2020-09-28 9:15 [PULL 0/8] Trivial branch for 5.2 patches Laurent Vivier
2020-09-28 9:15 ` [PULL 1/8] vhost-vdpa: fix indentation in vdpa_ops Laurent Vivier
2020-09-28 9:15 ` [PULL 2/8] meson: fix static flag summary Laurent Vivier
@ 2020-09-28 9:15 ` Laurent Vivier
2020-09-28 9:15 ` [PULL 4/8] Add *.pyc back to the .gitignore file Laurent Vivier
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Laurent Vivier @ 2020-09-28 9:15 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, qemu-trivial, Michael Tokarev, Li Qiang,
Laurent Vivier, Alex Bennée
From: Li Qiang <liq3ea@163.com>
If g_malloc fails, the application will be terminated.
No need to check the return value of g_malloc.
Signed-off-by: Li Qiang <liq3ea@163.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200819144309.67579-1-liq3ea@163.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/virtio/vhost-vdpa.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index e123837a55de..97f4b2e353ab 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -320,10 +320,8 @@ static int vhost_vdpa_set_config(struct vhost_dev *dev, const uint8_t *data,
struct vhost_vdpa_config *config;
int ret;
unsigned long config_size = offsetof(struct vhost_vdpa_config, buf);
+
config = g_malloc(size + config_size);
- if (config == NULL) {
- return -1;
- }
config->off = offset;
config->len = size;
memcpy(config->buf, data, size);
@@ -340,9 +338,6 @@ static int vhost_vdpa_get_config(struct vhost_dev *dev, uint8_t *config,
int ret;
v_config = g_malloc(config_len + config_size);
- if (v_config == NULL) {
- return -1;
- }
v_config->len = config_len;
v_config->off = 0;
ret = vhost_vdpa_call(dev, VHOST_VDPA_GET_CONFIG, v_config);
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 4/8] Add *.pyc back to the .gitignore file
2020-09-28 9:15 [PULL 0/8] Trivial branch for 5.2 patches Laurent Vivier
` (2 preceding siblings ...)
2020-09-28 9:15 ` [PULL 3/8] virtio: vdpa: omit check return of g_malloc Laurent Vivier
@ 2020-09-28 9:15 ` Laurent Vivier
2020-09-28 9:15 ` [PULL 5/8] vhost-vdpa: remove useless variable Laurent Vivier
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Laurent Vivier @ 2020-09-28 9:15 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Thomas Huth, qemu-trivial, Michael Tokarev,
Laurent Vivier, Philippe Mathieu-Daudé
From: Thomas Huth <thuth@redhat.com>
Python still dumps its bytecode into the source directory, so
we should continue to ignore the *.pyc files.
Fixes: 0e72b7df4d ("Simplify the .gitignore file")
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200919101859.28739-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 5515f595e67c..b32bca1315e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
/GNUmakefile
/build/
+*.pyc
.sdk
.stgit-*
.git-submodule-status
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 5/8] vhost-vdpa: remove useless variable
2020-09-28 9:15 [PULL 0/8] Trivial branch for 5.2 patches Laurent Vivier
` (3 preceding siblings ...)
2020-09-28 9:15 ` [PULL 4/8] Add *.pyc back to the .gitignore file Laurent Vivier
@ 2020-09-28 9:15 ` Laurent Vivier
2020-09-28 9:16 ` [PULL 6/8] timer: Fix timer_mod_anticipate() documentation Laurent Vivier
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Laurent Vivier @ 2020-09-28 9:15 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, qemu-trivial, Michael Tokarev, Li Qiang,
Laurent Vivier, Philippe Mathieu-Daudé
From: Laurent Vivier <lvivier@redhat.com>
in vhost_vdpa_listener_region_del(), try_unmap is always true and so,
vhost_vdpa_dma_unmap() is always called. We can remove the variable
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Message-Id: <20200920152024.860172-1-lvivier@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/virtio/vhost-vdpa.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 97f4b2e353ab..aedc52c4d791 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -153,7 +153,6 @@ static void vhost_vdpa_listener_region_del(MemoryListener *listener,
hwaddr iova;
Int128 llend, llsize;
int ret;
- bool try_unmap = true;
if (vhost_vdpa_listener_skipped_section(section)) {
return;
@@ -176,11 +175,9 @@ static void vhost_vdpa_listener_region_del(MemoryListener *listener,
llsize = int128_sub(llend, int128_make64(iova));
- if (try_unmap) {
- ret = vhost_vdpa_dma_unmap(v, iova, int128_get64(llsize));
- if (ret) {
- error_report("vhost_vdpa dma unmap error!");
- }
+ ret = vhost_vdpa_dma_unmap(v, iova, int128_get64(llsize));
+ if (ret) {
+ error_report("vhost_vdpa dma unmap error!");
}
memory_region_unref(section->mr);
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 6/8] timer: Fix timer_mod_anticipate() documentation
2020-09-28 9:15 [PULL 0/8] Trivial branch for 5.2 patches Laurent Vivier
` (4 preceding siblings ...)
2020-09-28 9:15 ` [PULL 5/8] vhost-vdpa: remove useless variable Laurent Vivier
@ 2020-09-28 9:16 ` Laurent Vivier
2020-09-28 9:16 ` [PULL 7/8] migration/multifd: Remove superfluous semicolons Laurent Vivier
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Laurent Vivier @ 2020-09-28 9:16 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Richard Henderson, Michael Tokarev, Laurent Vivier,
Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
timer_mod_anticipate() will be scaled to the timer unit,
which is not always nanosecond. Fix the documentation.
Fixes: add40e9777d ("timer: add timer_mod_anticipate*")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200920155042.400737-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
include/qemu/timer.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/qemu/timer.h b/include/qemu/timer.h
index 6a8b48b5a9d8..1dc880e94e76 100644
--- a/include/qemu/timer.h
+++ b/include/qemu/timer.h
@@ -679,7 +679,7 @@ void timer_mod(QEMUTimer *ts, int64_t expire_timer);
/**
* timer_mod_anticipate:
* @ts: the timer
- * @expire_time: the expiry time in nanoseconds
+ * @expire_time: the expire time in the units associated with the timer
*
* Modify a timer to expire at @expire_time or the current time, whichever
* comes earlier, taking into account the scale associated with the timer.
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 7/8] migration/multifd: Remove superfluous semicolons
2020-09-28 9:15 [PULL 0/8] Trivial branch for 5.2 patches Laurent Vivier
` (5 preceding siblings ...)
2020-09-28 9:16 ` [PULL 6/8] timer: Fix timer_mod_anticipate() documentation Laurent Vivier
@ 2020-09-28 9:16 ` Laurent Vivier
2020-09-28 9:16 ` [PULL 8/8] docs/system/deprecated: Move lm32 and unicore32 to the right section Laurent Vivier
2020-09-28 15:48 ` [PULL 0/8] Trivial branch for 5.2 patches Peter Maydell
8 siblings, 0 replies; 10+ messages in thread
From: Laurent Vivier @ 2020-09-28 9:16 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Li Qiang, Michael Tokarev, Laurent Vivier,
Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
checkpatch.pl report superfluous semicolons since commit
ee0f3c09e01, but this one was missed:
scripts/checkpatch.pl d32ca5ad798~..d32ca5ad798
ERROR: superfluous trailing semicolon
#498: FILE: migration/multifd.c:308:
+ ram_counters.transferred += transferred;;
total: 1 errors, 1 warnings, 2073 lines checked
Fixes: d32ca5ad798 ("multifd: Split multifd code into its own file")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Message-Id: <20200921040231.437653-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
migration/multifd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/migration/multifd.c b/migration/multifd.c
index ac84a61797f3..2de5263c3263 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -447,7 +447,7 @@ static int multifd_send_pages(QEMUFile *f)
+ p->packet_len;
qemu_file_update_transfer(f, transferred);
ram_counters.multifd_bytes += transferred;
- ram_counters.transferred += transferred;;
+ ram_counters.transferred += transferred;
qemu_mutex_unlock(&p->mutex);
qemu_sem_post(&p->sem);
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 8/8] docs/system/deprecated: Move lm32 and unicore32 to the right section
2020-09-28 9:15 [PULL 0/8] Trivial branch for 5.2 patches Laurent Vivier
` (6 preceding siblings ...)
2020-09-28 9:16 ` [PULL 7/8] migration/multifd: Remove superfluous semicolons Laurent Vivier
@ 2020-09-28 9:16 ` Laurent Vivier
2020-09-28 15:48 ` [PULL 0/8] Trivial branch for 5.2 patches Peter Maydell
8 siblings, 0 replies; 10+ messages in thread
From: Laurent Vivier @ 2020-09-28 9:16 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Philippe Mathieu-Daudé, Thomas Huth,
Michael Tokarev, Laurent Vivier
From: Thomas Huth <thuth@redhat.com>
lm32 and unicore32 are softmmut targets, and not linux-user targets.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200923080015.77373-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
docs/system/deprecated.rst | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst
index 808c334fe74d..b2f383ce52e4 100644
--- a/docs/system/deprecated.rst
+++ b/docs/system/deprecated.rst
@@ -329,6 +329,22 @@ The ``compat`` property used to set backwards compatibility modes for
the processor has been deprecated. The ``max-cpu-compat`` property of
the ``pseries`` machine type should be used instead.
+``lm32`` CPUs (since 5.2.0)
+'''''''''''''''''''''''''''
+
+The ``lm32`` guest CPU support is deprecated and will be removed in
+a future version of QEMU. The only public user of this architecture
+was the milkymist project, which has been dead for years; there was
+never an upstream Linux port.
+
+``unicore32`` CPUs (since 5.2.0)
+''''''''''''''''''''''''''''''''
+
+The ``unicore32`` guest CPU support is deprecated and will be removed in
+a future version of QEMU. Support for this CPU was removed from the
+upstream Linux kernel, and there is no available upstream toolchain
+to build binaries for it.
+
System emulator devices
-----------------------
@@ -408,22 +424,6 @@ The above, converted to the current supported format::
linux-user mode CPUs
--------------------
-``lm32`` CPUs (since 5.2.0)
-'''''''''''''''''''''''''''
-
-The ``lm32`` guest CPU support is deprecated and will be removed in
-a future version of QEMU. The only public user of this architecture
-was the milkymist project, which has been dead for years; there was
-never an upstream Linux port.
-
-``unicore32`` CPUs (since 5.2.0)
-''''''''''''''''''''''''''''''''
-
-The ``unicore32`` guest CPU support is deprecated and will be removed in
-a future version of QEMU. Support for this CPU was removed from the
-upstream Linux kernel, and there is no available upstream toolchain
-to build binaries for it.
-
``tilegx`` CPUs (since 5.1.0)
'''''''''''''''''''''''''''''
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PULL 0/8] Trivial branch for 5.2 patches
2020-09-28 9:15 [PULL 0/8] Trivial branch for 5.2 patches Laurent Vivier
` (7 preceding siblings ...)
2020-09-28 9:16 ` [PULL 8/8] docs/system/deprecated: Move lm32 and unicore32 to the right section Laurent Vivier
@ 2020-09-28 15:48 ` Peter Maydell
8 siblings, 0 replies; 10+ messages in thread
From: Peter Maydell @ 2020-09-28 15:48 UTC (permalink / raw)
To: Laurent Vivier; +Cc: QEMU Trivial, Michael Tokarev, QEMU Developers
On Mon, 28 Sep 2020 at 10:21, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit c122bca9cd7b986be4d473240a4fec6315b7a2c2:
>
> Merge remote-tracking branch 'remotes/ericb/tags/pull-bitmaps-2020-09-21' i=
> nto staging (2020-09-23 15:11:38 +0100)
>
> are available in the Git repository at:
>
> git://github.com/vivier/qemu.git tags/trivial-branch-for-5.2-pull-request
>
> for you to fetch changes up to c66790b5dfc2430c04bf5876cf485e1f538af7f2:
>
> docs/system/deprecated: Move lm32 and unicore32 to the right section (2020-=
> 09-23 19:19:57 +0200)
>
> ----------------------------------------------------------------
> Trivial Patches Pull request 20200928
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/5.2
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 10+ messages in thread