Commit da6e1017 authored by Greg Kurz's avatar Greg Kurz Committed by David Gibson
Browse files

hw/ppc/mac_newworld: Drop useless CONFIG_KVM ifdefery 



kvm_enabled() expands to (0) when CONFIG_KVM is not defined. The first
CONFIG_KVM guard is thus useless and it is likely that the compiler
will optimize the code out in the case of the second guard. And even
if it doesn't, we have a stub for kvmppc_get_hypercall().

Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
Message-Id: <156051054077.224162.9332715375637801197.stgit@bahia.lan>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 7a660e77

hw/ppc/mac_newworld.c

+0 −4
Original line number Diff line number Diff line
@@ -437,13 +437,11 @@ static void ppc_core99_init(MachineState *machine) 
    }



    /* The NewWorld NVRAM is not located in the MacIO device */

#ifdef CONFIG_KVM

    if (kvm_enabled() && getpagesize() > 4096) {

        /* We can't combine read-write and read-only in a single page, so

           move the NVRAM out of ROM again for KVM */

        nvram_addr = 0xFFE00000;

    }

#endif

    dev = qdev_create(NULL, TYPE_MACIO_NVRAM);

    qdev_prop_set_uint32(dev, "size", 0x2000);

    qdev_prop_set_uint32(dev, "it_shift", 1);
@@ -488,14 +486,12 @@ static void ppc_core99_init(MachineState *machine) 


    fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_IS_KVM, kvm_enabled());

    if (kvm_enabled()) {

#ifdef CONFIG_KVM

        uint8_t *hypercall;



        hypercall = g_malloc(16);

        kvmppc_get_hypercall(env, hypercall, 16);

        fw_cfg_add_bytes(fw_cfg, FW_CFG_PPC_KVM_HC, hypercall, 16);

        fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_KVM_PID, getpid());

#endif

    }

    fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_TBFREQ, tbfreq);

    /* Mac OS X requires a "known good" clock-frequency value; pass it one. */