summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--docs/nvdimm.txt10
-rw-r--r--exec.c2
2 files changed, 11 insertions, 1 deletions
diff --git a/docs/nvdimm.txt b/docs/nvdimm.txt
index 362e99109e..c2c6e441b3 100644
--- a/docs/nvdimm.txt
+++ b/docs/nvdimm.txt
@@ -132,6 +132,16 @@ address to the page size (getpagesize(2)) by default. However, some
 types of backends may require an alignment different than the page
 size. In that case, QEMU v2.12.0 and later provide 'align' option to
 memory-backend-file to allow users to specify the proper alignment.
+For device dax (e.g., /dev/dax0.0), this alignment needs to match the
+alignment requirement of the device dax. The NUM of 'align=NUM' option
+must be larger than or equal to the 'align' of device dax.
+We can use one of the following commands to show the 'align' of device dax.
+
+    ndctl list -X
+    daxctl list -R
+
+In order to get the proper 'align' of device dax, you need to install
+the library 'libdaxctl'.
 
 For example, device dax require the 2 MB alignment, so we can use
 following QEMU command line options to use it (/dev/dax0.0) as the
diff --git a/exec.c b/exec.c
index c5ab59ec44..21926dc9c7 100644
--- a/exec.c
+++ b/exec.c
@@ -2379,7 +2379,7 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,
     file_align = get_file_align(fd);
     if (file_align > 0 && mr && file_align > mr->align) {
         error_setg(errp, "backing store align 0x%" PRIx64
-                   " is larger than 'align' option 0x" PRIx64,
+                   " is larger than 'align' option 0x%" PRIx64,
                    file_align, mr->align);
         return NULL;
     }