Signed-off-by: Juergen Gross <jgr...@suse.com>
---
tools/libxl/libxl_create.c | 54 ++++++--------------------------------------
tools/libxl/libxl_internal.h | 1 +
tools/libxl/libxl_pci.c | 36 +++++++++++++++++++++++++++++
3 files changed, 44 insertions(+), 47 deletions(-)
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index bb0f535..c4e85f0 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -742,10 +742,8 @@ static void domcreate_bootloader_done(libxl__egc *egc,
static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *aodevs,
int ret);
-static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *aodevs,
- int ret);
-static void domcreate_attach_dtdev(libxl__egc *egc,
- libxl__domain_create_state *dcs);
+static void domcreate_attach_dtdev(libxl__egc *egc, libxl__multidev *multidev,
+ int ret);
static void domcreate_console_available(libxl__egc *egc,
libxl__domain_create_state *dcs);
@@ -1406,6 +1404,7 @@ static struct libxl_device_type *device_type_tbl[] = {
&libxl__vtpm_devtype,
&libxl__usbctrl_devtype,
&libxl__usbdev_devtype,
+ &libxl__pci_devtype,
};
static void domcreate_attach_devices(libxl__egc *egc,
@@ -1440,7 +1439,7 @@ static void domcreate_attach_devices(libxl__egc *egc,
return;
}
- domcreate_attach_pci(egc, multidev, 0);
+ domcreate_attach_dtdev(egc, multidev, 0);
return;
error_out:
@@ -1480,52 +1479,13 @@ error_out:
domcreate_complete(egc, dcs, ret);
}
-static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *multidev,
- int ret)
-{
- libxl__domain_create_state *dcs = CONTAINER_OF(multidev, *dcs, multidev);
- STATE_AO_GC(dcs->ao);
- int i;
- int domid = dcs->guest_domid;
-
- /* convenience aliases */
- libxl_domain_config *const d_config = dcs->guest_config;
-
- if (ret) {
- goto error_out;
- }
-
- for (i = 0; i < d_config->num_pcidevs; i++) {
- ret = libxl__device_pci_add(gc, domid, &d_config->pcidevs[i], 1);
- if (ret < 0) {
- LOG(ERROR, "libxl_device_pci_add failed: %d", ret);
- goto error_out;
- }
- }
-
- if (d_config->num_pcidevs > 0) {
- ret = libxl__create_pci_backend(gc, domid, d_config->pcidevs,
- d_config->num_pcidevs);
- if (ret < 0) {
- LOG(ERROR, "libxl_create_pci_backend failed: %d", ret);
- goto error_out;
- }
- }
-
- domcreate_attach_dtdev(egc, dcs);
- return;
-
-error_out:
- assert(ret);
- domcreate_complete(egc, dcs, ret);
-}
-
static void domcreate_attach_dtdev(libxl__egc *egc,
- libxl__domain_create_state *dcs)
+ libxl__multidev *multidev,
+ int ret)
{
+ libxl__domain_create_state *dcs = CONTAINER_OF(multidev, *dcs, multidev);
STATE_AO_GC(dcs->ao);
int i;
- int ret;
int domid = dcs->guest_domid;
/* convenience aliases */
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 2603b33..547a78b 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -3401,6 +3401,7 @@ extern struct libxl_device_type libxl__nic_devtype;
extern struct libxl_device_type libxl__vtpm_devtype;
extern struct libxl_device_type libxl__usbctrl_devtype;
extern struct libxl_device_type libxl__usbdev_devtype;
+extern struct libxl_device_type libxl__pci_devtype;
/*----- Domain destruction -----*/
/* Domain destruction has been split into two functions:
diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c
index 236bdd0..fd245ea 100644
--- a/tools/libxl/libxl_pci.c
+++ b/tools/libxl/libxl_pci.c
@@ -1291,6 +1291,36 @@ out:
return rc;
}
+static void libxl__add_pcis(libxl__egc *egc, libxl__ao *ao, uint32_t domid,
+ libxl_domain_config *d_config,
+ libxl__multidev *multidev)
+{
+ AO_GC;
+ libxl__ao_device *aodev = libxl__multidev_prepare(multidev);
+ int i, rc = 0;
+
+ for (i = 0; i < d_config->num_pcidevs; i++) {
+ rc = libxl__device_pci_add(gc, domid, &d_config->pcidevs[i], 1);
+ if (rc < 0) {
+ LOG(ERROR, "libxl_device_pci_add failed: %d", rc);
+ goto out;
+ }
+ }
+
+ if (d_config->num_pcidevs > 0) {
+ rc = libxl__create_pci_backend(gc, domid, d_config->pcidevs,
+ d_config->num_pcidevs);
+ if (rc < 0) {
+ LOG(ERROR, "libxl_create_pci_backend failed: %d", rc);
+ goto out;
+ }
+ }
+
+out:
+ aodev->rc = rc;
+ aodev->callback(egc, aodev);
+}
+
static int qemu_pci_remove_xenstore(libxl__gc *gc, uint32_t domid,
libxl_device_pci *pcidev, int force)
{
@@ -1668,6 +1698,12 @@ int libxl__grant_vga_iomem_permission(libxl__gc *gc,
const uint32_t domid,
return 0;
}
+struct libxl_device_type libxl__pci_devtype = {
+ .type = "pci",
+ .num_offset = offsetof(libxl_domain_config, num_pcidevs),
+ .add = libxl__add_pcis,
+};
+
/*
* Local variables:
* mode: C
--
2.6.6
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
