hypervisor property clashes with hypervisor node
PATCH 1/1 hypervisor property clashes with hypervisor node
dtc fails on a recent QEMU snapshot:
ERROR (name_properties): "name" property in /hypervisor#1 is incorrect ("hypervisor" instead of base node name)
Looking at the device tree we have a hypervisor property:
# lsprop hypervisor hypervisor "kvm"
But we also have a hypervisor node, with a name that doesn't match:
# lsprop hypervisor#1/ name "hypervisor" compatible "linux,kvm" linux,phandle 7e5eb5d8 (2120136152)
Commit c08ce91d309c (spapr: add uuid/host details to device tree) looks to have collided with an earlier patch. Remove the hypervisor property.
---
hw/ppc/spapr.c +0 -4
@@ -362,10 +362,6 @@ static void *spapr_create_fdt_skel(hwadd_FDT ((fdt_property_string (fdt,"model" ,"IBM pSeries (emulated by qemu)" )));_FDT ((fdt_property_string (fdt,"compatible" ,"qemu,pseries" ))); -if (kvm_enabled ()) { -_FDT ((fdt_property_string (fdt,"hypervisor" ,"kvm" ))); - } -/* * Add info to guest to indentify which host is it being run on * and what is the uuid of the guest
Alexander Graf
AppliedQuoted 16 lines · Anton Blanchard
dtc fails on a recent QEMU snapshot:
ERROR (
name_properties): "name" property in /hypervisor#1 is incorrect ("hypervisor" instead of base node name)Looking at the device tree we have a hypervisor property:
# lsprop hypervisor hypervisor "kvm"But we also have a hypervisor node, with a name that doesn't match:
# lsprop hypervisor#1/ name "hypervisor" compatible "linux,kvm" linux,phandle 7e5eb5d8 (2120136152)
Quoted 5 lines
Commit
c08ce91d309c(spapr: add uuid/host details to device tree) looks to have collided with an earlier patch. Remove the hypervisor property.Signed-off-by Anton Blanchard <[email protected]>
Thanks, applied to ppc-next.
Alex