mirror of https://gitee.com/openkylin/qemu.git
buffered_file: unfold migrate_fd_put_buffer
We only used it once, just remove the callback indirection Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
c7a8f0cdd2
commit
c87b015bc7
|
@ -23,7 +23,6 @@
|
||||||
|
|
||||||
typedef struct QEMUFileBuffered
|
typedef struct QEMUFileBuffered
|
||||||
{
|
{
|
||||||
BufferedPutFunc *put_buffer;
|
|
||||||
BufferedPutReadyFunc *put_ready;
|
BufferedPutReadyFunc *put_ready;
|
||||||
BufferedWaitForUnfreezeFunc *wait_for_unfreeze;
|
BufferedWaitForUnfreezeFunc *wait_for_unfreeze;
|
||||||
BufferedCloseFunc *close;
|
BufferedCloseFunc *close;
|
||||||
|
@ -78,8 +77,8 @@ static void buffered_flush(QEMUFileBuffered *s)
|
||||||
while (s->bytes_xfer < s->xfer_limit && offset < s->buffer_size) {
|
while (s->bytes_xfer < s->xfer_limit && offset < s->buffer_size) {
|
||||||
ssize_t ret;
|
ssize_t ret;
|
||||||
|
|
||||||
ret = s->put_buffer(s->migration_state, s->buffer + offset,
|
ret = migrate_fd_put_buffer(s->migration_state, s->buffer + offset,
|
||||||
s->buffer_size - offset);
|
s->buffer_size - offset);
|
||||||
if (ret == -EAGAIN) {
|
if (ret == -EAGAIN) {
|
||||||
DPRINTF("backend not ready, freezing\n");
|
DPRINTF("backend not ready, freezing\n");
|
||||||
s->freeze_output = 1;
|
s->freeze_output = 1;
|
||||||
|
@ -228,7 +227,6 @@ static void buffered_rate_tick(void *opaque)
|
||||||
|
|
||||||
QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
|
QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
|
||||||
size_t bytes_per_sec,
|
size_t bytes_per_sec,
|
||||||
BufferedPutFunc *put_buffer,
|
|
||||||
BufferedPutReadyFunc *put_ready,
|
BufferedPutReadyFunc *put_ready,
|
||||||
BufferedWaitForUnfreezeFunc *wait_for_unfreeze,
|
BufferedWaitForUnfreezeFunc *wait_for_unfreeze,
|
||||||
BufferedCloseFunc *close)
|
BufferedCloseFunc *close)
|
||||||
|
@ -239,7 +237,6 @@ QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
|
||||||
|
|
||||||
s->migration_state = migration_state;
|
s->migration_state = migration_state;
|
||||||
s->xfer_limit = bytes_per_sec / 10;
|
s->xfer_limit = bytes_per_sec / 10;
|
||||||
s->put_buffer = put_buffer;
|
|
||||||
s->put_ready = put_ready;
|
s->put_ready = put_ready;
|
||||||
s->wait_for_unfreeze = wait_for_unfreeze;
|
s->wait_for_unfreeze = wait_for_unfreeze;
|
||||||
s->close = close;
|
s->close = close;
|
||||||
|
|
|
@ -17,14 +17,12 @@
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
#include "migration.h"
|
#include "migration.h"
|
||||||
|
|
||||||
typedef ssize_t (BufferedPutFunc)(void *opaque, const void *data, size_t size);
|
|
||||||
typedef void (BufferedPutReadyFunc)(void *opaque);
|
typedef void (BufferedPutReadyFunc)(void *opaque);
|
||||||
typedef void (BufferedWaitForUnfreezeFunc)(void *opaque);
|
typedef void (BufferedWaitForUnfreezeFunc)(void *opaque);
|
||||||
typedef int (BufferedCloseFunc)(void *opaque);
|
typedef int (BufferedCloseFunc)(void *opaque);
|
||||||
|
|
||||||
QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
|
QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
|
||||||
size_t xfer_limit,
|
size_t xfer_limit,
|
||||||
BufferedPutFunc *put_buffer,
|
|
||||||
BufferedPutReadyFunc *put_ready,
|
BufferedPutReadyFunc *put_ready,
|
||||||
BufferedWaitForUnfreezeFunc *wait_for_unfreeze,
|
BufferedWaitForUnfreezeFunc *wait_for_unfreeze,
|
||||||
BufferedCloseFunc *close);
|
BufferedCloseFunc *close);
|
||||||
|
|
|
@ -295,10 +295,9 @@ static void migrate_fd_put_notify(void *opaque)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static ssize_t migrate_fd_put_buffer(void *opaque, const void *data,
|
ssize_t migrate_fd_put_buffer(MigrationState *s, const void *data,
|
||||||
size_t size)
|
size_t size)
|
||||||
{
|
{
|
||||||
MigrationState *s = opaque;
|
|
||||||
ssize_t ret;
|
ssize_t ret;
|
||||||
|
|
||||||
if (s->state != MIG_STATE_ACTIVE) {
|
if (s->state != MIG_STATE_ACTIVE) {
|
||||||
|
@ -436,7 +435,6 @@ void migrate_fd_connect(MigrationState *s)
|
||||||
s->state = MIG_STATE_ACTIVE;
|
s->state = MIG_STATE_ACTIVE;
|
||||||
s->file = qemu_fopen_ops_buffered(s,
|
s->file = qemu_fopen_ops_buffered(s,
|
||||||
s->bandwidth_limit,
|
s->bandwidth_limit,
|
||||||
migrate_fd_put_buffer,
|
|
||||||
migrate_fd_put_ready,
|
migrate_fd_put_ready,
|
||||||
migrate_fd_wait_for_unfreeze,
|
migrate_fd_wait_for_unfreeze,
|
||||||
migrate_fd_close);
|
migrate_fd_close);
|
||||||
|
|
|
@ -78,6 +78,9 @@ void migrate_fd_error(MigrationState *s);
|
||||||
|
|
||||||
void migrate_fd_connect(MigrationState *s);
|
void migrate_fd_connect(MigrationState *s);
|
||||||
|
|
||||||
|
ssize_t migrate_fd_put_buffer(MigrationState *s, const void *data,
|
||||||
|
size_t size);
|
||||||
|
|
||||||
void add_migration_state_change_notifier(Notifier *notify);
|
void add_migration_state_change_notifier(Notifier *notify);
|
||||||
void remove_migration_state_change_notifier(Notifier *notify);
|
void remove_migration_state_change_notifier(Notifier *notify);
|
||||||
bool migration_is_active(MigrationState *);
|
bool migration_is_active(MigrationState *);
|
||||||
|
|
Loading…
Reference in New Issue