diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2016-08-05 16:25:33 +1000 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2016-08-08 09:45:03 +1000 |
| commit | 3c0c47e3464f3c54bd3f1cc6d4da2cbf7465e295 (patch) | |
| tree | 9bff4b7197c839f0668d80c09cd315e58bd98728 /include | |
| parent | 51009170d8fc263cfdcd5a60fe3ba213daa3d15b (diff) | |
| download | qemu-3c0c47e3464f3c54bd3f1cc6d4da2cbf7465e295.tar.gz qemu-3c0c47e3464f3c54bd3f1cc6d4da2cbf7465e295.tar.bz2 qemu-3c0c47e3464f3c54bd3f1cc6d4da2cbf7465e295.zip | |
spapr: Correctly set query_hotpluggable_cpus hook based on machine version
Prior to c8721d3 "spapr: Error out when CPU hotplug is attempted on older
pseries machines", attempting to use query-hotpluggable-cpus on pseries-2.6
and earlier machine types would SEGV.
That change fixed that, but due to some unexpected interactions in init
order and a brown-paper-bag worthy failure to test, it accidentally
disabled query-hotpluggable-cpus for all pseries machine types, including
the current one which should allow it.
In fact, query_hotpluggable_cpus needs to be non-NULL when and only when
the dr_cpu_enabled flag in sPAPRMachineClass is set, which makes
dr_cpu_enabled itself redundant.
This patch removes dr_cpu_enabled, instead directly setting
query_hotpluggable_cpus from the machine class_init functions, and using
that to determine the availability of CPU hotplug when necessary.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/ppc/spapr.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index bd8ac28160..caf7be919f 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -38,7 +38,6 @@ struct sPAPRMachineClass { /*< public >*/ bool dr_lmb_enabled; /* enable dynamic-reconfig/hotplug of LMBs */ - bool dr_cpu_enabled; /* enable dynamic-reconfig/hotplug of CPUs */ bool use_ohci_by_default; /* use USB-OHCI instead of XHCI */ }; |