[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/11] hw/block: Let the NVMe emulated device be target-agnostic
From: |
Stefan Hajnoczi |
Subject: |
[PULL 09/11] hw/block: Let the NVMe emulated device be target-agnostic |
Date: |
Fri, 5 Jun 2020 10:47:48 +0100 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Now than the non-target specific memory_region_msync() function
is available, use it to make this device target-agnostic.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20200508062456.23344-4-philmd@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
hw/block/Makefile.objs | 2 +-
hw/block/nvme.c | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs
index 47960b5f0d..8855c22656 100644
--- a/hw/block/Makefile.objs
+++ b/hw/block/Makefile.objs
@@ -13,6 +13,6 @@ common-obj-$(CONFIG_SH4) += tc58128.o
obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o
obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk.o
-obj-$(CONFIG_NVME_PCI) += nvme.o
+common-obj-$(CONFIG_NVME_PCI) += nvme.o
obj-y += dataplane/
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 2f3100e56c..a21eeca2fb 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -46,8 +46,7 @@
#include "qapi/visitor.h"
#include "sysemu/hostmem.h"
#include "sysemu/block-backend.h"
-#include "exec/ram_addr.h"
-
+#include "exec/memory.h"
#include "qemu/log.h"
#include "qemu/module.h"
#include "qemu/cutils.h"
@@ -1207,8 +1206,7 @@ static uint64_t nvme_mmio_read(void *opaque, hwaddr addr,
unsigned size)
*/
if (addr == 0xE08 &&
(NVME_PMRCAP_PMRWBM(n->bar.pmrcap) & 0x02)) {
- qemu_ram_writeback(n->pmrdev->mr.ram_block,
- 0, n->pmrdev->size);
+ memory_region_msync(&n->pmrdev->mr, 0, n->pmrdev->size);
}
memcpy(&val, ptr + addr, size);
} else {
--
2.25.4
- [PULL 00/11] Block patches, Stefan Hajnoczi, 2020/06/05
- [PULL 01/11] io_uring: retry io_uring_submit() if it fails with errno=EINTR, Stefan Hajnoczi, 2020/06/05
- [PULL 02/11] io_uring: use io_uring_cq_ready() to check for ready cqes, Stefan Hajnoczi, 2020/06/05
- [PULL 03/11] fuzz: add datadir for oss-fuzz compatability, Stefan Hajnoczi, 2020/06/05
- [PULL 04/11] fuzz: fix typo in i440fx-qtest-reboot arguments, Stefan Hajnoczi, 2020/06/05
- [PULL 05/11] fuzz: add mangled object name to linker script, Stefan Hajnoczi, 2020/06/05
- [PULL 06/11] fuzz: run the main-loop in fork-server process, Stefan Hajnoczi, 2020/06/05
- [PULL 08/11] memory: Extract memory_region_msync() from memory_region_writeback(), Stefan Hajnoczi, 2020/06/05
- [PULL 07/11] memory: Rename memory_region_do_writeback -> memory_region_writeback, Stefan Hajnoczi, 2020/06/05
- [PULL 09/11] hw/block: Let the NVMe emulated device be target-agnostic,
Stefan Hajnoczi <=
- [PULL 10/11] exec: Rename qemu_ram_writeback() as qemu_ram_msync(), Stefan Hajnoczi, 2020/06/05
- [PULL 11/11] block: Factor out bdrv_run_co(), Stefan Hajnoczi, 2020/06/05
- Re: [PULL 00/11] Block patches, Peter Maydell, 2020/06/05