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/xen/xen-host-pci-device.c | 404 -------------------------------------- 1 file changed, 404 deletions(-) delete mode 100644 qemu/hw/xen/xen-host-pci-device.c (limited to 'qemu/hw/xen/xen-host-pci-device.c') diff --git a/qemu/hw/xen/xen-host-pci-device.c b/qemu/hw/xen/xen-host-pci-device.c deleted file mode 100644 index eed8cc88e..000000000 --- a/qemu/hw/xen/xen-host-pci-device.c +++ /dev/null @@ -1,404 +0,0 @@ -/* - * Copyright (C) 2011 Citrix Ltd. - * - * This work is licensed under the terms of the GNU GPL, version 2. See - * the COPYING file in the top-level directory. - * - */ - -#include "qemu/osdep.h" -#include "qapi/error.h" -#include "qemu-common.h" -#include "qemu/cutils.h" -#include "xen-host-pci-device.h" - -#define XEN_HOST_PCI_MAX_EXT_CAP \ - ((PCIE_CONFIG_SPACE_SIZE - PCI_CONFIG_SPACE_SIZE) / (PCI_CAP_SIZEOF + 4)) - -#ifdef XEN_HOST_PCI_DEVICE_DEBUG -# define XEN_HOST_PCI_LOG(f, a...) fprintf(stderr, "%s: " f, __func__, ##a) -#else -# define XEN_HOST_PCI_LOG(f, a...) (void)0 -#endif - -/* - * from linux/ioport.h - * IO resources have these defined flags. - */ -#define IORESOURCE_BITS 0x000000ff /* Bus-specific bits */ - -#define IORESOURCE_TYPE_BITS 0x00000f00 /* Resource type */ -#define IORESOURCE_IO 0x00000100 -#define IORESOURCE_MEM 0x00000200 - -#define IORESOURCE_PREFETCH 0x00001000 /* No side effects */ -#define IORESOURCE_MEM_64 0x00100000 - -static void xen_host_pci_sysfs_path(const XenHostPCIDevice *d, - const char *name, char *buf, ssize_t size) -{ - int rc; - - rc = snprintf(buf, size, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/%s", - d->domain, d->bus, d->dev, d->func, name); - assert(rc >= 0 && rc < size); -} - - -/* This size should be enough to read the first 7 lines of a resource file */ -#define XEN_HOST_PCI_RESOURCE_BUFFER_SIZE 400 -static void xen_host_pci_get_resource(XenHostPCIDevice *d, Error **errp) -{ - int i, rc, fd; - char path[PATH_MAX]; - char buf[XEN_HOST_PCI_RESOURCE_BUFFER_SIZE]; - unsigned long long start, end, flags, size; - char *endptr, *s; - uint8_t type; - - xen_host_pci_sysfs_path(d, "resource", path, sizeof(path)); - - fd = open(path, O_RDONLY); - if (fd == -1) { - error_setg_file_open(errp, errno, path); - return; - } - - do { - rc = read(fd, &buf, sizeof(buf) - 1); - if (rc < 0 && errno != EINTR) { - error_setg_errno(errp, errno, "read err"); - goto out; - } - } while (rc < 0); - buf[rc] = 0; - - s = buf; - for (i = 0; i < PCI_NUM_REGIONS; i++) { - type = 0; - - start = strtoll(s, &endptr, 16); - if (*endptr != ' ' || s == endptr) { - break; - } - s = endptr + 1; - end = strtoll(s, &endptr, 16); - if (*endptr != ' ' || s == endptr) { - break; - } - s = endptr + 1; - flags = strtoll(s, &endptr, 16); - if (*endptr != '\n' || s == endptr) { - break; - } - s = endptr + 1; - - if (start) { - size = end - start + 1; - } else { - size = 0; - } - - if (flags & IORESOURCE_IO) { - type |= XEN_HOST_PCI_REGION_TYPE_IO; - } - if (flags & IORESOURCE_MEM) { - type |= XEN_HOST_PCI_REGION_TYPE_MEM; - } - if (flags & IORESOURCE_PREFETCH) { - type |= XEN_HOST_PCI_REGION_TYPE_PREFETCH; - } - if (flags & IORESOURCE_MEM_64) { - type |= XEN_HOST_PCI_REGION_TYPE_MEM_64; - } - - if (i < PCI_ROM_SLOT) { - d->io_regions[i].base_addr = start; - d->io_regions[i].size = size; - d->io_regions[i].type = type; - d->io_regions[i].bus_flags = flags & IORESOURCE_BITS; - } else { - d->rom.base_addr = start; - d->rom.size = size; - d->rom.type = type; - d->rom.bus_flags = flags & IORESOURCE_BITS; - } - } - - if (i != PCI_NUM_REGIONS) { - error_setg(errp, "Invalid format or input too short: %s", buf); - } - -out: - close(fd); -} - -/* This size should be enough to read a long from a file */ -#define XEN_HOST_PCI_GET_VALUE_BUFFER_SIZE 22 -static void xen_host_pci_get_value(XenHostPCIDevice *d, const char *name, - unsigned int *pvalue, int base, Error **errp) -{ - char path[PATH_MAX]; - char buf[XEN_HOST_PCI_GET_VALUE_BUFFER_SIZE]; - int fd, rc; - unsigned long value; - const char *endptr; - - xen_host_pci_sysfs_path(d, name, path, sizeof(path)); - - fd = open(path, O_RDONLY); - if (fd == -1) { - error_setg_file_open(errp, errno, path); - return; - } - - do { - rc = read(fd, &buf, sizeof(buf) - 1); - if (rc < 0 && errno != EINTR) { - error_setg_errno(errp, errno, "read err"); - goto out; - } - } while (rc < 0); - - buf[rc] = 0; - rc = qemu_strtoul(buf, &endptr, base, &value); - if (!rc) { - assert(value <= UINT_MAX); - *pvalue = value; - } else { - error_setg_errno(errp, -rc, "failed to parse value '%s'", buf); - } - -out: - close(fd); -} - -static inline void xen_host_pci_get_hex_value(XenHostPCIDevice *d, - const char *name, - unsigned int *pvalue, - Error **errp) -{ - xen_host_pci_get_value(d, name, pvalue, 16, errp); -} - -static inline void xen_host_pci_get_dec_value(XenHostPCIDevice *d, - const char *name, - unsigned int *pvalue, - Error **errp) -{ - xen_host_pci_get_value(d, name, pvalue, 10, errp); -} - -static bool xen_host_pci_dev_is_virtfn(XenHostPCIDevice *d) -{ - char path[PATH_MAX]; - struct stat buf; - - xen_host_pci_sysfs_path(d, "physfn", path, sizeof(path)); - - return !stat(path, &buf); -} - -static void xen_host_pci_config_open(XenHostPCIDevice *d, Error **errp) -{ - char path[PATH_MAX]; - - xen_host_pci_sysfs_path(d, "config", path, sizeof(path)); - - d->config_fd = open(path, O_RDWR); - if (d->config_fd == -1) { - error_setg_file_open(errp, errno, path); - } -} - -static int xen_host_pci_config_read(XenHostPCIDevice *d, - int pos, void *buf, int len) -{ - int rc; - - do { - rc = pread(d->config_fd, buf, len, pos); - } while (rc < 0 && (errno == EINTR || errno == EAGAIN)); - if (rc != len) { - return -errno; - } - return 0; -} - -static int xen_host_pci_config_write(XenHostPCIDevice *d, - int pos, const void *buf, int len) -{ - int rc; - - do { - rc = pwrite(d->config_fd, buf, len, pos); - } while (rc < 0 && (errno == EINTR || errno == EAGAIN)); - if (rc != len) { - return -errno; - } - return 0; -} - - -int xen_host_pci_get_byte(XenHostPCIDevice *d, int pos, uint8_t *p) -{ - uint8_t buf; - int rc = xen_host_pci_config_read(d, pos, &buf, 1); - if (!rc) { - *p = buf; - } - return rc; -} - -int xen_host_pci_get_word(XenHostPCIDevice *d, int pos, uint16_t *p) -{ - uint16_t buf; - int rc = xen_host_pci_config_read(d, pos, &buf, 2); - if (!rc) { - *p = le16_to_cpu(buf); - } - return rc; -} - -int xen_host_pci_get_long(XenHostPCIDevice *d, int pos, uint32_t *p) -{ - uint32_t buf; - int rc = xen_host_pci_config_read(d, pos, &buf, 4); - if (!rc) { - *p = le32_to_cpu(buf); - } - return rc; -} - -int xen_host_pci_get_block(XenHostPCIDevice *d, int pos, uint8_t *buf, int len) -{ - return xen_host_pci_config_read(d, pos, buf, len); -} - -int xen_host_pci_set_byte(XenHostPCIDevice *d, int pos, uint8_t data) -{ - return xen_host_pci_config_write(d, pos, &data, 1); -} - -int xen_host_pci_set_word(XenHostPCIDevice *d, int pos, uint16_t data) -{ - data = cpu_to_le16(data); - return xen_host_pci_config_write(d, pos, &data, 2); -} - -int xen_host_pci_set_long(XenHostPCIDevice *d, int pos, uint32_t data) -{ - data = cpu_to_le32(data); - return xen_host_pci_config_write(d, pos, &data, 4); -} - -int xen_host_pci_set_block(XenHostPCIDevice *d, int pos, uint8_t *buf, int len) -{ - return xen_host_pci_config_write(d, pos, buf, len); -} - -int xen_host_pci_find_ext_cap_offset(XenHostPCIDevice *d, uint32_t cap) -{ - uint32_t header = 0; - int max_cap = XEN_HOST_PCI_MAX_EXT_CAP; - int pos = PCI_CONFIG_SPACE_SIZE; - - do { - if (xen_host_pci_get_long(d, pos, &header)) { - break; - } - /* - * If we have no capabilities, this is indicated by cap ID, - * cap version and next pointer all being 0. - */ - if (header == 0) { - break; - } - - if (PCI_EXT_CAP_ID(header) == cap) { - return pos; - } - - pos = PCI_EXT_CAP_NEXT(header); - if (pos < PCI_CONFIG_SPACE_SIZE) { - break; - } - - max_cap--; - } while (max_cap > 0); - - return -1; -} - -void xen_host_pci_device_get(XenHostPCIDevice *d, uint16_t domain, - uint8_t bus, uint8_t dev, uint8_t func, - Error **errp) -{ - unsigned int v; - Error *err = NULL; - - d->config_fd = -1; - d->domain = domain; - d->bus = bus; - d->dev = dev; - d->func = func; - - xen_host_pci_config_open(d, &err); - if (err) { - goto error; - } - - xen_host_pci_get_resource(d, &err); - if (err) { - goto error; - } - - xen_host_pci_get_hex_value(d, "vendor", &v, &err); - if (err) { - goto error; - } - d->vendor_id = v; - - xen_host_pci_get_hex_value(d, "device", &v, &err); - if (err) { - goto error; - } - d->device_id = v; - - xen_host_pci_get_dec_value(d, "irq", &v, &err); - if (err) { - goto error; - } - d->irq = v; - - xen_host_pci_get_hex_value(d, "class", &v, &err); - if (err) { - goto error; - } - d->class_code = v; - - d->is_virtfn = xen_host_pci_dev_is_virtfn(d); - - return; - -error: - error_propagate(errp, err); - - if (d->config_fd >= 0) { - close(d->config_fd); - d->config_fd = -1; - } -} - -bool xen_host_pci_device_closed(XenHostPCIDevice *d) -{ - return d->config_fd == -1; -} - -void xen_host_pci_device_put(XenHostPCIDevice *d) -{ - if (d->config_fd >= 0) { - close(d->config_fd); - d->config_fd = -1; - } -} -- cgit 1.2.3-korg