On Fri, 15 Jun 2018 13:24:54 +0200
David Hildenbrand <da...@redhat.com> wrote:
> Unused, so let's remove it.
>
> Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> Reviewed-by: Igor Mammedov <imamm...@redhat.com>
> Signed-off-by: David Hildenbrand <da...@redhat.com>
breaks compilation with
hw/mem/nvdimm.c:171:5: error: too many arguments to function
‘host_memory_backend_get_memory’
return host_memory_backend_get_memory(dimm->hostmem, &error_abort);
> ---
> backends/hostmem.c | 3 +--
> hw/mem/nvdimm.c | 4 ++--
> hw/mem/pc-dimm.c | 4 ++--
> hw/misc/ivshmem.c | 3 +--
> include/sysemu/hostmem.h | 3 +--
> numa.c | 3 +--
> 6 files changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/backends/hostmem.c b/backends/hostmem.c
> index 3627e61584..4908946cd3 100644
> --- a/backends/hostmem.c
> +++ b/backends/hostmem.c
> @@ -247,8 +247,7 @@ bool host_memory_backend_mr_inited(HostMemoryBackend
> *backend)
> return memory_region_size(&backend->mr) != 0;
> }
>
> -MemoryRegion *
> -host_memory_backend_get_memory(HostMemoryBackend *backend, Error **errp)
> +MemoryRegion *host_memory_backend_get_memory(HostMemoryBackend *backend)
> {
> return host_memory_backend_mr_inited(backend) ? &backend->mr : NULL;
> }
> diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c
> index 4087aca25e..37e19044d6 100644
> --- a/hw/mem/nvdimm.c
> +++ b/hw/mem/nvdimm.c
> @@ -105,7 +105,7 @@ static MemoryRegion
> *nvdimm_get_memory_region(PCDIMMDevice *dimm, Error **errp)
>
> static void nvdimm_realize(PCDIMMDevice *dimm, Error **errp)
> {
> - MemoryRegion *mr = host_memory_backend_get_memory(dimm->hostmem, errp);
> + MemoryRegion *mr = host_memory_backend_get_memory(dimm->hostmem);
> NVDIMMDevice *nvdimm = NVDIMM(dimm);
> uint64_t align, pmem_size, size = memory_region_size(mr);
>
> @@ -161,7 +161,7 @@ static void nvdimm_write_label_data(NVDIMMDevice *nvdimm,
> const void *buf,
>
> memcpy(nvdimm->label_data + offset, buf, size);
>
> - mr = host_memory_backend_get_memory(dimm->hostmem, &error_abort);
> + mr = host_memory_backend_get_memory(dimm->hostmem);
> backend_offset = memory_region_size(mr) - nvdimm->label_size + offset;
> memory_region_set_dirty(mr, backend_offset, size);
> }
> diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
> index 7387963cf1..73f0eee4c7 100644
> --- a/hw/mem/pc-dimm.c
> +++ b/hw/mem/pc-dimm.c
> @@ -226,12 +226,12 @@ static MemoryRegion
> *pc_dimm_get_memory_region(PCDIMMDevice *dimm, Error **errp)
> return NULL;
> }
>
> - return host_memory_backend_get_memory(dimm->hostmem, errp);
> + return host_memory_backend_get_memory(dimm->hostmem);
> }
>
> static MemoryRegion *pc_dimm_get_vmstate_memory_region(PCDIMMDevice *dimm)
> {
> - return host_memory_backend_get_memory(dimm->hostmem, &error_abort);
> + return host_memory_backend_get_memory(dimm->hostmem);
> }
>
> static uint64_t pc_dimm_md_get_addr(const MemoryDeviceState *md)
> diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
> index 16f03701b7..ee01c5e66b 100644
> --- a/hw/misc/ivshmem.c
> +++ b/hw/misc/ivshmem.c
> @@ -909,8 +909,7 @@ static void ivshmem_common_realize(PCIDevice *dev, Error
> **errp)
> if (s->hostmem != NULL) {
> IVSHMEM_DPRINTF("using hostmem\n");
>
> - s->ivshmem_bar2 = host_memory_backend_get_memory(s->hostmem,
> - &error_abort);
> + s->ivshmem_bar2 = host_memory_backend_get_memory(s->hostmem);
> } else {
> Chardev *chr = qemu_chr_fe_get_driver(&s->server_chr);
> assert(chr);
> diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h
> index 5beb0ef8ab..6e6bd2c1cb 100644
> --- a/include/sysemu/hostmem.h
> +++ b/include/sysemu/hostmem.h
> @@ -62,8 +62,7 @@ struct HostMemoryBackend {
> };
>
> bool host_memory_backend_mr_inited(HostMemoryBackend *backend);
> -MemoryRegion *host_memory_backend_get_memory(HostMemoryBackend *backend,
> - Error **errp);
> +MemoryRegion *host_memory_backend_get_memory(HostMemoryBackend *backend);
>
> void host_memory_backend_set_mapped(HostMemoryBackend *backend, bool mapped);
> bool host_memory_backend_is_mapped(HostMemoryBackend *backend);
> diff --git a/numa.c b/numa.c
> index 33572bfa74..94f758c757 100644
> --- a/numa.c
> +++ b/numa.c
> @@ -523,8 +523,7 @@ void memory_region_allocate_system_memory(MemoryRegion
> *mr, Object *owner,
> if (!backend) {
> continue;
> }
> - MemoryRegion *seg = host_memory_backend_get_memory(backend,
> - &error_fatal);
> + MemoryRegion *seg = host_memory_backend_get_memory(backend);
>
> if (memory_region_is_mapped(seg)) {
> char *path =
> object_get_canonical_path_component(OBJECT(backend));
