mirror of https://github.com/xemu-project/xemu.git
migration: remove unfreeze logic
Now that we have a thread, and blocking writes, we don't need it. Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
dd217b8732
commit
188a428559
|
@ -25,7 +25,6 @@ typedef struct QEMUFileBuffered
|
||||||
{
|
{
|
||||||
MigrationState *migration_state;
|
MigrationState *migration_state;
|
||||||
QEMUFile *file;
|
QEMUFile *file;
|
||||||
int freeze_output;
|
|
||||||
size_t bytes_xfer;
|
size_t bytes_xfer;
|
||||||
size_t xfer_limit;
|
size_t xfer_limit;
|
||||||
uint8_t *buffer;
|
uint8_t *buffer;
|
||||||
|
@ -69,13 +68,6 @@ static ssize_t buffered_flush(QEMUFileBuffered *s)
|
||||||
size_t to_send = MIN(s->buffer_size - offset, s->xfer_limit - s->bytes_xfer);
|
size_t to_send = MIN(s->buffer_size - offset, s->xfer_limit - s->bytes_xfer);
|
||||||
ret = migrate_fd_put_buffer(s->migration_state, s->buffer + offset,
|
ret = migrate_fd_put_buffer(s->migration_state, s->buffer + offset,
|
||||||
to_send);
|
to_send);
|
||||||
if (ret == -EAGAIN) {
|
|
||||||
DPRINTF("backend not ready, freezing\n");
|
|
||||||
ret = 0;
|
|
||||||
s->freeze_output = 1;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ret <= 0) {
|
if (ret <= 0) {
|
||||||
DPRINTF("error flushing data, %zd\n", ret);
|
DPRINTF("error flushing data, %zd\n", ret);
|
||||||
break;
|
break;
|
||||||
|
@ -109,9 +101,6 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, in
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
DPRINTF("unfreezing output\n");
|
|
||||||
s->freeze_output = 0;
|
|
||||||
|
|
||||||
if (size > 0) {
|
if (size > 0) {
|
||||||
DPRINTF("buffering %d bytes\n", size - offset);
|
DPRINTF("buffering %d bytes\n", size - offset);
|
||||||
buffered_append(s, buf, size);
|
buffered_append(s, buf, size);
|
||||||
|
@ -125,7 +114,7 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, in
|
||||||
|
|
||||||
if (pos == 0 && size == 0) {
|
if (pos == 0 && size == 0) {
|
||||||
DPRINTF("file is ready\n");
|
DPRINTF("file is ready\n");
|
||||||
if (!s->freeze_output && s->bytes_xfer < s->xfer_limit) {
|
if (s->bytes_xfer < s->xfer_limit) {
|
||||||
DPRINTF("notifying client\n");
|
DPRINTF("notifying client\n");
|
||||||
migrate_fd_put_ready(s->migration_state);
|
migrate_fd_put_ready(s->migration_state);
|
||||||
}
|
}
|
||||||
|
@ -148,12 +137,6 @@ static int buffered_close(void *opaque)
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (s->freeze_output) {
|
|
||||||
ret = migrate_fd_wait_for_unfreeze(s->migration_state);
|
|
||||||
if (ret < 0) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ret2 = migrate_fd_close(s->migration_state);
|
ret2 = migrate_fd_close(s->migration_state);
|
||||||
|
@ -187,8 +170,6 @@ static int buffered_rate_limit(void *opaque)
|
||||||
if (ret) {
|
if (ret) {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
if (s->freeze_output)
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
if (s->bytes_xfer > s->xfer_limit)
|
if (s->bytes_xfer > s->xfer_limit)
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -233,9 +214,6 @@ static void *buffered_file_thread(void *opaque)
|
||||||
if (s->migration_state->complete) {
|
if (s->migration_state->complete) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (s->freeze_output) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (current_time >= expire_time) {
|
if (current_time >= expire_time) {
|
||||||
s->bytes_xfer = 0;
|
s->bytes_xfer = 0;
|
||||||
expire_time = current_time + BUFFER_DELAY;
|
expire_time = current_time + BUFFER_DELAY;
|
||||||
|
|
|
@ -82,7 +82,6 @@ void migrate_fd_connect(MigrationState *s);
|
||||||
ssize_t migrate_fd_put_buffer(MigrationState *s, const void *data,
|
ssize_t migrate_fd_put_buffer(MigrationState *s, const void *data,
|
||||||
size_t size);
|
size_t size);
|
||||||
void migrate_fd_put_ready(MigrationState *s);
|
void migrate_fd_put_ready(MigrationState *s);
|
||||||
int migrate_fd_wait_for_unfreeze(MigrationState *s);
|
|
||||||
int migrate_fd_close(MigrationState *s);
|
int migrate_fd_close(MigrationState *s);
|
||||||
|
|
||||||
void add_migration_state_change_notifier(Notifier *notify);
|
void add_migration_state_change_notifier(Notifier *notify);
|
||||||
|
|
23
migration.c
23
migration.c
|
@ -382,29 +382,6 @@ static void migrate_fd_cancel(MigrationState *s)
|
||||||
migrate_fd_cleanup(s);
|
migrate_fd_cleanup(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
int migrate_fd_wait_for_unfreeze(MigrationState *s)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
DPRINTF("wait for unfreeze\n");
|
|
||||||
if (s->state != MIG_STATE_ACTIVE)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
do {
|
|
||||||
fd_set wfds;
|
|
||||||
|
|
||||||
FD_ZERO(&wfds);
|
|
||||||
FD_SET(s->fd, &wfds);
|
|
||||||
|
|
||||||
ret = select(s->fd + 1, NULL, &wfds, NULL, NULL);
|
|
||||||
} while (ret == -1 && (s->get_error(s)) == EINTR);
|
|
||||||
|
|
||||||
if (ret == -1) {
|
|
||||||
return -s->get_error(s);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int migrate_fd_close(MigrationState *s)
|
int migrate_fd_close(MigrationState *s)
|
||||||
{
|
{
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
|
|
Loading…
Reference in New Issue