Commit bc2a2364 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Stefan Hajnoczi
Browse files

hw/block: Let the NVMe emulated device be target-agnostic 



Now than the non-target specific memory_region_msync() function
is available, use it to make this device target-agnostic.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Acked-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-id: 20200508062456.23344-4-philmd@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 9ecc996a

hw/block/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -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/

hw/block/nvme.c

+2 −4
Original line number Diff line number Diff line
@@ -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 {