]> git.proxmox.com Git - mirror_qemu.git/commit
hw/i386/pc: Fix crash when hot-plugging nvdimm on older machine types
authorThomas Huth <thuth@redhat.com>
Sun, 7 Apr 2019 09:23:14 +0000 (11:23 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 9 Apr 2019 16:34:21 +0000 (18:34 +0200)
commitae909496e9d33f8c074f1063597298ba1d183133
tree6cc6c6ea07b98b0ebe1f0932d4b1b3cf34d14531
parent77b17570900fdfff32c5abb8d92fb527e4a0737a
hw/i386/pc: Fix crash when hot-plugging nvdimm on older machine types

QEMU currently crashes when you try to hot-plug an "nvdimm" device
on older machine types:

$ qemu-system-x86_64 -monitor stdio -M pc-1.1
QEMU 3.1.92 monitor - type 'help' for more information
(qemu) device_add nvdimm,id=nvdimmn1
qemu-system-x86_64: /home/thuth/devel/qemu/util/error.c:57: error_setv:
 Assertion `*errp == ((void *)0)' failed.
Aborted (core dumped)

The call to hotplug_handler_pre_plug() in pc_memory_pre_plug() has been
added recently before the check whether nvdimm is enabled. It should
be done after the check. And while we're at it, also check the errp
after the hotplug_handler_pre_plug(), otherwise errors are silently
ignored here.

Fixes: 9040e6dfa8c3fed87695a3de555d2c775727bb51
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20190407092314.11066-1-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
hw/i386/pc.c