fprintf (stderr, "closing guestfs handle %p (state %d)\n", g, g->state);
/* Try to sync if autosync flag is set. */
- if (g->autosync && g->state == READY)
+ if (g->autosync && g->state == READY) {
+ guestfs_umount_all (g);
guestfs_sync (g);
+ }
/* Remove any handlers that might be called back before we kill the
* subprocess.
while (len > 0) {
r = read (fd, buf, len);
- if (r == -1)
+ if (r == -1) {
+ if (errno == EINTR || errno == EAGAIN)
+ continue;
return -1;
+ }
buf += r;
len -= r;
int
guestfs_add_drive (guestfs_h *g, const char *filename)
{
- int len = strlen (filename) + 64;
+ size_t len = strlen (filename) + 64;
char buf[len];
if (strchr (filename, ',') != NULL) {
guestfs_launch (guestfs_h *g)
{
static const char *dir_template = "/tmp/libguestfsXXXXXX";
- int r, i, len, pmore, memsize;
+ int r, i, pmore, memsize;
+ size_t len;
int wfd[2], rfd[2];
int tries;
const char *kernel_name = "vmlinuz." REPO "." host_cpu;
char *kernel = NULL, *initrd = NULL;
char unixsock[256];
struct sockaddr_un addr;
- struct stat statbuf;
/* Configured? */
if (!g->cmdline) {
goto cleanup0;
}
- /* Choose a suitable memory size (in MB). This is more art
- * than science, but you can help by doing
- * ./configure --enable-debug-command
- * and then running:
- * debug sh free
- * debug mem ''
- * and seeing how much free memory is left for particular
- * configurations.
- *
- * It's also helpful to report both the compressed and uncompressed
- * size of the initramfs (ls -lh initramfs*.img; du -sh initramfs).
- *
- * XXX KVM virtio balloon driver?
+ /* Choose a suitable memory size. Previously we tried to choose
+ * a minimal memory size, but this isn't really necessary since
+ * recent QEMU and KVM don't do anything nasty like locking
+ * memory into core any more. This we can safely choose a
+ * large, generous amount of memory, and it'll just get swapped
+ * on smaller systems.
*/
- if (stat (initrd, &statbuf) != -1) {
- /* Approximate size of the initramfs after it is decompressed
- * in kernel memory. The compression factor is ~2.5-3.
- */
- memsize = 3 * statbuf.st_size / 1024 / 1024;
-
- /* Approximate size used by the kernel. */
- memsize += 10;
-
- /* Want to give userspace some room, so: */
- memsize += 128;
-
-#if SIZEOF_LONG == 8
- /* On 64 bit, assume some overhead. */
- memsize += 64;
-#endif
- } else
- memsize = 512;
-
+ memsize = 384;
/* Make the temporary directory containing the socket. */
if (!g->tmpdir) {
/* Linux kernel command line. */
snprintf (append, sizeof append,
- "console=ttyS0 guestfs=%s:%d%s",
+ "panic=1 console=ttyS0 guestfs=%s:%d%s",
VMCHANNEL_ADDR, VMCHANNEL_PORT,
g->verbose ? " guestfs_verbose=1" : "");
#if 0
add_cmdline (g, "-no-kqemu"); /* Avoids a warning. */
#endif
+ add_cmdline (g, "-no-reboot"); /* Force exit instead of reboot on panic */
add_cmdline (g, "-kernel");
add_cmdline (g, (char *) kernel);
add_cmdline (g, "-initrd");
add_cmdline (g, "-net");
add_cmdline (g, "user,vlan=0");
add_cmdline (g, "-net");
- add_cmdline (g, "nic,model=rtl8139,vlan=0");
+ add_cmdline (g, "nic,model=virtio,vlan=0");
incr_cmdline_size (g);
g->cmdline[g->cmdline_size-1] = NULL;
return 0;
}
+int
+guestfs_end_busy (guestfs_h *g)
+{
+ switch (g->state)
+ {
+ case BUSY:
+ g->state = READY;
+ break;
+ case CONFIG:
+ case READY:
+ break;
+ case LAUNCHING:
+ case NO_HANDLE:
+ error (g, "guestfs_end_busy: called when in state %d", g->state);
+ return -1;
+ }
+ return 0;
+}
+
/* Structure-freeing functions. These rely on the fact that the
* structure format is identical to the XDR format. See note in
* generator.ml.
free (x);
}
+/* We don't know if stdout_event or sock_read_event will be the
+ * first to receive EOF if the qemu process dies. This function
+ * has the common cleanup code for both.
+ */
+static void
+child_cleanup (guestfs_h *g)
+{
+ if (g->verbose)
+ fprintf (stderr, "stdout_event: %p: child process died\n", g);
+ /*kill (g->pid, SIGTERM);*/
+ if (g->recoverypid > 0) kill (g->recoverypid, 9);
+ waitpid (g->pid, NULL, 0);
+ if (g->recoverypid > 0) waitpid (g->recoverypid, NULL, 0);
+ if (g->stdout_watch >= 0)
+ g->main_loop->remove_handle (g->main_loop, g, g->stdout_watch);
+ if (g->sock_watch >= 0)
+ g->main_loop->remove_handle (g->main_loop, g, g->sock_watch);
+ close (g->fd[0]);
+ close (g->fd[1]);
+ close (g->sock);
+ g->fd[0] = -1;
+ g->fd[1] = -1;
+ g->sock = -1;
+ g->pid = 0;
+ g->recoverypid = 0;
+ g->start_t = 0;
+ g->stdout_watch = -1;
+ g->sock_watch = -1;
+ g->state = CONFIG;
+ if (g->subprocess_quit_cb)
+ g->subprocess_quit_cb (g, g->subprocess_quit_cb_data);
+}
+
/* This function is called whenever qemu prints something on stdout.
* Qemu's stdout is also connected to the guest's serial console, so
* we see kernel messages here too.
n = read (fd, buf, sizeof buf);
if (n == 0) {
/* Hopefully this indicates the qemu child process has died. */
- if (g->verbose)
- fprintf (stderr, "stdout_event: %p: child process died\n", g);
- /*kill (g->pid, SIGTERM);*/
- if (g->recoverypid > 0) kill (g->recoverypid, 9);
- waitpid (g->pid, NULL, 0);
- if (g->recoverypid > 0) waitpid (g->recoverypid, NULL, 0);
- if (g->stdout_watch >= 0)
- g->main_loop->remove_handle (g->main_loop, g, g->stdout_watch);
- if (g->sock_watch >= 0)
- g->main_loop->remove_handle (g->main_loop, g, g->sock_watch);
- close (g->fd[0]);
- close (g->fd[1]);
- close (g->sock);
- g->fd[0] = -1;
- g->fd[1] = -1;
- g->sock = -1;
- g->pid = 0;
- g->recoverypid = 0;
- g->start_t = 0;
- g->stdout_watch = -1;
- g->sock_watch = -1;
- g->state = CONFIG;
- if (g->subprocess_quit_cb)
- g->subprocess_quit_cb (g, g->subprocess_quit_cb_data);
+ child_cleanup (g);
return;
}
if (n == -1) {
- if (errno != EAGAIN)
+ if (errno != EINTR && errno != EAGAIN)
perrorf (g, "read");
return;
}
int watch, int fd, int events)
{
XDR xdr;
- unsigned len;
+ u_int32_t len;
int n;
if (g->verbose)
}
n = read (g->sock, g->msg_in + g->msg_in_size,
g->msg_in_allocated - g->msg_in_size);
- if (n == 0)
- /* Disconnected? Ignore it because stdout_watch will get called
- * and will do the cleanup.
- */
+ if (n == 0) {
+ /* Disconnected. */
+ child_cleanup (g);
return;
+ }
if (n == -1) {
- if (errno != EAGAIN)
+ if (errno != EINTR && errno != EAGAIN)
perrorf (g, "read");
return;
}
if (g->msg_in_size-4 < len) return; /* Need more of this message. */
/* Got the full message, begin processing it. */
+#if 0
if (g->verbose) {
int i, j;
printf ("|\n");
}
}
+#endif
/* Not in the expected state. */
if (g->state != BUSY)
/* Push the message up to the higher layer. */
if (g->reply_cb)
g->reply_cb (g, g->reply_cb_data, &xdr);
+ else
+ /* This message (probably) should never be printed. */
+ fprintf (stderr, "libguesfs: sock_read_event: !!! dropped message !!!\n");
g->msg_in_size -= len + 4;
memmove (g->msg_in, g->msg_in+len+4, g->msg_in_size);
{
struct guestfs_message_header hdr;
XDR xdr;
- unsigned len;
+ u_int32_t len;
int serial = g->msg_next_serial++;
int sent;
guestfs_main_loop *ml = guestfs_get_main_loop (g);
}
/* Send file in chunked encoding. */
- while (!cancel && (r = read (fd, buf, sizeof buf)) > 0) {
+ while (!cancel) {
+ r = read (fd, buf, sizeof buf);
+ if (r == -1 && (errno == EINTR || errno == EAGAIN))
+ continue;
+ if (r <= 0) break;
err = send_file_data_sync (g, buf, r);
if (err < 0) {
if (err == -2) /* daemon sent cancellation */
static int
send_file_chunk_sync (guestfs_h *g, int cancel, const char *buf, size_t buflen)
{
- unsigned len;
+ u_int32_t len;
int sent;
guestfs_chunk chunk;
XDR xdr;
/* Synchronously receive a file. */
-static int receive_file_data_sync (guestfs_h *g, void **buf);
+/* Returns -1 = error, 0 = EOF, 1 = more data */
+static int receive_file_data_sync (guestfs_h *g, void **buf, size_t *len);
int
guestfs__receive_file_sync (guestfs_h *g, const char *filename)
{
void *buf;
int fd, r;
+ size_t len;
fd = open (filename, O_WRONLY|O_CREAT|O_TRUNC|O_NOCTTY, 0666);
if (fd == -1) {
}
/* Receive the file in chunked encoding. */
- while ((r = receive_file_data_sync (g, &buf)) > 0) {
- if (xwrite (fd, buf, r) == -1) {
+ while ((r = receive_file_data_sync (g, &buf, &len)) >= 0) {
+ if (xwrite (fd, buf, len) == -1) {
perrorf (g, "%s: write", filename);
free (buf);
goto cancel;
}
free (buf);
+ if (r == 0) break; /* End of file. */
}
if (r == -1) {
return -1;
}
- while ((r = receive_file_data_sync (g, &buf)) > 0)
- free (buf); /* just discard it */
+ while ((r = receive_file_data_sync (g, NULL, NULL)) > 0)
+ ; /* just discard it */
return -1;
}
+/* Note that the reply callback can be called multiple times before
+ * the main loop quits and we get back to the synchronous code. So
+ * we have to be prepared to save multiple chunks on a list here.
+ */
struct receive_file_ctx {
- int code;
- void **buf;
+ int count; /* 0 if receive_file_cb not called, or
+ * else count number of chunks.
+ */
+ guestfs_chunk *chunks; /* Array of chunks. */
};
static void
+free_chunks (struct receive_file_ctx *ctx)
+{
+ int i;
+
+ for (i = 0; i < ctx->count; ++i)
+ free (ctx->chunks[i].data.data_val);
+
+ free (ctx->chunks);
+}
+
+static void
receive_file_cb (guestfs_h *g, void *data, XDR *xdr)
{
guestfs_main_loop *ml = guestfs_get_main_loop (g);
struct receive_file_ctx *ctx = (struct receive_file_ctx *) data;
guestfs_chunk chunk;
+ if (ctx->count == -1) /* Parse error occurred previously. */
+ return;
+
ml->main_loop_quit (ml, g);
memset (&chunk, 0, sizeof chunk);
if (!xdr_guestfs_chunk (xdr, &chunk)) {
error (g, "failed to parse file chunk");
- ctx->code = -1;
- return;
- }
- if (chunk.cancel) {
- error (g, "file receive cancelled by daemon");
- ctx->code = -2;
- return;
- }
- if (chunk.data.data_len == 0) { /* end of transfer */
- ctx->code = 0;
+ free_chunks (ctx);
+ ctx->chunks = NULL;
+ ctx->count = -1;
return;
}
- ctx->code = chunk.data.data_len;
- *ctx->buf = chunk.data.data_val; /* caller frees */
+ /* Copy the chunk to the list. */
+ ctx->chunks = safe_realloc (g, ctx->chunks,
+ sizeof (guestfs_chunk) * (ctx->count+1));
+ ctx->chunks[ctx->count] = chunk;
+ ctx->count++;
}
/* Receive a chunk of file data. */
+/* Returns -1 = error, 0 = EOF, 1 = more data */
static int
-receive_file_data_sync (guestfs_h *g, void **buf)
+receive_file_data_sync (guestfs_h *g, void **buf, size_t *len_r)
{
struct receive_file_ctx ctx;
guestfs_main_loop *ml = guestfs_get_main_loop (g);
+ int i;
+ size_t len;
- ctx.code = -3;
- ctx.buf = buf;
+ ctx.count = 0;
+ ctx.chunks = NULL;
guestfs_set_reply_callback (g, receive_file_cb, &ctx);
(void) ml->main_loop_run (ml, g);
guestfs_set_reply_callback (g, NULL, NULL);
- if (g->verbose)
- fprintf (stderr, "receive_file_data_sync: code %d\n", ctx.code);
-
- switch (ctx.code) {
- case 0: /* end of file */
- return 0;
- case -1: case -2:
+ if (ctx.count == 0) {
+ error (g, "receive_file_data_sync: reply callback not called\n");
return -1;
- case -3:
- error (g, "failed to call receive_file_cb");
+ }
+
+ if (ctx.count == -1) {
+ error (g, "receive_file_data_sync: parse error in reply callback\n");
+ /* callback already freed the chunks */
return -1;
- default: /* received n bytes of data */
- return ctx.code;
}
+
+ if (g->verbose)
+ fprintf (stderr, "receive_file_data_sync: got %d chunks\n", ctx.count);
+
+ /* Process each chunk in the list. */
+ if (buf) *buf = NULL; /* Accumulate data in this buffer. */
+ len = 0;
+
+ for (i = 0; i < ctx.count; ++i) {
+ if (ctx.chunks[i].cancel) {
+ error (g, "file receive cancelled by daemon");
+ free_chunks (&ctx);
+ if (buf) free (*buf);
+ if (len_r) *len_r = 0;
+ return -1;
+ }
+
+ if (ctx.chunks[i].data.data_len == 0) { /* end of transfer */
+ free_chunks (&ctx);
+ if (len_r) *len_r = len;
+ return 0;
+ }
+
+ if (buf) {
+ *buf = safe_realloc (g, *buf, len + ctx.chunks[i].data.data_len);
+ memcpy (*buf+len, ctx.chunks[i].data.data_val,
+ ctx.chunks[i].data.data_len);
+ }
+ len += ctx.chunks[i].data.data_len;
+ }
+
+ if (len_r) *len_r = len;
+ free_chunks (&ctx);
+ return 1;
}
/* This is the default main loop implementation, using select(2). */
git.annexia.org / libguestfs.git / blobdiff