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/pci-host/gpex.c | 155 ------------------------------------------------ 1 file changed, 155 deletions(-) delete mode 100644 qemu/hw/pci-host/gpex.c (limited to 'qemu/hw/pci-host/gpex.c') diff --git a/qemu/hw/pci-host/gpex.c b/qemu/hw/pci-host/gpex.c deleted file mode 100644 index 66055ee5c..000000000 --- a/qemu/hw/pci-host/gpex.c +++ /dev/null @@ -1,155 +0,0 @@ -/* - * QEMU Generic PCI Express Bridge Emulation - * - * Copyright (C) 2015 Alexander Graf - * - * Code loosely based on q35.c. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - * - * Check out these documents for more information on the device: - * - * http://www.kernel.org/doc/Documentation/devicetree/bindings/pci/host-generic-pci.txt - * http://www.firmware.org/1275/practice/imap/imap0_9d.pdf - */ -#include "qemu/osdep.h" -#include "hw/hw.h" -#include "hw/pci-host/gpex.h" - -/**************************************************************************** - * GPEX host - */ - -static void gpex_set_irq(void *opaque, int irq_num, int level) -{ - GPEXHost *s = opaque; - - qemu_set_irq(s->irq[irq_num], level); -} - -static void gpex_host_realize(DeviceState *dev, Error **errp) -{ - PCIHostState *pci = PCI_HOST_BRIDGE(dev); - GPEXHost *s = GPEX_HOST(dev); - SysBusDevice *sbd = SYS_BUS_DEVICE(dev); - PCIExpressHost *pex = PCIE_HOST_BRIDGE(dev); - int i; - - pcie_host_mmcfg_init(pex, PCIE_MMCFG_SIZE_MAX); - memory_region_init(&s->io_mmio, OBJECT(s), "gpex_mmio", UINT64_MAX); - memory_region_init(&s->io_ioport, OBJECT(s), "gpex_ioport", 64 * 1024); - - sysbus_init_mmio(sbd, &pex->mmio); - sysbus_init_mmio(sbd, &s->io_mmio); - sysbus_init_mmio(sbd, &s->io_ioport); - for (i = 0; i < GPEX_NUM_IRQS; i++) { - sysbus_init_irq(sbd, &s->irq[i]); - } - - pci->bus = pci_register_bus(dev, "pcie.0", gpex_set_irq, - pci_swizzle_map_irq_fn, s, &s->io_mmio, - &s->io_ioport, 0, 4, TYPE_PCIE_BUS); - - qdev_set_parent_bus(DEVICE(&s->gpex_root), BUS(pci->bus)); - qdev_init_nofail(DEVICE(&s->gpex_root)); -} - -static const char *gpex_host_root_bus_path(PCIHostState *host_bridge, - PCIBus *rootbus) -{ - return "0000:00"; -} - -static void gpex_host_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc = DEVICE_CLASS(klass); - PCIHostBridgeClass *hc = PCI_HOST_BRIDGE_CLASS(klass); - - hc->root_bus_path = gpex_host_root_bus_path; - dc->realize = gpex_host_realize; - set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); - dc->fw_name = "pci"; -} - -static void gpex_host_initfn(Object *obj) -{ - GPEXHost *s = GPEX_HOST(obj); - GPEXRootState *root = &s->gpex_root; - - object_initialize(root, sizeof(*root), TYPE_GPEX_ROOT_DEVICE); - object_property_add_child(obj, "gpex_root", OBJECT(root), NULL); - qdev_prop_set_uint32(DEVICE(root), "addr", PCI_DEVFN(0, 0)); - qdev_prop_set_bit(DEVICE(root), "multifunction", false); -} - -static const TypeInfo gpex_host_info = { - .name = TYPE_GPEX_HOST, - .parent = TYPE_PCIE_HOST_BRIDGE, - .instance_size = sizeof(GPEXHost), - .instance_init = gpex_host_initfn, - .class_init = gpex_host_class_init, -}; - -/**************************************************************************** - * GPEX Root D0:F0 - */ - -static const VMStateDescription vmstate_gpex_root = { - .name = "gpex_root", - .version_id = 1, - .minimum_version_id = 1, - .fields = (VMStateField[]) { - VMSTATE_PCI_DEVICE(parent_obj, GPEXRootState), - VMSTATE_END_OF_LIST() - } -}; - -static void gpex_root_class_init(ObjectClass *klass, void *data) -{ - PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); - DeviceClass *dc = DEVICE_CLASS(klass); - - set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); - dc->desc = "QEMU generic PCIe host bridge"; - dc->vmsd = &vmstate_gpex_root; - k->vendor_id = PCI_VENDOR_ID_REDHAT; - k->device_id = PCI_DEVICE_ID_REDHAT_PCIE_HOST; - k->revision = 0; - k->class_id = PCI_CLASS_BRIDGE_HOST; - /* - * PCI-facing part of the host bridge, not usable without the - * host-facing part, which can't be device_add'ed, yet. - */ - dc->cannot_instantiate_with_device_add_yet = true; -} - -static const TypeInfo gpex_root_info = { - .name = TYPE_GPEX_ROOT_DEVICE, - .parent = TYPE_PCI_DEVICE, - .instance_size = sizeof(GPEXRootState), - .class_init = gpex_root_class_init, -}; - -static void gpex_register(void) -{ - type_register_static(&gpex_root_info); - type_register_static(&gpex_host_info); -} - -type_init(gpex_register) -- cgit 1.2.3-korg