# HG changeset patch
# User Anthony PERARD <anthony.perard@xxxxxxxxxx>
# Date 1320416647 0
# Node ID a67944b1adfb67193817de02e6d143e39bfbbe17
# Parent c5fe74068253a21325ab880370db4c93b7017998
libxl: libxl_qmp: Introduce libxl__qmp_pci_add.
This function insert a PCI passthrough device in qemu.
Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
---
diff -r c5fe74068253 -r a67944b1adfb tools/libxl/libxl_internal.h
--- a/tools/libxl/libxl_internal.h Fri Nov 04 12:38:25 2011 +0000
+++ b/tools/libxl/libxl_internal.h Fri Nov 04 14:24:07 2011 +0000
@@ -107,6 +107,9 @@
} libxl__device;
#define XC_PCI_BDF "0x%x, 0x%x, 0x%x, 0x%x"
+#define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07))
+#define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f)
+#define PCI_FUNC(devfn) ((devfn) & 0x07)
#define AUTO_PHP_SLOT 0x100
#define SYSFS_PCI_DEV "/sys/bus/pci/devices"
#define SYSFS_PCIBACK_DRIVER "/sys/bus/pci/drivers/pciback"
@@ -522,6 +525,7 @@
uint32_t domid);
/* ask to QEMU the serial port information and store it in xenstore. */
_hidden int libxl__qmp_query_serial(libxl__qmp_handler *qmp);
+_hidden int libxl__qmp_pci_add(libxl__gc *gc, int d, libxl_device_pci *pcidev);
/* close and free the QMP handler */
_hidden void libxl__qmp_close(libxl__qmp_handler *qmp);
/* remove the socket file, if the file has already been removed,
diff -r c5fe74068253 -r a67944b1adfb tools/libxl/libxl_qmp.c
--- a/tools/libxl/libxl_qmp.c Fri Nov 04 12:38:25 2011 +0000
+++ b/tools/libxl/libxl_qmp.c Fri Nov 04 14:24:07 2011 +0000
@@ -41,6 +41,7 @@
*/
#define QMP_RECEIVE_BUFFER_SIZE 4096
+#define PCI_PT_QDEV_ID "pci-pt-%02x_%02x.%01x"
typedef int (*qmp_callback_t)(libxl__qmp_handler *qmp,
const libxl__json_object *tree,
@@ -618,6 +619,100 @@
NULL, qmp->timeout);
}
+static int pci_add_callback(libxl__qmp_handler *qmp,
+ const libxl__json_object *response, void *opaque)
+{
+ libxl_device_pci *pcidev = opaque;
+ const libxl__json_object *bus = NULL;
+ libxl__gc gc = LIBXL_INIT_GC(qmp->ctx);
+ int i, j, rc = -1;
+ char *asked_id = libxl__sprintf(&gc, PCI_PT_QDEV_ID,
+ pcidev->bus, pcidev->dev, pcidev->func);
+
+ for (i = 0; (bus = libxl__json_array_get(response, i)); i++) {
+ const libxl__json_object *devices = NULL;
+ const libxl__json_object *device = NULL;
+ const libxl__json_object *o = NULL;
+ const char *id = NULL;
+
+ devices = libxl__json_map_get("devices", bus, JSON_ARRAY);
+
+ for (j = 0; (device = libxl__json_array_get(devices, j)); j++) {
+ o = libxl__json_map_get("qdev_id", device, JSON_STRING);
+ id = libxl__json_object_get_string(o);
+
+ if (id && strcmp(asked_id, id) == 0) {
+ int dev_slot, dev_func;
+
+ o = libxl__json_map_get("slot", device, JSON_INTEGER);
+ if (!o)
+ goto out;
+ dev_slot = libxl__json_object_get_integer(o);
+ o = libxl__json_map_get("function", device, JSON_INTEGER);
+ if (!o)
+ goto out;
+ dev_func = libxl__json_object_get_integer(o);
+
+ pcidev->vdevfn = PCI_DEVFN(dev_slot, dev_func);
+
+ rc = 0;
+ goto out;
+ }
+ }
+ }
+
+
+out:
+ libxl__free_all(&gc);
+ return rc;
+}
+
+int libxl__qmp_pci_add(libxl__gc *gc, int domid, libxl_device_pci *pcidev)
+{
+ libxl__qmp_handler *qmp = NULL;
+ flexarray_t *parameters = NULL;
+ libxl_key_value_list args = NULL;
+ char *hostaddr = NULL;
+ int rc = 0;
+
+ qmp = libxl__qmp_initialize(libxl__gc_owner(gc), domid);
+ if (!qmp)
+ return -1;
+
+ hostaddr = libxl__sprintf(gc, "%04x:%02x:%02x.%01x", pcidev->domain,
+ pcidev->bus, pcidev->dev, pcidev->func);
+ if (!hostaddr)
+ return -1;
+
+ parameters = flexarray_make(6, 1);
+ flexarray_append_pair(parameters, "driver", "xen-pci-passthrough");
+ flexarray_append_pair(parameters, "id",
+ libxl__sprintf(gc, PCI_PT_QDEV_ID,
+ pcidev->bus, pcidev->dev,
+ pcidev->func));
+ flexarray_append_pair(parameters, "hostaddr", hostaddr);
+ if (pcidev->vdevfn) {
+ flexarray_append_pair(parameters, "addr",
+ libxl__sprintf(gc, "%x.%x",
+ PCI_SLOT(pcidev->vdevfn),
+ PCI_FUNC(pcidev->vdevfn)));
+ }
+ args = libxl__xs_kvs_of_flexarray(gc, parameters, parameters->count);
+ if (!args)
+ return -1;
+
+ rc = qmp_synchronous_send(qmp, "device_add", &args,
+ NULL, NULL, qmp->timeout);
+ if (rc == 0) {
+ rc = qmp_synchronous_send(qmp, "query-pci", NULL,
+ pci_add_callback, pcidev, qmp->timeout);
+ }
+
+ flexarray_free(parameters);
+ libxl__qmp_close(qmp);
+ return rc;
+}
+
int libxl__qmp_initializations(libxl_ctx *ctx, uint32_t domid)
{
libxl__qmp_handler *qmp = NULL;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home