From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: [PATCH v3 05/15] xenstore: adjust coding style of init-xenstore-domain.c Date: Fri, 8 Jan 2016 14:08:36 +0100 Message-ID: <1452258526-4797-6-git-send-email-jgross@suse.com> References: <1452258526-4797-1-git-send-email-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1452258526-4797-1-git-send-email-jgross@suse.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org 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 List-Id: xen-devel@lists.xenproject.org Adjust the coding style of init-xenstore-domain.c to the general Xen coding style. Signed-off-by: Juergen Gross --- 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 []\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 []\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