@@ -16,6 +16,7 @@ Interactive commands for Xen Store Daemon.
along with this program; If not, see <http://www.gnu.org/licenses/>.
*/
+#include <ctype.h>
#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
@@ -330,6 +331,11 @@ static void lu_get_dump_state(struct lu_dump_state *state)
static void lu_close_dump_state(struct lu_dump_state *state)
{
}
+
+static char *lu_exec(const void *ctx, int argc, char **argv)
+{
+ return "NYI";
+}
#else
static const char *lu_binary(const void *ctx, struct connection *conn,
const char *filename)
@@ -429,6 +435,14 @@ static void lu_close_dump_state(struct lu_dump_state *state)
unlink(filename);
talloc_free(filename);
}
+
+static char *lu_exec(const void *ctx, int argc, char **argv)
+{
+ argv[0] = lu_status->filename;
+ execvp(argv[0], argv);
+
+ return "Error activating new binary.";
+}
#endif
static const char *lu_check_lu_allowed(const void *ctx, bool force,
@@ -555,7 +569,52 @@ void lu_read_state(void)
static const char *lu_activate_binary(const void *ctx)
{
- return "Not yet implemented.";
+ int argc;
+ char **argv;
+ unsigned int i;
+
+ if (lu_status->cmdline) {
+ argc = 4; /* At least one arg + progname + "-U" + NULL. */
+ for (i = 0; lu_status->cmdline[i]; i++)
+ if (isspace(lu_status->cmdline[i]))
+ argc++;
+ argv = talloc_array(ctx, char *, argc);
+ if (!argv)
+ return "Allocation failure.";
+
+ i = 0;
+ argc = 1;
+ argv[1] = strtok(lu_status->cmdline, " \t");
+ while (argv[argc]) {
+ if (!strcmp(argv[argc], "-U"))
+ i = 1;
+ argc++;
+ argv[argc] = strtok(NULL, " \t");
+ }
+
+ if (!i) {
+ argv[argc++] = "-U";
+ argv[argc] = NULL;
+ }
+ } else {
+ for (i = 0; i < orig_argc; i++)
+ if (!strcmp(orig_argv[i], "-U"))
+ break;
+
+ argc = orig_argc;
+ argv = talloc_array(ctx, char *, orig_argc + 2);
+ if (!argv)
+ return "Allocation failure.";
+
+ memcpy(argv, orig_argv, orig_argc * sizeof(*argv));
+ if (i == orig_argc)
+ argv[argc++] = "-U";
+ argv[argc] = NULL;
+ }
+
+ domain_deinit();
+
+ return lu_exec(ctx, argc, argv);
}
static const char *lu_start(const void *ctx, struct connection *conn,
@@ -72,6 +72,9 @@ static unsigned int nr_fds;
static int sock = -1;
+int orig_argc;
+char **orig_argv;
+
static bool verbose = false;
LIST_HEAD(connections);
int tracefd = -1;
@@ -2026,6 +2029,8 @@ int main(int argc, char *argv[])
const char *pidfile = NULL;
int timeout;
+ orig_argc = argc;
+ orig_argv = argv;
while ((opt = getopt_long(argc, argv, "DE:F:HNPS:t:A:M:T:RVW:U", options,
NULL)) != -1) {
@@ -201,6 +201,9 @@ void dtrace_io(const struct connection *conn, const struct buffered_data *data,
void reopen_log(void);
void close_log(void);
+extern int orig_argc;
+extern char **orig_argv;
+
extern char *tracefile;
extern int tracefd;
@@ -783,6 +783,12 @@ void domain_init(int evtfd)
virq_port = rc;
}
+void domain_deinit(void)
+{
+ if (virq_port)
+ xenevtchn_unbind(xce_handle, virq_port);
+}
+
void domain_entry_inc(struct connection *conn, struct node *node)
{
struct domain *d;
@@ -46,6 +46,7 @@ int do_reset_watches(struct connection *conn, struct buffered_data *in);
void domain_init(int evtfd);
void dom0_init(void);
+void domain_deinit(void);
/* Returns the implicit path of a connection (only domains have this) */
const char *get_implicit_path(const struct connection *conn);