From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47213) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNbdO-0003ZC-3I for qemu-devel@nongnu.org; Sat, 30 Aug 2014 01:55:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XNbdI-0002nd-S1 for qemu-devel@nongnu.org; Sat, 30 Aug 2014 01:55:33 -0400 Date: Sat, 30 Aug 2014 15:55:21 +1000 From: Anton Blanchard Message-ID: <20140830155521.788ea936@kryten> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] hypervisor property clashes with hypervisor node List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: nikunj@linux.vnet.ibm.com, agraf@suse.de Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org 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 --- Index: b/hw/ppc/spapr.c =================================================================== --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -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