ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hostmem: drop error variable from host_memory_backend_get_memory() 

Unused, so let's remove it.

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20180619134141.29478-8-david@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
David Hildenbrand 2018-06-19 15:41:36 +02:00 committed by Paolo Bonzini
parent 4ab56d04ed
commit 7943e97b85
6 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backends/hostmem.c
View File

@ -247,8 +247,7 @@ bool host_memory_backend_mr_inited(HostMemoryBackend *backend)
return memory_region_size(&backend->mr) != 0; return memory_region_size(&backend->mr) != 0;
} }
MemoryRegion * MemoryRegion *host_memory_backend_get_memory(HostMemoryBackend *backend)
host_memory_backend_get_memory(HostMemoryBackend *backend, Error **errp)
{ {
return host_memory_backend_mr_inited(backend) ? &backend->mr : NULL; return host_memory_backend_mr_inited(backend) ? &backend->mr : NULL;
} }

4
hw/mem/nvdimm.c
View File

@ -105,7 +105,7 @@ static MemoryRegion *nvdimm_get_memory_region(PCDIMMDevice *dimm, Error **errp)
static void nvdimm_realize(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); NVDIMMDevice *nvdimm = NVDIMM(dimm);
uint64_t align, pmem_size, size = memory_region_size(mr); 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); 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; backend_offset = memory_region_size(mr) - nvdimm->label_size + offset;
memory_region_set_dirty(mr, backend_offset, size); memory_region_set_dirty(mr, backend_offset, size);
} }

4
hw/mem/pc-dimm.c
View File

@ -226,12 +226,12 @@ static MemoryRegion *pc_dimm_get_memory_region(PCDIMMDevice *dimm, Error **errp)
return NULL; 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) 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) static uint64_t pc_dimm_md_get_addr(const MemoryDeviceState *md)

3
hw/misc/ivshmem.c
View File

@ -909,8 +909,7 @@ static void ivshmem_common_realize(PCIDevice *dev, Error **errp)
if (s->hostmem != NULL) { if (s->hostmem != NULL) {
IVSHMEM_DPRINTF("using hostmem\n"); IVSHMEM_DPRINTF("using hostmem\n");
s->ivshmem_bar2 = host_memory_backend_get_memory(s->hostmem, s->ivshmem_bar2 = host_memory_backend_get_memory(s->hostmem);
&error_abort);
} else { } else {
Chardev *chr = qemu_chr_fe_get_driver(&s->server_chr); Chardev *chr = qemu_chr_fe_get_driver(&s->server_chr);
assert(chr); assert(chr);

3
include/sysemu/hostmem.h
View File

@ -62,8 +62,7 @@ struct HostMemoryBackend {
}; };
bool host_memory_backend_mr_inited(HostMemoryBackend *backend); bool host_memory_backend_mr_inited(HostMemoryBackend *backend);
MemoryRegion *host_memory_backend_get_memory(HostMemoryBackend *backend, MemoryRegion *host_memory_backend_get_memory(HostMemoryBackend *backend);
Error **errp);
void host_memory_backend_set_mapped(HostMemoryBackend *backend, bool mapped); void host_memory_backend_set_mapped(HostMemoryBackend *backend, bool mapped);
bool host_memory_backend_is_mapped(HostMemoryBackend *backend); bool host_memory_backend_is_mapped(HostMemoryBackend *backend);

3
numa.c
View File

@ -523,8 +523,7 @@ void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner,
if (!backend) { if (!backend) {
continue; continue;
} }
MemoryRegion *seg = host_memory_backend_get_memory(backend, MemoryRegion *seg = host_memory_backend_get_memory(backend);
&error_fatal);
if (memory_region_is_mapped(seg)) { if (memory_region_is_mapped(seg)) {
char *path = object_get_canonical_path_component(OBJECT(backend)); char *path = object_get_canonical_path_component(OBJECT(backend));