From bb756eebdac6fd24e8919e2c43f7d2c8c4091f59 Mon Sep 17 00:00:00 2001 From: RajithaY Date: Tue, 25 Apr 2017 03:31:15 -0700 Subject: Adding qemu as a submodule of KVMFORNFV This Patch includes the changes to add qemu as a submodule to kvmfornfv repo and make use of the updated latest qemu for the execution of all testcase Change-Id: I1280af507a857675c7f81d30c95255635667bdd7 Signed-off-by:RajithaY --- qemu/hw/ppc/e500plat.c | 68 -------------------------------------------------- 1 file changed, 68 deletions(-) delete mode 100644 qemu/hw/ppc/e500plat.c (limited to 'qemu/hw/ppc/e500plat.c') diff --git a/qemu/hw/ppc/e500plat.c b/qemu/hw/ppc/e500plat.c deleted file mode 100644 index b00565c3d..000000000 --- a/qemu/hw/ppc/e500plat.c +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Generic device-tree-driven paravirt PPC e500 platform - * - * Copyright 2012 Freescale Semiconductor, Inc. - * - * This is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#include "qemu/osdep.h" -#include "qemu-common.h" -#include "e500.h" -#include "hw/boards.h" -#include "sysemu/device_tree.h" -#include "hw/pci/pci.h" -#include "hw/ppc/openpic.h" -#include "kvm_ppc.h" - -static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt) -{ - const char model[] = "QEMU ppce500"; - const char compatible[] = "fsl,qemu-e500"; - - qemu_fdt_setprop(fdt, "/", "model", model, sizeof(model)); - qemu_fdt_setprop(fdt, "/", "compatible", compatible, - sizeof(compatible)); -} - -static void e500plat_init(MachineState *machine) -{ - PPCE500Params params = { - .pci_first_slot = 0x1, - .pci_nr_slots = PCI_SLOT_MAX - 1, - .fixup_devtree = e500plat_fixup_devtree, - .mpic_version = OPENPIC_MODEL_FSL_MPIC_42, - .has_mpc8xxx_gpio = true, - .has_platform_bus = true, - .platform_bus_base = 0xf00000000ULL, - .platform_bus_size = (128ULL * 1024 * 1024), - .platform_bus_first_irq = 5, - .platform_bus_num_irqs = 10, - .ccsrbar_base = 0xFE0000000ULL, - .pci_pio_base = 0xFE1000000ULL, - .pci_mmio_base = 0xC00000000ULL, - .pci_mmio_bus_base = 0xE0000000ULL, - .spin_base = 0xFEF000000ULL, - }; - - /* Older KVM versions don't support EPR which breaks guests when we announce - MPIC variants that support EPR. Revert to an older one for those */ - if (kvm_enabled() && !kvmppc_has_cap_epr()) { - params.mpic_version = OPENPIC_MODEL_FSL_MPIC_20; - } - - ppce500_init(machine, ¶ms); -} - -static void e500plat_machine_init(MachineClass *mc) -{ - mc->desc = "generic paravirt e500 platform"; - mc->init = e500plat_init; - mc->max_cpus = 32; - mc->has_dynamic_sysbus = true; -} - -DEFINE_MACHINE("ppce500", e500plat_machine_init) -- cgit 1.2.3-korg