[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/15] hostmem: use host_memory_backend_mr_inited() w
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 13/15] hostmem: use host_memory_backend_mr_inited() where proper |
Date: |
Thu, 20 Apr 2017 15:47:03 -0300 |
From: Peter Xu <address@hidden>
Use the new interface to boost readability.
Signed-off-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
backends/hostmem-file.c | 6 +++---
backends/hostmem.c | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c
index 42efb2f28a..fc4ef46d11 100644
--- a/backends/hostmem-file.c
+++ b/backends/hostmem-file.c
@@ -51,7 +51,7 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error
**errp)
#ifndef CONFIG_LINUX
error_setg(errp, "-mem-path not supported on this host");
#else
- if (!memory_region_size(&backend->mr)) {
+ if (!host_memory_backend_mr_inited(backend)) {
gchar *path;
backend->force_prealloc = mem_prealloc;
path = object_get_canonical_path(OBJECT(backend));
@@ -76,7 +76,7 @@ static void set_mem_path(Object *o, const char *str, Error
**errp)
HostMemoryBackend *backend = MEMORY_BACKEND(o);
HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o);
- if (memory_region_size(&backend->mr)) {
+ if (host_memory_backend_mr_inited(backend)) {
error_setg(errp, "cannot change property value");
return;
}
@@ -96,7 +96,7 @@ static void file_memory_backend_set_share(Object *o, bool
value, Error **errp)
HostMemoryBackend *backend = MEMORY_BACKEND(o);
HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o);
- if (memory_region_size(&backend->mr)) {
+ if (host_memory_backend_mr_inited(backend)) {
error_setg(errp, "cannot change property value");
return;
}
diff --git a/backends/hostmem.c b/backends/hostmem.c
index d8faab4bed..4606b73849 100644
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -45,7 +45,7 @@ host_memory_backend_set_size(Object *obj, Visitor *v, const
char *name,
Error *local_err = NULL;
uint64_t value;
- if (memory_region_size(&backend->mr)) {
+ if (host_memory_backend_mr_inited(backend)) {
error_setg(&local_err, "cannot change property value");
goto out;
}
@@ -146,7 +146,7 @@ static void host_memory_backend_set_merge(Object *obj, bool
value, Error **errp)
{
HostMemoryBackend *backend = MEMORY_BACKEND(obj);
- if (!memory_region_size(&backend->mr)) {
+ if (!host_memory_backend_mr_inited(backend)) {
backend->merge = value;
return;
}
@@ -172,7 +172,7 @@ static void host_memory_backend_set_dump(Object *obj, bool
value, Error **errp)
{
HostMemoryBackend *backend = MEMORY_BACKEND(obj);
- if (!memory_region_size(&backend->mr)) {
+ if (!host_memory_backend_mr_inited(backend)) {
backend->dump = value;
return;
}
@@ -208,7 +208,7 @@ static void host_memory_backend_set_prealloc(Object *obj,
bool value,
}
}
- if (!memory_region_size(&backend->mr)) {
+ if (!host_memory_backend_mr_inited(backend)) {
backend->prealloc = value;
return;
}
@@ -249,7 +249,7 @@ bool host_memory_backend_mr_inited(HostMemoryBackend
*backend)
MemoryRegion *
host_memory_backend_get_memory(HostMemoryBackend *backend, Error **errp)
{
- return memory_region_size(&backend->mr) ? &backend->mr : NULL;
+ return host_memory_backend_mr_inited(backend) ? &backend->mr : NULL;
}
void host_memory_backend_set_mapped(HostMemoryBackend *backend, bool mapped)
--
2.11.0.259.g40922b1
- [Qemu-devel] [PULL 03/15] memory: provide iommu_replay_all(), (continued)
- [Qemu-devel] [PULL 03/15] memory: provide iommu_replay_all(), Eduardo Habkost, 2017/04/20
- [Qemu-devel] [PULL 04/15] memory: introduce memory_region_notify_one(), Eduardo Habkost, 2017/04/20
- [Qemu-devel] [PULL 05/15] memory: add MemoryRegionIOMMUOps.replay() callback, Eduardo Habkost, 2017/04/20
- [Qemu-devel] [PULL 06/15] intel_iommu: use the correct memory region for device IOTLB notification, Eduardo Habkost, 2017/04/20
- [Qemu-devel] [PULL 07/15] intel_iommu: provide its own replay() callback, Eduardo Habkost, 2017/04/20
- [Qemu-devel] [PULL 08/15] intel_iommu: allow dynamic switch of IOMMU region, Eduardo Habkost, 2017/04/20
- [Qemu-devel] [PULL 10/15] qdev: Make "hotplugged" property read-only, Eduardo Habkost, 2017/04/20
- [Qemu-devel] [PULL 09/15] intel_iommu: enable remote IOTLB, Eduardo Habkost, 2017/04/20
- [Qemu-devel] [PULL 11/15] hw/core/null-machine: Print error message when using the -kernel parameter, Eduardo Habkost, 2017/04/20
- [Qemu-devel] [PULL 12/15] hostmem: introduce host_memory_backend_mr_inited(), Eduardo Habkost, 2017/04/20
- [Qemu-devel] [PULL 13/15] hostmem: use host_memory_backend_mr_inited() where proper,
Eduardo Habkost <=
- [Qemu-devel] [PULL 14/15] qdev: Constify value passed to qdev_prop_set_macaddr, Eduardo Habkost, 2017/04/20
- [Qemu-devel] [PULL 15/15] qdev: Constify local variable returned by blk_bs, Eduardo Habkost, 2017/04/20
- Re: [Qemu-devel] [PULL 00/15] Machine queue for 2.10, Peter Maydell, 2017/04/21