mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
ppc/spapr: cleanup -machine pseries,nvdimm=X handling
Since NVDIMM support was introduced on pseries machine,
it ignored machine's nvdimm=on|off option and effectively
was always enabled on machines that support NVDIMM.
Later on commit
(28f5a71621
ppc/spapr_nvdimm: do not enable support with 'nvdimm=off')
makes QEMU error out in case user explicitly set 'nvdimm=off'
on CLI by peeking at machine_opts.
However that's a workaround and leaves 'nvdimms_state->is_enabled'
in inconsistent state (false) when it should be set true
by default.
Instead of using on machine_opts, set default to true for pseries
machine in initfn time. If user sets manually 'nvdimm=off'
it will overwrite default value to false and QEMU will error
as expected without need to peek into machine_opts.
That way pseries will have, nvdimm enabled by default and
will honor user provided 'nvdimm=on|off'.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20201208164606.4109134-1-imammedo@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
2f181fbd5a
commit
55810e90cc
|
@ -3275,6 +3275,19 @@ static void spapr_instance_init(Object *obj)
|
|||
{
|
||||
SpaprMachineState *spapr = SPAPR_MACHINE(obj);
|
||||
SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
|
||||
MachineState *ms = MACHINE(spapr);
|
||||
MachineClass *mc = MACHINE_GET_CLASS(ms);
|
||||
|
||||
/*
|
||||
* NVDIMM support went live in 5.1 without considering that, in
|
||||
* other archs, the user needs to enable NVDIMM support with the
|
||||
* 'nvdimm' machine option and the default behavior is NVDIMM
|
||||
* support disabled. It is too late to roll back to the standard
|
||||
* behavior without breaking 5.1 guests.
|
||||
*/
|
||||
if (mc->nvdimm_supported) {
|
||||
ms->nvdimms_state->is_enabled = true;
|
||||
}
|
||||
|
||||
spapr->htab_fd = -1;
|
||||
spapr->use_hotplug_event_source = true;
|
||||
|
|
|
@ -27,10 +27,8 @@
|
|||
#include "hw/ppc/spapr_nvdimm.h"
|
||||
#include "hw/mem/nvdimm.h"
|
||||
#include "qemu/nvdimm-utils.h"
|
||||
#include "qemu/option.h"
|
||||
#include "hw/ppc/fdt.h"
|
||||
#include "qemu/range.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
#include "hw/ppc/spapr_numa.h"
|
||||
|
||||
bool spapr_nvdimm_validate(HotplugHandler *hotplug_dev, NVDIMMDevice *nvdimm,
|
||||
|
@ -38,7 +36,6 @@ bool spapr_nvdimm_validate(HotplugHandler *hotplug_dev, NVDIMMDevice *nvdimm,
|
|||
{
|
||||
const MachineClass *mc = MACHINE_GET_CLASS(hotplug_dev);
|
||||
const MachineState *ms = MACHINE(hotplug_dev);
|
||||
const char *nvdimm_opt = qemu_opt_get(qemu_get_machine_opts(), "nvdimm");
|
||||
g_autofree char *uuidstr = NULL;
|
||||
QemuUUID uuid;
|
||||
int ret;
|
||||
|
@ -48,16 +45,7 @@ bool spapr_nvdimm_validate(HotplugHandler *hotplug_dev, NVDIMMDevice *nvdimm,
|
|||
return false;
|
||||
}
|
||||
|
||||
/*
|
||||
* NVDIMM support went live in 5.1 without considering that, in
|
||||
* other archs, the user needs to enable NVDIMM support with the
|
||||
* 'nvdimm' machine option and the default behavior is NVDIMM
|
||||
* support disabled. It is too late to roll back to the standard
|
||||
* behavior without breaking 5.1 guests. What we can do is to
|
||||
* ensure that, if the user sets nvdimm=off, we error out
|
||||
* regardless of being 5.1 or newer.
|
||||
*/
|
||||
if (!ms->nvdimms_state->is_enabled && nvdimm_opt) {
|
||||
if (!ms->nvdimms_state->is_enabled) {
|
||||
error_setg(errp, "nvdimm device found but 'nvdimm=off' was set");
|
||||
return false;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue