From: Juergen Gross <jgross@suse.com>
To: xen-devel@lists.xen.org, Ian.Campbell@citrix.com,
ian.jackson@eu.citrix.com, stefano.stabellini@eu.citrix.com,
wei.liu2@citrix.com, dgdegra@tycho.nsa.gov
Cc: Juergen Gross <jgross@suse.com>
Subject: [PATCH v3 05/15] xenstore: adjust coding style of init-xenstore-domain.c
Date: Fri, 8 Jan 2016 14:08:36 +0100 [thread overview]
Message-ID: <1452258526-4797-6-git-send-email-jgross@suse.com> (raw)
In-Reply-To: <1452258526-4797-1-git-send-email-jgross@suse.com>
Adjust the coding style of init-xenstore-domain.c to the general Xen
coding style.
Signed-off-by: Juergen Gross <jgross@suse.com>
---
tools/helpers/init-xenstore-domain.c | 221 ++++++++++++++++++++---------------
1 file changed, 126 insertions(+), 95 deletions(-)
diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c
index 297afe5..9c47af1 100644
--- a/tools/helpers/init-xenstore-domain.c
+++ b/tools/helpers/init-xenstore-domain.c
@@ -15,105 +15,136 @@ static uint32_t domid = -1;
static int build(xc_interface *xch, int argc, char** argv)
{
- char cmdline[512];
- uint32_t ssid;
- xen_domain_handle_t handle = { 0 };
- int rv, xs_fd;
- struct xc_dom_image *dom = NULL;
- int maxmem = atoi(argv[2]);
- int limit_kb = (maxmem + 1)*1024;
-
- xs_fd = open("/dev/xen/xenbus_backend", O_RDWR);
- if (xs_fd == -1) return -1;
-
- rv = xc_flask_context_to_sid(xch, argv[3], strlen(argv[3]), &ssid);
- if (rv) goto err;
- rv = xc_domain_create(xch, ssid, handle, 0, &domid, NULL);
- if (rv) goto err;
- rv = xc_domain_max_vcpus(xch, domid, 1);
- if (rv) goto err;
- rv = xc_domain_setmaxmem(xch, domid, limit_kb);
- if (rv) goto err;
- rv = xc_domain_set_memmap_limit(xch, domid, limit_kb);
- if (rv) goto err;
-
- rv = ioctl(xs_fd, IOCTL_XENBUS_BACKEND_SETUP, domid);
- if (rv < 0) goto err;
- snprintf(cmdline, 512, "--event %d --internal-db", rv);
-
- dom = xc_dom_allocate(xch, cmdline, NULL);
- rv = xc_dom_kernel_file(dom, argv[1]);
- if (rv) goto err;
-
- if (argc > 4) {
- rv = xc_dom_ramdisk_file(dom, argv[4]);
- if (rv) goto err;
- }
-
- rv = xc_dom_boot_xen_init(dom, xch, domid);
- if (rv) goto err;
- rv = xc_dom_parse_image(dom);
- if (rv) goto err;
- rv = xc_dom_mem_init(dom, maxmem);
- if (rv) goto err;
- rv = xc_dom_boot_mem_init(dom);
- if (rv) goto err;
- rv = xc_dom_build_image(dom);
- if (rv) goto err;
- rv = xc_dom_boot_image(dom);
- if (rv) goto err;
-
- xc_dom_release(dom);
- dom = NULL;
-
- rv = xc_domain_set_virq_handler(xch, domid, VIRQ_DOM_EXC);
- if (rv) goto err;
- rv = xc_domain_unpause(xch, domid);
- if (rv) goto err;
-
- return 0;
+ char cmdline[512];
+ uint32_t ssid;
+ xen_domain_handle_t handle = { 0 };
+ int rv, xs_fd;
+ struct xc_dom_image *dom = NULL;
+ int maxmem = atoi(argv[2]);
+ int limit_kb = (maxmem + 1) * 1024;
+
+ xs_fd = open("/dev/xen/xenbus_backend", O_RDWR);
+ if ( xs_fd == -1 )
+ return -1;
+
+ rv = xc_flask_context_to_sid(xch, argv[3], strlen(argv[3]), &ssid);
+ if ( rv )
+ goto err;
+ rv = xc_domain_create(xch, ssid, handle, 0, &domid, NULL);
+ if ( rv )
+ goto err;
+ rv = xc_domain_max_vcpus(xch, domid, 1);
+ if ( rv )
+ goto err;
+ rv = xc_domain_setmaxmem(xch, domid, limit_kb);
+ if ( rv )
+ goto err;
+ rv = xc_domain_set_memmap_limit(xch, domid, limit_kb);
+ if ( rv )
+ goto err;
+
+ rv = ioctl(xs_fd, IOCTL_XENBUS_BACKEND_SETUP, domid);
+ if ( rv < 0 )
+ goto err;
+ snprintf(cmdline, 512, "--event %d --internal-db", rv);
+
+ dom = xc_dom_allocate(xch, cmdline, NULL);
+ rv = xc_dom_kernel_file(dom, argv[1]);
+ if ( rv )
+ goto err;
+
+ if ( argc > 4 )
+ {
+ rv = xc_dom_ramdisk_file(dom, argv[4]);
+ if ( rv )
+ goto err;
+ }
+
+ rv = xc_dom_boot_xen_init(dom, xch, domid);
+ if ( rv )
+ goto err;
+ rv = xc_dom_parse_image(dom);
+ if ( rv )
+ goto err;
+ rv = xc_dom_mem_init(dom, maxmem);
+ if ( rv )
+ goto err;
+ rv = xc_dom_boot_mem_init(dom);
+ if ( rv )
+ goto err;
+ rv = xc_dom_build_image(dom);
+ if ( rv )
+ goto err;
+ rv = xc_dom_boot_image(dom);
+ if ( rv )
+ goto err;
+
+ xc_dom_release(dom);
+ dom = NULL;
+
+ rv = xc_domain_set_virq_handler(xch, domid, VIRQ_DOM_EXC);
+ if ( rv )
+ goto err;
+ rv = xc_domain_unpause(xch, domid);
+ if ( rv )
+ goto err;
+
+ return 0;
err:
- if (dom)
- xc_dom_release(dom);
- close(xs_fd);
- return rv;
+ if ( dom )
+ xc_dom_release(dom);
+ close(xs_fd);
+ return rv;
}
int main(int argc, char** argv)
{
- xc_interface *xch;
- struct xs_handle *xsh;
- char buf[16];
- int rv, fd;
-
- if (argc < 4 || argc > 5) {
- printf("Use: %s <xenstore-kernel> <memory_mb> <flask-label> [<ramdisk-file>]\n", argv[0]);
- return 2;
- }
-
- xch = xc_interface_open(NULL, NULL, 0);
- if (!xch) return 1;
-
- rv = build(xch, argc, argv);
-
- xc_interface_close(xch);
-
- if (rv) return 1;
-
- xsh = xs_open(0);
- rv = snprintf(buf, 16, "%d", domid);
- xs_write(xsh, XBT_NULL, "/tool/xenstored/domid", buf, rv);
- xs_daemon_close(xsh);
-
- fd = creat("/var/run/xenstored.pid", 0666);
- if (fd < 0)
- return 3;
- rv = snprintf(buf, 16, "domid:%d\n", domid);
- rv = write(fd, buf, rv);
- close(fd);
- if (rv < 0)
- return 3;
-
- return 0;
+ xc_interface *xch;
+ struct xs_handle *xsh;
+ char buf[16];
+ int rv, fd;
+
+ if ( argc < 4 || argc > 5 )
+ {
+ printf("Use: %s <xenstore-kernel> <memory_mb> <flask-label> [<ramdisk-file>]\n",
+ argv[0]);
+ return 2;
+ }
+
+ xch = xc_interface_open(NULL, NULL, 0);
+ if ( !xch )
+ return 1;
+
+ rv = build(xch, argc, argv);
+
+ xc_interface_close(xch);
+
+ if ( rv )
+ return 1;
+
+ xsh = xs_open(0);
+ rv = snprintf(buf, 16, "%d", domid);
+ xs_write(xsh, XBT_NULL, "/tool/xenstored/domid", buf, rv);
+ xs_daemon_close(xsh);
+
+ fd = creat("/var/run/xenstored.pid", 0666);
+ if ( fd < 0 )
+ return 3;
+ rv = snprintf(buf, 16, "domid:%d\n", domid);
+ rv = write(fd, buf, rv);
+ close(fd);
+ if ( rv < 0 )
+ return 3;
+
+ return 0;
}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
--
2.6.2
next prev parent reply other threads:[~2016-01-08 13:08 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-08 13:08 [PATCH v3 00/15] xenstore: make it easier to run xenstore in a domain Juergen Gross
2016-01-08 13:08 ` [PATCH v3 01/15] xen: add xenstore domain flag to hypervisor Juergen Gross
2016-01-08 14:07 ` Jan Beulich
2016-01-08 16:13 ` David Vrabel
[not found] ` <568FD0B902000078000C4E8F@suse.com>
2016-01-08 14:22 ` Juergen Gross
2016-01-08 14:25 ` Andrew Cooper
2016-01-08 16:03 ` Jan Beulich
[not found] ` <568FEBE402000078000C500D@suse.com>
2016-01-08 16:10 ` Juergen Gross
2016-01-15 15:50 ` Ian Campbell
2016-01-08 13:08 ` [PATCH v3 02/15] libxc: support new xenstore domain flag in libxc Juergen Gross
2016-01-08 13:08 ` [PATCH v3 03/15] libxl: provide a flag in dominfo to avoid stopping it Juergen Gross
2016-01-15 15:51 ` Ian Campbell
2016-01-08 13:08 ` [PATCH v3 04/15] xenstore: move init-xenstore-domain to tools/helpers Juergen Gross
2016-01-15 15:51 ` Ian Campbell
2016-01-08 13:08 ` Juergen Gross [this message]
2016-01-15 15:54 ` [PATCH v3 05/15] xenstore: adjust coding style of init-xenstore-domain.c Ian Campbell
2016-01-08 13:08 ` [PATCH v3 06/15] libxl: move xen-init-dom0 to tools/helpers Juergen Gross
2016-01-15 15:55 ` Ian Campbell
2016-01-08 13:08 ` [PATCH v3 07/15] xenstore: destroy xenstore domain in case of error after creating it Juergen Gross
2016-01-15 16:02 ` Ian Campbell
2016-01-08 13:08 ` [PATCH v3 08/15] xenstore: add error messages to init-xenstore-domain Juergen Gross
2016-01-08 13:08 ` [PATCH v3 09/15] xenstore: modify init-xenstore-domain parameter syntax Juergen Gross
2016-01-08 13:08 ` [PATCH v3 10/15] xenstore: make use of the "xenstore domain" flag Juergen Gross
2016-01-15 16:03 ` Ian Campbell
2016-01-08 13:08 ` [PATCH v3 11/15] xenstore: add init-xenstore-domain parameter to specify cmdline Juergen Gross
2016-01-08 13:08 ` [PATCH v3 12/15] tools: split up xen-init-dom0.c Juergen Gross
2016-01-08 13:08 ` [PATCH v3 13/15] xenstore: write xenstore domain data to xenstore Juergen Gross
2016-01-08 13:08 ` [PATCH v3 14/15] tools: don't stop xenstore domain when stopping dom0 Juergen Gross
2016-01-15 16:12 ` Ian Campbell
2016-01-15 16:24 ` Juergen Gross
2016-01-08 13:08 ` [PATCH v3 15/15] docs: document xenstore domain xenstore paths Juergen Gross
2016-01-15 16:14 ` Ian Campbell
2016-01-15 16:22 ` Juergen Gross
2016-01-15 16:27 ` Ian Campbell
2016-01-15 15:04 ` [PATCH v3 00/15] xenstore: make it easier to run xenstore in a domain Juergen Gross
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=1452258526-4797-6-git-send-email-jgross@suse.com \
--to=jgross@suse.com \
--cc=Ian.Campbell@citrix.com \
--cc=dgdegra@tycho.nsa.gov \
--cc=ian.jackson@eu.citrix.com \
--cc=stefano.stabellini@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.