From: Juergen Gross <jgross@suse.com>
To: xen-devel@lists.xen.org
Cc: Juergen Gross <jgross@suse.com>,
wei.liu2@citrix.com, ian.jackson@eu.citrix.com
Subject: [PATCH 3/3] libxl: refactor domcreate_attach_dtdev() to use device type framework
Date: Tue, 21 Jun 2016 16:24:51 +0200 [thread overview]
Message-ID: <1466519091-29348-4-git-send-email-jgross@suse.com> (raw)
In-Reply-To: <1466519091-29348-1-git-send-email-jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
---
tools/libxl/libxl_create.c | 72 ++++++++++++++++++++++------------------------
1 file changed, 35 insertions(+), 37 deletions(-)
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index c4e85f0..e93b880 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -742,9 +742,6 @@ 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_dtdev(libxl__egc *egc, libxl__multidev *multidev,
- int ret);
-
static void domcreate_console_available(libxl__egc *egc,
libxl__domain_create_state *dcs);
@@ -1399,12 +1396,43 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev,
domcreate_complete(egc, dcs, ret);
}
+static void libxl__add_dtdevs(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_dtdevs; i++) {
+ const libxl_device_dtdev *dtdev = &d_config->dtdevs[i];
+
+ LOG(DEBUG, "Assign device \"%s\" to dom%u", dtdev->path, domid);
+ rc = xc_assign_dt_device(CTX->xch, domid, dtdev->path);
+ if (rc < 0) {
+ LOG(ERROR, "xc_assign_dtdevice failed: %d", rc);
+ goto out;
+ }
+ }
+
+out:
+ aodev->rc = rc;
+ aodev->callback(egc, aodev);
+}
+
+static struct libxl_device_type libxl__dtdev_devtype = {
+ .type = "dtdev",
+ .num_offset = offsetof(libxl_domain_config, num_dtdevs),
+ .add = libxl__add_dtdevs,
+};
+
static struct libxl_device_type *device_type_tbl[] = {
&libxl__nic_devtype,
&libxl__vtpm_devtype,
&libxl__usbctrl_devtype,
&libxl__usbdev_devtype,
&libxl__pci_devtype,
+ &libxl__dtdev_devtype,
};
static void domcreate_attach_devices(libxl__egc *egc,
@@ -1439,7 +1467,10 @@ static void domcreate_attach_devices(libxl__egc *egc,
return;
}
- domcreate_attach_dtdev(egc, multidev, 0);
+ domcreate_console_available(egc, dcs);
+
+ domcreate_complete(egc, dcs, 0);
+
return;
error_out:
@@ -1479,39 +1510,6 @@ error_out:
domcreate_complete(egc, dcs, ret);
}
-static void domcreate_attach_dtdev(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;
-
- for (i = 0; i < d_config->num_dtdevs; i++) {
- const libxl_device_dtdev *dtdev = &d_config->dtdevs[i];
-
- LOG(DEBUG, "Assign device \"%s\" to dom%u", dtdev->path, domid);
- ret = xc_assign_dt_device(CTX->xch, domid, dtdev->path);
- if (ret < 0) {
- LOG(ERROR, "xc_assign_dtdevice failed: %d", ret);
- goto error_out;
- }
- }
-
- domcreate_console_available(egc, dcs);
-
- domcreate_complete(egc, dcs, 0);
- return;
-
-error_out:
- assert(ret);
- domcreate_complete(egc, dcs, ret);
-}
-
static void domcreate_complete(libxl__egc *egc,
libxl__domain_create_state *dcs,
int rc)
--
2.6.6
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-06-21 14:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-21 14:24 [PATCH 0/3] libxl: add framework for device types Juergen Gross
2016-06-21 14:24 ` [PATCH 1/3] " Juergen Gross
2016-06-21 14:24 ` [PATCH 2/3] libxl: refactor domcreate_attach_pci() to use device type framework Juergen Gross
2016-06-21 14:24 ` Juergen Gross [this message]
2016-07-04 10:26 ` [PATCH 0/3] libxl: add framework for device types Juergen Gross
2016-07-06 11:04 ` Ian Jackson
2016-07-06 12:40 ` Juergen Gross
2016-07-06 12:47 ` Ian Jackson
2016-07-06 12:55 ` Juergen Gross
2016-07-06 16:09 ` Ian Jackson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1466519091-29348-4-git-send-email-jgross@suse.com \
--to=jgross@suse.com \
--cc=ian.jackson@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).