Author: agraf Date: Wed Oct 13 16:01:51 2010 New Revision: 895 URL: http://tracker.coreboot.org/trac/openbios/changeset/895
Log: ppc: Suppress /hypervisor outside KVM
My New World PowerMac G3 does not have a /hypervisor node.
Move all Forth code to kvm_of_init() to make it match the comment: Don't expose /hypervisor when not in KVM.
Cc: Alexander Graf agraf@suse.de Signed-off-by: Andreas Färber andreas.faerber@web.de Signed-off-by: Alexander Graf agraf@suse.de
Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/tree.fs
Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Oct 9 12:16:33 2010 (r894) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Wed Oct 13 16:01:51 2010 (r895) @@ -526,9 +526,17 @@ if (!fw_cfg_read_i32(FW_CFG_PPC_IS_KVM)) return;
- push_str("/hypervisor"); + push_str("/"); fword("find-device");
+ fword("new-device"); + + push_str("hypervisor"); + fword("device-name"); + + push_str("hypervisor"); + fword("device-type"); + /* compatible */
push_str("linux,kvm"); @@ -567,6 +575,8 @@ fword("encode-string"); push_str("guest-name"); fword("property"); + + fword("finish-device"); }
void
Modified: trunk/openbios-devel/arch/ppc/qemu/tree.fs ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/tree.fs Sat Oct 9 12:16:33 2010 (r894) +++ trunk/openbios-devel/arch/ppc/qemu/tree.fs Wed Oct 13 16:01:51 2010 (r895) @@ -39,11 +39,6 @@ : close ; finish-device
-new-device - " hypervisor" device-name - " hypervisor" device-type -finish-device - \ ------------------------------------------------------------- \ /packages \ -------------------------------------------------------------