qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] hw/i386: check if nvdimm is enabled before plugging
@ 2017-01-13 11:56 Haozhong Zhang
  2017-01-13 12:20 ` Xiao Guangrong
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: Haozhong Zhang @ 2017-01-13 11:56 UTC (permalink / raw)
  To: qemu-devel
  Cc: Paolo Bonzini, Richard Henderson, Eduardo Habkost,
	Michael S . Tsirkin, Stefan Hajnoczi, imammedo, Xiao Guangrong,
	Haozhong Zhang

The missing of 'nvdimm' in the machine type option '-M' means NVDIMM
is disabled. QEMU should refuse to plug any NVDIMM device in this case
and report the misconfiguration.

Reported-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Haozhong Zhang <haozhong.zhang@intel.com>
Message-Id: 20170112110928.GF4621@stefanha-x1.localdomain
Message-Id: 20170111093630.2088-1-stefanha@redhat.com
---
 hw/i386/pc.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 25e8586..3907609 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1715,6 +1715,11 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev,
     }
 
     if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) {
+        if (!pcms->acpi_nvdimm_state.is_enabled) {
+            error_setg(&local_err,
+                       "nvdimm is not enabled: missing 'nvdimm' in '-M'");
+            goto out;
+        }
         nvdimm_plug(&pcms->acpi_nvdimm_state);
     }
 
-- 
2.10.1

^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2017-01-23 10:35 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-13 11:56 [Qemu-devel] [PATCH] hw/i386: check if nvdimm is enabled before plugging Haozhong Zhang
2017-01-13 12:20 ` Xiao Guangrong
2017-01-13 13:17 ` Stefan Hajnoczi
2017-01-13 13:37   ` Haozhong Zhang
2017-01-13 18:02   ` Eduardo Habkost
2017-01-16  5:55     ` Xiao Guangrong
2017-01-16 11:00       ` Stefan Hajnoczi
2017-01-20  0:55         ` Haozhong Zhang
2017-01-20 21:03           ` Eduardo Habkost
2017-01-23 10:35 ` Stefan Hajnoczi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).