diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 85f47c4..9c2bf57 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -179,7 +179,7 @@ enum virQEMUCapsFlags {
     QEMU_CAPS_DEVICE_TPM_PASSTHROUGH = 138, /* -tpmdev passthrough */
     QEMU_CAPS_DEVICE_TPM_TIS     = 139, /* -device tpm_tis */
 
-    QEMU_CAPS_DEVICE_NVRAM       = 140,  /*-global spapr-nvram.reg=xxxx*/
+    QEMU_CAPS_DEVICE_NVRAM       = 140,  /* -global spapr-nvram.reg=xxxx */
 
     QEMU_CAPS_LAST,                   /* this must always be the last item */
 };
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 6b783e7..8f07639 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3946,8 +3946,8 @@ qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev)
         virBufferAsprintf(&buf, "spapr-nvram.reg=0x%llx",
                           dev->info.addr.spaprvio.reg);
     } else {
-        virReportError(VIR_ERR_XML_ERROR,
-                       "%s", _("NVRAM address only can be spaprvio currently.\n"));
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("nvram address type must be spaprvio"));
         goto error;
     }
 
@@ -7816,9 +7816,9 @@ qemuBuildCommandLine(virConnectPtr conn,
         if (def->os.arch == VIR_ARCH_PPC64 &&
             STREQ(def->os.machine, "pseries")) {
             if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_NVRAM)) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                               "%s", _("NVRAM device is not available "
-                                " with this QEMU binary"));
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                               _("nvram device is not supported by "
+                                 "this QEMU binary"));
                 goto error;
             }
 
@@ -7832,7 +7832,7 @@ qemuBuildCommandLine(virConnectPtr conn,
             VIR_FREE(optstr);
         } else {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                          _("NVRAM device is only supported for PPC64"));
+                          _("nvram device is only supported for PPC64"));
             goto error;
         }
     }
@@ -9946,7 +9946,6 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps,
 
         } else if (STREQ(arg, "-global") &&
                    STRPREFIX(progargv[i + 1], "spapr-nvram.reg=")) {
-
             WANT_VALUE();
 
             if (VIR_ALLOC(def->nvram) < 0)
@@ -9959,8 +9958,7 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps,
             if (virStrToLong_ull(val, NULL, 16,
                                  &def->nvram->info.addr.spaprvio.reg) < 0) {
                 virReportError(VIR_ERR_INTERNAL_ERROR,
-                               _("cannot parse nvram's address:"
-                                 "'%s'"), val);
+                               _("cannot parse nvram's address '%s'"), val);
                 goto error;
             }
         } else if (STREQ(arg, "-S")) {