diff options
| author | Anton Blanchard <anton@samba.org> | 2014-08-30 15:55:21 +1000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2014-09-08 12:50:54 +0200 |
| commit | 85423d90c7bdbbae3d97ed3a12b5db79d00a3fb0 (patch) | |
| tree | 51024c363c542f0c2975275100014d898232c86a | |
| parent | 4a761ffa37d20a5d3ecbb95b45b4c42e54c8f18e (diff) | |
| download | focaccia-qemu-85423d90c7bdbbae3d97ed3a12b5db79d00a3fb0.tar.gz focaccia-qemu-85423d90c7bdbbae3d97ed3a12b5db79d00a3fb0.zip | |
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>
| -rw-r--r-- | hw/ppc/spapr.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 65b28ace82..2ab4460f04 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -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, "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 |