diff mbox

[v2,04/13] xenstore: move init-xenstore-domain to tools/helpers

Message ID 1450444471-6454-5-git-send-email-jgross@suse.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jürgen Groß Dec. 18, 2015, 1:14 p.m. UTC 
The program init-xenstore-domain to start a xenstore domain instead
of the xenstored daemon is built, but not installed. Change that.

Move the program to a new tools subdirectory "helpers" to be able to
use libxl in a later patch. Otherwise a dependency loop will be
created.

While moving modify the coding style to the standard style used in
the tools directory.

Signed-off-by: Juergen Gross <jgross@suse.com>
---
 tools/Makefile                        |   1 +
 tools/helpers/Makefile                |  34 +++++++++
 tools/helpers/init-xenstore-domain.c  | 128 ++++++++++++++++++++++++++++++++++
 tools/xenstore/Makefile               |   9 ---
 tools/xenstore/init-xenstore-domain.c | 119 -------------------------------
 5 files changed, 163 insertions(+), 128 deletions(-)
 create mode 100644 tools/helpers/Makefile
 create mode 100644 tools/helpers/init-xenstore-domain.c
 delete mode 100644 tools/xenstore/init-xenstore-domain.c

Comments

Ian Campbell Jan. 6, 2016, 4:03 p.m. UTC | #1 
On Fri, 2015-12-18 at 14:14 +0100, Juergen Gross wrote:
> The program init-xenstore-domain to start a xenstore domain instead
> of the xenstored daemon is built, but not installed. Change that.
> 
> Move the program to a new tools subdirectory "helpers" to be able to
> use libxl in a later patch. Otherwise a dependency loop will be
> created.
> 
> While moving modify the coding style to the standard style used in
> the tools directory.

Please don't combine such things with moving the whole file. Or at the very
least please use git send-email/format-patch -M (ideally both do it
separately and use -M).

So long as the file is self consistent I'm not convinced it is actually
worth changing, plus it doesn't actually seem to be following CODING_STYLE
(which is the default style for tools/* as well as xen/*), since hasn't
gained e.g. spaces inside of the if ( x ).

Ian.
Jürgen Groß Jan. 7, 2016, 6:12 a.m. UTC | #2 
On 06/01/16 17:03, Ian Campbell wrote:
> On Fri, 2015-12-18 at 14:14 +0100, Juergen Gross wrote:
>> The program init-xenstore-domain to start a xenstore domain instead
>> of the xenstored daemon is built, but not installed. Change that.
>>
>> Move the program to a new tools subdirectory "helpers" to be able to
>> use libxl in a later patch. Otherwise a dependency loop will be
>> created.
>>
>> While moving modify the coding style to the standard style used in
>> the tools directory.
> 
> Please don't combine such things with moving the whole file. Or at the very
> least please use git send-email/format-patch -M (ideally both do it
> separately and use -M).

Okay, I'll do the move in this patch only.

> So long as the file is self consistent I'm not convinced it is actually
> worth changing, plus it doesn't actually seem to be following CODING_STYLE
> (which is the default style for tools/* as well as xen/*), since hasn't
> gained e.g. spaces inside of the if ( x ).

As there are substantial changes to this file in later patches, I'll do
the coding style changes in a separate patch, using the _correct_ style.


Juergen
diff mbox

Patch

diff --git a/tools/Makefile b/tools/Makefile
index 820ca40..3b15ece 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -29,6 +29,7 @@  endif
 
 SUBDIRS-y += xenpmd
 SUBDIRS-y += libxl
+SUBDIRS-y += helpers
 SUBDIRS-$(CONFIG_X86) += xenpaging
 SUBDIRS-$(CONFIG_X86) += debugger/gdbsx
 SUBDIRS-$(CONFIG_X86) += debugger/kdd
diff --git a/tools/helpers/Makefile b/tools/helpers/Makefile
new file mode 100644
index 0000000..52347fd
--- /dev/null
+++ b/tools/helpers/Makefile
@@ -0,0 +1,34 @@ 
+#
+# tools/helpers/Makefile
+#
+
+XEN_ROOT = $(CURDIR)/../..
+include $(XEN_ROOT)/tools/Rules.mk
+
+ifeq ($(CONFIG_Linux),y)
+PROGS += init-xenstore-domain
+endif
+
+INIT_XENSTORE_DOMAIN_OBJS = init-xenstore-domain.o
+$(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenguest)
+$(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenctrl)
+$(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenstore)
+
+.PHONY: all
+all: $(PROGS)
+
+init-xenstore-domain: $(INIT_XENSTORE_DOMAIN_OBJS)
+	$(CC) $(LDFLAGS) -o $@ $(INIT_XENSTORE_DOMAIN_OBJS) $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS)
+
+.PHONY: install
+install: all
+	$(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
+ifeq ($(CONFIG_Linux),y)
+	$(INSTALL_PROG) init-xenstore-domain $(DESTDIR)$(LIBEXEC_BIN)
+endif
+
+.PHONY: clean
+clean:
+	$(RM) -f *.o $(PROGS) $(DEPS)
+
+distclean: clean
diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c
new file mode 100644
index 0000000..3dd1255
--- /dev/null
+++ b/tools/helpers/init-xenstore-domain.c
@@ -0,0 +1,128 @@ 
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <xenctrl.h>
+#include <xc_dom.h>
+#include <xenstore.h>
+#include <xen/sys/xenbus_dev.h>
+
+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;
+
+err:
+    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;
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 1b4a494..404d4cb 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -46,10 +46,6 @@  ifeq ($(XENSTORE_XENSTORED),y)
 ALL_TARGETS += xs_tdb_dump xenstored
 endif
 
-ifeq ($(CONFIG_Linux),y)
-ALL_TARGETS += init-xenstore-domain
-endif
-
 ifdef CONFIG_STUBDOM
 CFLAGS += -DNO_SOCKETS=1
 endif
@@ -72,11 +68,6 @@  xenstored_probes.o: xenstored_solaris.o
 CFLAGS += -DHAVE_DTRACE=1
 endif
 
-init-xenstore-domain.o: CFLAGS += $(CFLAGS_libxenguest)
-
-init-xenstore-domain: init-xenstore-domain.o $(LIBXENSTORE)
-	$(CC) $^ $(LDFLAGS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) -o $@ $(APPEND_LDFLAGS)
-
 xenstored: $(XENSTORED_OBJS)
 	$(CC) $^ $(LDFLAGS) $(LDLIBS_libxenctrl) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS)
 
diff --git a/tools/xenstore/init-xenstore-domain.c b/tools/xenstore/init-xenstore-domain.c
deleted file mode 100644
index 297afe5..0000000
--- a/tools/xenstore/init-xenstore-domain.c
+++ /dev/null
@@ -1,119 +0,0 @@ 
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <xenctrl.h>
-#include <xc_dom.h>
-#include <xenstore.h>
-#include <xen/sys/xenbus_dev.h>
-
-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;
-
-err:
-	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;
-}