Merge remote-tracking branch 'remotes/sstabellini/xen-2015-01-20-v2' into staging (a5bd4470) · Commits · SUMMER2020 / students / proj-2021291

configure

+29 −0

Original line number	Diff line number	Diff line
		@@ -1869,6 +1869,32 @@ EOF
		#if !defined(HVM_MAX_VCPUS)
		# error HVM_MAX_VCPUS not defined
		#endif
		int main(void) {
		xc_interface *xc;
		xs_daemon_open();
		xc = xc_interface_open(0, 0, 0);
		xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
		xc_gnttab_open(NULL, 0);
		xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0);
		xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000);
		xc_hvm_create_ioreq_server(xc, 0, 0, NULL);
		return 0;
		}
		EOF
		compile_prog "" "$xen_libs"
		then
		xen_ctrl_version=450
		xen=yes

		elif
		cat > $TMPC <<EOF &&
		#include <xenctrl.h>
		#include <xenstore.h>
		#include <stdint.h>
		#include <xen/hvm/hvm_info_table.h>
		#if !defined(HVM_MAX_VCPUS)
		# error HVM_MAX_VCPUS not defined
		#endif
		int main(void) {
		xc_interface *xc;
		xs_daemon_open();
		@@ -4283,6 +4309,9 @@ if test -n "$sparc_cpu"; then
		echo "Target Sparc Arch $sparc_cpu"
		fi
		echo "xen support $xen"
		if test "$xen" = "yes" ; then
		echo "xen ctrl version $xen_ctrl_version"
		fi
		echo "brlapi support $brlapi"
		echo "bluez support $bluez"
		echo "Documentation $docs"

hw/core/qdev.c

+53 −0

Original line number	Diff line number	Diff line
		@@ -189,6 +189,56 @@ int qdev_init(DeviceState *dev)
		return 0;
		}

		static QTAILQ_HEAD(device_listeners, DeviceListener) device_listeners
		= QTAILQ_HEAD_INITIALIZER(device_listeners);

		enum ListenerDirection { Forward, Reverse };

		#define DEVICE_LISTENER_CALL(_callback, _direction, _args...) \
		do { \
		DeviceListener *_listener; \
		\
		switch (_direction) { \
		case Forward: \
		QTAILQ_FOREACH(_listener, &device_listeners, link) { \
		if (_listener->_callback) { \
		_listener->_callback(_listener, ##_args); \
		} \
		} \
		break; \
		case Reverse: \
		QTAILQ_FOREACH_REVERSE(_listener, &device_listeners, \
		device_listeners, link) { \
		if (_listener->_callback) { \
		_listener->_callback(_listener, ##_args); \
		} \
		} \
		break; \
		default: \
		abort(); \
		} \
		} while (0)

		static int device_listener_add(DeviceState dev, void opaque)
		{
		DEVICE_LISTENER_CALL(realize, Forward, dev);

		return 0;
		}

		void device_listener_register(DeviceListener *listener)
		{
		QTAILQ_INSERT_TAIL(&device_listeners, listener, link);

		qbus_walk_children(sysbus_get_default(), NULL, NULL, device_listener_add,
		NULL, NULL);
		}

		void device_listener_unregister(DeviceListener *listener)
		{
		QTAILQ_REMOVE(&device_listeners, listener, link);
		}

		static void device_realize(DeviceState dev, Error *errp)
		{
		DeviceClass *dc = DEVICE_GET_CLASS(dev);
		@@ -994,6 +1044,8 @@ static void device_set_realized(Object obj, bool value, Error *errp)
		goto fail;
		}

		DEVICE_LISTENER_CALL(realize, Forward, dev);

		hotplug_ctrl = qdev_get_hotplug_handler(dev);
		if (hotplug_ctrl) {
		hotplug_handler_plug(hotplug_ctrl, dev, &local_err);
		@@ -1035,6 +1087,7 @@ static void device_set_realized(Object obj, bool value, Error *errp)
		dc->unrealize(dev, local_errp);
		}
		dev->pending_deleted_event = true;
		DEVICE_LISTENER_CALL(unrealize, Reverse, dev);
		}

		if (local_err != NULL) {

include/hw/qdev-core.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -165,6 +165,12 @@ struct DeviceState {
		int alias_required_for_version;
		};

		struct DeviceListener {
		void (realize)(DeviceListener listener, DeviceState *dev);
		void (unrealize)(DeviceListener listener, DeviceState *dev);
		QTAILQ_ENTRY(DeviceListener) link;
		};

		#define TYPE_BUS "bus"
		#define BUS(obj) OBJECT_CHECK(BusState, (obj), TYPE_BUS)
		#define BUS_CLASS(klass) OBJECT_CLASS_CHECK(BusClass, (klass), TYPE_BUS)
		@@ -376,4 +382,8 @@ static inline bool qbus_is_hotpluggable(BusState *bus)
		{
		return bus->hotplug_handler;
		}

		void device_listener_register(DeviceListener *listener);
		void device_listener_unregister(DeviceListener *listener);

		#endif

include/hw/xen/xen_common.h

+223 −0

Original line number	Diff line number	Diff line
		@@ -16,7 +16,9 @@

		#include "hw/hw.h"
		#include "hw/xen/xen.h"
		#include "hw/pci/pci.h"
		#include "qemu/queue.h"
		#include "trace.h"

		/*
		* We don't support Xen prior to 3.3.0.
		@@ -179,4 +181,225 @@ static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom,
		}
		#endif

		/* Xen before 4.5 */
		#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 450

		#ifndef HVM_PARAM_BUFIOREQ_EVTCHN
		#define HVM_PARAM_BUFIOREQ_EVTCHN 26
		#endif

		#define IOREQ_TYPE_PCI_CONFIG 2

		typedef uint32_t ioservid_t;

		static inline void xen_map_memory_section(XenXC xc, domid_t dom,
		ioservid_t ioservid,
		MemoryRegionSection *section)
		{
		}

		static inline void xen_unmap_memory_section(XenXC xc, domid_t dom,
		ioservid_t ioservid,
		MemoryRegionSection *section)
		{
		}

		static inline void xen_map_io_section(XenXC xc, domid_t dom,
		ioservid_t ioservid,
		MemoryRegionSection *section)
		{
		}

		static inline void xen_unmap_io_section(XenXC xc, domid_t dom,
		ioservid_t ioservid,
		MemoryRegionSection *section)
		{
		}

		static inline void xen_map_pcidev(XenXC xc, domid_t dom,
		ioservid_t ioservid,
		PCIDevice *pci_dev)
		{
		}

		static inline void xen_unmap_pcidev(XenXC xc, domid_t dom,
		ioservid_t ioservid,
		PCIDevice *pci_dev)
		{
		}

		static inline int xen_create_ioreq_server(XenXC xc, domid_t dom,
		ioservid_t *ioservid)
		{
		return 0;
		}

		static inline void xen_destroy_ioreq_server(XenXC xc, domid_t dom,
		ioservid_t ioservid)
		{
		}

		static inline int xen_get_ioreq_server_info(XenXC xc, domid_t dom,
		ioservid_t ioservid,
		xen_pfn_t *ioreq_pfn,
		xen_pfn_t *bufioreq_pfn,
		evtchn_port_t *bufioreq_evtchn)
		{
		unsigned long param;
		int rc;

		rc = xc_get_hvm_param(xc, dom, HVM_PARAM_IOREQ_PFN, &param);
		if (rc < 0) {
		fprintf(stderr, "failed to get HVM_PARAM_IOREQ_PFN\n");
		return -1;
		}

		*ioreq_pfn = param;

		rc = xc_get_hvm_param(xc, dom, HVM_PARAM_BUFIOREQ_PFN, &param);
		if (rc < 0) {
		fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_PFN\n");
		return -1;
		}

		*bufioreq_pfn = param;

		rc = xc_get_hvm_param(xc, dom, HVM_PARAM_BUFIOREQ_EVTCHN,
		&param);
		if (rc < 0) {
		fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_EVTCHN\n");
		return -1;
		}

		*bufioreq_evtchn = param;

		return 0;
		}

		static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom,
		ioservid_t ioservid,
		bool enable)
		{
		return 0;
		}

		/* Xen 4.5 */
		#else

		static inline void xen_map_memory_section(XenXC xc, domid_t dom,
		ioservid_t ioservid,
		MemoryRegionSection *section)
		{
		hwaddr start_addr = section->offset_within_address_space;
		ram_addr_t size = int128_get64(section->size);
		hwaddr end_addr = start_addr + size - 1;

		trace_xen_map_mmio_range(ioservid, start_addr, end_addr);
		xc_hvm_map_io_range_to_ioreq_server(xc, dom, ioservid, 1,
		start_addr, end_addr);
		}

		static inline void xen_unmap_memory_section(XenXC xc, domid_t dom,
		ioservid_t ioservid,
		MemoryRegionSection *section)
		{
		hwaddr start_addr = section->offset_within_address_space;
		ram_addr_t size = int128_get64(section->size);
		hwaddr end_addr = start_addr + size - 1;

		trace_xen_unmap_mmio_range(ioservid, start_addr, end_addr);
		xc_hvm_unmap_io_range_from_ioreq_server(xc, dom, ioservid, 1,
		start_addr, end_addr);
		}

		static inline void xen_map_io_section(XenXC xc, domid_t dom,
		ioservid_t ioservid,
		MemoryRegionSection *section)
		{
		hwaddr start_addr = section->offset_within_address_space;
		ram_addr_t size = int128_get64(section->size);
		hwaddr end_addr = start_addr + size - 1;

		trace_xen_map_portio_range(ioservid, start_addr, end_addr);
		xc_hvm_map_io_range_to_ioreq_server(xc, dom, ioservid, 0,
		start_addr, end_addr);
		}

		static inline void xen_unmap_io_section(XenXC xc, domid_t dom,
		ioservid_t ioservid,
		MemoryRegionSection *section)
		{
		hwaddr start_addr = section->offset_within_address_space;
		ram_addr_t size = int128_get64(section->size);
		hwaddr end_addr = start_addr + size - 1;

		trace_xen_unmap_portio_range(ioservid, start_addr, end_addr);
		xc_hvm_unmap_io_range_from_ioreq_server(xc, dom, ioservid, 0,
		start_addr, end_addr);
		}

		static inline void xen_map_pcidev(XenXC xc, domid_t dom,
		ioservid_t ioservid,
		PCIDevice *pci_dev)
		{
		trace_xen_map_pcidev(ioservid, pci_bus_num(pci_dev->bus),
		PCI_SLOT(pci_dev->devfn), PCI_FUNC(pci_dev->devfn));
		xc_hvm_map_pcidev_to_ioreq_server(xc, dom, ioservid,
		0, pci_bus_num(pci_dev->bus),
		PCI_SLOT(pci_dev->devfn),
		PCI_FUNC(pci_dev->devfn));
		}

		static inline void xen_unmap_pcidev(XenXC xc, domid_t dom,
		ioservid_t ioservid,
		PCIDevice *pci_dev)
		{
		trace_xen_unmap_pcidev(ioservid, pci_bus_num(pci_dev->bus),
		PCI_SLOT(pci_dev->devfn), PCI_FUNC(pci_dev->devfn));
		xc_hvm_unmap_pcidev_from_ioreq_server(xc, dom, ioservid,
		0, pci_bus_num(pci_dev->bus),
		PCI_SLOT(pci_dev->devfn),
		PCI_FUNC(pci_dev->devfn));
		}

		static inline int xen_create_ioreq_server(XenXC xc, domid_t dom,
		ioservid_t *ioservid)
		{
		int rc = xc_hvm_create_ioreq_server(xc, dom, 1, ioservid);

		if (rc == 0) {
		trace_xen_ioreq_server_create(*ioservid);
		}

		return rc;
		}

		static inline void xen_destroy_ioreq_server(XenXC xc, domid_t dom,
		ioservid_t ioservid)
		{
		trace_xen_ioreq_server_destroy(ioservid);
		xc_hvm_destroy_ioreq_server(xc, dom, ioservid);
		}

		static inline int xen_get_ioreq_server_info(XenXC xc, domid_t dom,
		ioservid_t ioservid,
		xen_pfn_t *ioreq_pfn,
		xen_pfn_t *bufioreq_pfn,
		evtchn_port_t *bufioreq_evtchn)
		{
		return xc_hvm_get_ioreq_server_info(xc, dom, ioservid,
		ioreq_pfn, bufioreq_pfn,
		bufioreq_evtchn);
		}

		static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom,
		ioservid_t ioservid,
		bool enable)
		{
		trace_xen_ioreq_server_state(ioservid, enable);
		return xc_hvm_set_ioreq_server_state(xc, dom, ioservid, enable);
		}

		#endif

		#endif /* QEMU_HW_XEN_COMMON_H */

include/qemu/typedefs.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ typedef struct BusState BusState;
		typedef struct CharDriverState CharDriverState;
		typedef struct CompatProperty CompatProperty;
		typedef struct DeviceState DeviceState;
		typedef struct DeviceListener DeviceListener;
		typedef struct DisplayChangeListener DisplayChangeListener;
		typedef struct DisplayState DisplayState;
		typedef struct DisplaySurface DisplaySurface;