Allow monitor interaction when using migrate -exec
All, I've recently been playing around with migration via exec. Unfortunately, when starting the incoming qemu process with "-incoming exec:cmd", it suffers the same problem that -incoming tcp used to suffer; namely, that you can't interact with the monitor until after the migration has happened. This causes problems for libvirt usage of -incoming exec, since libvirt expects to be able to access the monitor ahead of time. This fairly simple patch allows you to access the monitor both before and after the migration has completed using exec. (note: developed/tested with qemu-kvm, but applies perfectly fine to qemu) Signed-off-by: Chris Lalancette <clalance@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
c16b5a2ca0
commit
8a43b1ea7f
1
hw/hw.h
1
hw/hw.h
@ -51,6 +51,7 @@ QEMUFile *qemu_fopen(const char *filename, const char *mode);
|
|||||||
QEMUFile *qemu_fopen_socket(int fd);
|
QEMUFile *qemu_fopen_socket(int fd);
|
||||||
QEMUFile *qemu_popen(FILE *popen_file, const char *mode);
|
QEMUFile *qemu_popen(FILE *popen_file, const char *mode);
|
||||||
QEMUFile *qemu_popen_cmd(const char *command, const char *mode);
|
QEMUFile *qemu_popen_cmd(const char *command, const char *mode);
|
||||||
|
int qemu_popen_fd(QEMUFile *f);
|
||||||
void qemu_fflush(QEMUFile *f);
|
void qemu_fflush(QEMUFile *f);
|
||||||
int qemu_fclose(QEMUFile *f);
|
int qemu_fclose(QEMUFile *f);
|
||||||
void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size);
|
void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size);
|
||||||
|
@ -104,17 +104,11 @@ err_after_alloc:
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
int exec_start_incoming_migration(const char *command)
|
static void exec_accept_incoming_migration(void *opaque)
|
||||||
{
|
{
|
||||||
|
QEMUFile *f = opaque;
|
||||||
int ret;
|
int ret;
|
||||||
QEMUFile *f;
|
|
||||||
|
|
||||||
dprintf("Attempting to start an incoming migration\n");
|
|
||||||
f = qemu_popen_cmd(command, "r");
|
|
||||||
if(f == NULL) {
|
|
||||||
dprintf("Unable to apply qemu wrapper to popen file\n");
|
|
||||||
return -errno;
|
|
||||||
}
|
|
||||||
vm_stop(0); /* just in case */
|
vm_stop(0); /* just in case */
|
||||||
ret = qemu_loadvm_state(f);
|
ret = qemu_loadvm_state(f);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
@ -123,11 +117,28 @@ int exec_start_incoming_migration(const char *command)
|
|||||||
}
|
}
|
||||||
qemu_announce_self();
|
qemu_announce_self();
|
||||||
dprintf("successfully loaded vm state\n");
|
dprintf("successfully loaded vm state\n");
|
||||||
|
/* we've successfully migrated, close the fd */
|
||||||
|
qemu_set_fd_handler2(qemu_popen_fd(f), NULL, NULL, NULL, NULL);
|
||||||
vm_start();
|
vm_start();
|
||||||
qemu_fclose(f);
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
err:
|
err:
|
||||||
qemu_fclose(f);
|
qemu_fclose(f);
|
||||||
|
}
|
||||||
|
|
||||||
|
int exec_start_incoming_migration(const char *command)
|
||||||
|
{
|
||||||
|
QEMUFile *f;
|
||||||
|
|
||||||
|
dprintf("Attempting to start an incoming migration\n");
|
||||||
|
f = qemu_popen_cmd(command, "r");
|
||||||
|
if(f == NULL) {
|
||||||
|
dprintf("Unable to apply qemu wrapper to popen file\n");
|
||||||
return -errno;
|
return -errno;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
qemu_set_fd_handler2(qemu_popen_fd(f), NULL,
|
||||||
|
exec_accept_incoming_migration, NULL,
|
||||||
|
(void *)(unsigned long)f);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
12
savevm.c
12
savevm.c
@ -244,7 +244,6 @@ QEMUFile *qemu_popen(FILE *popen_file, const char *mode)
|
|||||||
} else {
|
} else {
|
||||||
s->file = qemu_fopen_ops(s, popen_put_buffer, NULL, popen_close, NULL, NULL);
|
s->file = qemu_fopen_ops(s, popen_put_buffer, NULL, popen_close, NULL, NULL);
|
||||||
}
|
}
|
||||||
fprintf(stderr, "qemu_popen: returning result of qemu_fopen_ops\n");
|
|
||||||
return s->file;
|
return s->file;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -260,6 +259,17 @@ QEMUFile *qemu_popen_cmd(const char *command, const char *mode)
|
|||||||
return qemu_popen(popen_file, mode);
|
return qemu_popen(popen_file, mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int qemu_popen_fd(QEMUFile *f)
|
||||||
|
{
|
||||||
|
QEMUFilePopen *p;
|
||||||
|
int fd;
|
||||||
|
|
||||||
|
p = (QEMUFilePopen *)f->opaque;
|
||||||
|
fd = fileno(p->popen_file);
|
||||||
|
|
||||||
|
return fd;
|
||||||
|
}
|
||||||
|
|
||||||
QEMUFile *qemu_fopen_socket(int fd)
|
QEMUFile *qemu_fopen_socket(int fd)
|
||||||
{
|
{
|
||||||
QEMUFileSocket *s = qemu_mallocz(sizeof(QEMUFileSocket));
|
QEMUFileSocket *s = qemu_mallocz(sizeof(QEMUFileSocket));
|
||||||
|
Loading…
Reference in New Issue
Block a user