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. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
parent
4a761ffa37
commit
85423d90c7
|
@ -363,10 +363,6 @@ static void *spapr_create_fdt_skel(hwaddr initrd_base,
|
||||||
_FDT((fdt_property_string(fdt, "model", "IBM pSeries (emulated by qemu)")));
|
_FDT((fdt_property_string(fdt, "model", "IBM pSeries (emulated by qemu)")));
|
||||||
_FDT((fdt_property_string(fdt, "compatible", "qemu,pseries")));
|
_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
|
* Add info to guest to indentify which host is it being run on
|
||||||
* and what is the uuid of the guest
|
* and what is the uuid of the guest
|
||||||
|
|
Loading…
Reference in a new issue