diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | docs/system/deprecated.rst | 32 | ||||
-rw-r--r-- | hw/virtio/vhost-vdpa.c | 20 | ||||
-rw-r--r-- | include/qemu/timer.h | 2 | ||||
-rw-r--r-- | meson.build | 2 | ||||
-rw-r--r-- | migration/multifd.c | 2 |
6 files changed, 26 insertions, 33 deletions
@@ -1,5 +1,6 @@ /GNUmakefile /build/ +*.pyc .sdk .stgit-* .git-submodule-status diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 8b3ab5b..17aa745 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -317,6 +317,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 ----------------------- @@ -396,22 +412,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) ''''''''''''''''''''''''''''' diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 4580f3e..aedc52c 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); @@ -320,10 +317,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 +335,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); @@ -469,6 +461,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, }; diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 6a8b48b..1dc880e 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. diff --git a/meson.build b/meson.build index f4d1ab1..b26c8bf 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 diff --git a/migration/multifd.c b/migration/multifd.c index 776f963..68b171f 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -448,7 +448,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); |