From: Juergen Gross <jgross@suse.com>
To: xen-devel@lists.xenproject.org
Cc: Juergen Gross <jgross@suse.com>,
haozhong.zhang@intel.com, wei.liu2@citrix.com,
zhangchen.fnst@cn.fujitsu.com, ian.jackson@eu.citrix.com,
yi.y.sun@linux.intel.com
Subject: [PATCH v2 03/12] libxl: white space cleanup
Date: Thu, 9 Feb 2017 10:30:16 +0100 [thread overview]
Message-ID: <20170209093025.20849-4-jgross@suse.com> (raw)
In-Reply-To: <20170209093025.20849-1-jgross@suse.com>
Before moving code to new sources clean up some white space issues in
libxl.c.
Signed-off-by: Juergen Gross <jgross@suse.com>
---
tools/libxl/libxl.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index ea66149..6b87f48 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -72,7 +72,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version,
ctx->childproc_hooks = &libxl__childproc_default_hooks;
ctx->childproc_user = 0;
-
+
ctx->sigchld_selfpipe[0] = -1;
ctx->sigchld_selfpipe[1] = -1;
libxl__ev_fd_init(&ctx->sigchld_selfpipe_efd);
@@ -355,8 +355,6 @@ const char *libxl_defbool_to_string(libxl_defbool b)
}
/******************************************************************************/
-
-
int libxl__domain_rename(libxl__gc *gc, uint32_t domid,
const char *old_name, const char *new_name,
xs_transaction_t trans)
@@ -1242,7 +1240,7 @@ int libxl_evenable_domain_death(libxl_ctx *ctx, uint32_t domid,
GC_INIT(ctx);
libxl_evgen_domain_death *evg, *evg_search;
int rc;
-
+
CTX_LOCK;
evg = malloc(sizeof(*evg)); if (!evg) { rc = ERROR_NOMEM; goto out; }
@@ -1315,7 +1313,7 @@ static void disk_eject_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w,
libxl_event *ev = NEW_EVENT(egc, DISK_EJECT, evg->domid, evg->user);
libxl_device_disk *disk = &ev->u.disk_eject.disk;
-
+
rc = libxl__xs_read_checked(gc, XBT_NULL, evg->be_ptr_path, &backend);
if (rc) {
LIBXL__EVENT_DISASTER(egc, "xs_read failed reading be_ptr_path",
@@ -1425,7 +1423,7 @@ void libxl_evdisable_disk_eject(libxl_ctx *ctx, libxl_evgen_disk_eject *evg) {
GC_INIT(ctx);
libxl__evdisable_disk_eject(gc, evg);
GC_FREE;
-}
+}
/* Callbacks for libxl_domain_destroy */
@@ -2515,7 +2513,6 @@ out:
return rc;
}
-
static int libxl__append_disk_list(libxl__gc *gc,
uint32_t domid,
libxl_device_disk **disks,
@@ -2862,7 +2859,7 @@ static char * libxl__alloc_vdev(libxl__gc *gc, void *get_vdev_user,
/* Callbacks */
-char *libxl__device_disk_find_local_path(libxl__gc *gc,
+char *libxl__device_disk_find_local_path(libxl__gc *gc,
libxl_domid guest_domid,
const libxl_device_disk *disk,
bool qdisk_direct)
@@ -2884,7 +2881,7 @@ char *libxl__device_disk_find_local_path(libxl__gc *gc,
path = libxl__strdup(gc, disk->pdev_path);
LOG(DEBUG, "Directly accessing local RAW disk %s", path);
goto out;
- }
+ }
/*
* If we're being called for a qemu path, we can pass the target
@@ -2894,9 +2891,9 @@ char *libxl__device_disk_find_local_path(libxl__gc *gc,
path = libxl__strdup(gc, disk->pdev_path);
LOG(DEBUG, "Directly accessing local QDISK target %s", path);
goto out;
- }
+ }
- /*
+ /*
* If the format isn't raw and / or we're using a script, then see
* if the script has written a path to the "cooked" node
*/
@@ -2965,7 +2962,7 @@ void libxl__device_disk_local_initiate_attach(libxl__egc *egc,
if (in_disk->script != NULL)
disk->script = libxl__strdup(gc, in_disk->script);
disk->vdev = NULL;
-
+
rc = libxl__device_disk_setdefault(gc, disk, LIBXL_TOOLSTACK_DOMID);
if (rc) goto out;
@@ -3042,7 +3039,7 @@ void libxl__device_disk_local_initiate_detach(libxl__egc *egc,
rc = libxl__device_from_disk(gc, LIBXL_TOOLSTACK_DOMID,
disk, device);
if (rc != 0) goto out;
-
+
aodev->action = LIBXL__DEVICE_ACTION_REMOVE;
aodev->dev = device;
aodev->callback = local_device_detach_cb;
--
2.10.2
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-02-09 9:30 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-09 9:30 [PATCH v2 00/12] libxl: split up libxl.c Juergen Gross
2017-02-09 9:30 ` [PATCH v2 01/12] libxl: adjust copyright comment of libxl.c Juergen Gross
2017-02-09 10:18 ` Wei Liu
2017-02-09 11:37 ` Ian Jackson
2017-02-09 9:30 ` [PATCH v2 02/12] libxl: make some functions global to prepare splitting up libxl.c Juergen Gross
2017-02-09 11:36 ` Ian Jackson
2017-02-09 11:42 ` Juergen Gross
2017-02-09 15:44 ` Wei Liu
2017-02-09 16:06 ` Juergen Gross
2017-02-09 9:30 ` Juergen Gross [this message]
2017-02-09 11:37 ` [PATCH v2 03/12] libxl: white space cleanup Ian Jackson
2017-02-09 9:30 ` [PATCH v2 04/12] libxl: carve out cpupool specific functions from libxl.c Juergen Gross
2017-02-09 9:30 ` [PATCH v2 05/12] libxl: carve out scheduler " Juergen Gross
2017-02-09 9:30 ` [PATCH v2 06/12] libxl: carve out disk " Juergen Gross
2017-02-09 9:30 ` [PATCH v2 07/12] libxl: carve out console " Juergen Gross
2017-02-09 9:30 ` [PATCH v2 08/12] libxl: carve out memory " Juergen Gross
2017-02-09 9:30 ` [PATCH v2 09/12] libxl: move device specific functions out of libxl.c Juergen Gross
2017-02-09 9:30 ` [PATCH v2 10/12] libxl: carve out tmem specific functions from libxl.c Juergen Gross
2017-02-09 9:30 ` [PATCH v2 11/12] libxl: carve out domain " Juergen Gross
2017-02-09 9:30 ` [PATCH v2 12/12] libxl: make one function static Juergen Gross
2017-02-09 11:42 ` Ian Jackson
2017-02-09 10:22 ` [PATCH v2 00/12] libxl: split up libxl.c Wei Liu
2017-02-09 11:41 ` 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=20170209093025.20849-4-jgross@suse.com \
--to=jgross@suse.com \
--cc=haozhong.zhang@intel.com \
--cc=ian.jackson@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xenproject.org \
--cc=yi.y.sun@linux.intel.com \
--cc=zhangchen.fnst@cn.fujitsu.com \
/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).