[Qemu-devel] [PATCH 20/41] buffered_file: unfold migrate_fd_put_ready
We only use it once, just remove the callback indirection.
Signed-off-by: Juan Quintela quint...@redhat.com
Reviewed-by: Paolo Bonzini pbonz...@redhat.com
---
buffered_file.c | 5 +
buffered_file.h | 2 --
migration.c | 4 +---
migration.h | 1 +
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/buffered_file.c b/buffered_file.c
index 702a726..4c6a797 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -23,7 +23,6 @@
typedef struct QEMUFileBuffered
{
-BufferedPutReadyFunc *put_ready;
BufferedWaitForUnfreezeFunc *wait_for_unfreeze;
BufferedCloseFunc *close;
MigrationState *migration_state;
@@ -128,7 +127,7 @@ static int buffered_put_buffer(void *opaque, const uint8_t
*buf, int64_t pos, in
DPRINTF(file is ready\n);
if (!s-freeze_output s-bytes_xfer s-xfer_limit) {
DPRINTF(notifying client\n);
-s-put_ready(s-migration_state);
+migrate_fd_put_ready(s-migration_state);
}
}
@@ -227,7 +226,6 @@ static void buffered_rate_tick(void *opaque)
QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
size_t bytes_per_sec,
- BufferedPutReadyFunc *put_ready,
BufferedWaitForUnfreezeFunc
*wait_for_unfreeze,
BufferedCloseFunc *close)
{
@@ -237,7 +235,6 @@ QEMUFile *qemu_fopen_ops_buffered(MigrationState
*migration_state,
s-migration_state = migration_state;
s-xfer_limit = bytes_per_sec / 10;
-s-put_ready = put_ready;
s-wait_for_unfreeze = wait_for_unfreeze;
s-close = close;
diff --git a/buffered_file.h b/buffered_file.h
index ca7e62d..dd239b3 100644
--- a/buffered_file.h
+++ b/buffered_file.h
@@ -17,13 +17,11 @@
#include hw/hw.h
#include migration.h
-typedef void (BufferedPutReadyFunc)(void *opaque);
typedef void (BufferedWaitForUnfreezeFunc)(void *opaque);
typedef int (BufferedCloseFunc)(void *opaque);
QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
size_t xfer_limit,
- BufferedPutReadyFunc *put_ready,
BufferedWaitForUnfreezeFunc
*wait_for_unfreeze,
BufferedCloseFunc *close);
diff --git a/migration.c b/migration.c
index f6ee7cd..051b1b5 100644
--- a/migration.c
+++ b/migration.c
@@ -318,9 +318,8 @@ ssize_t migrate_fd_put_buffer(MigrationState *s, const void
*data,
return ret;
}
-static void migrate_fd_put_ready(void *opaque)
+void migrate_fd_put_ready(MigrationState *s)
{
-MigrationState *s = opaque;
int ret;
if (s-state != MIG_STATE_ACTIVE) {
@@ -435,7 +434,6 @@ void migrate_fd_connect(MigrationState *s)
s-state = MIG_STATE_ACTIVE;
s-file = qemu_fopen_ops_buffered(s,
s-bandwidth_limit,
- migrate_fd_put_ready,
migrate_fd_wait_for_unfreeze,
migrate_fd_close);
diff --git a/migration.h b/migration.h
index 02d0219..031c2ab 100644
--- a/migration.h
+++ b/migration.h
@@ -80,6 +80,7 @@ void migrate_fd_connect(MigrationState *s);
ssize_t migrate_fd_put_buffer(MigrationState *s, const void *data,
size_t size);
+void migrate_fd_put_ready(MigrationState *s);
void add_migration_state_change_notifier(Notifier *notify);
void remove_migration_state_change_notifier(Notifier *notify);
--
1.7.11.4
[Qemu-devel] [PATCH 20/41] buffered_file: unfold migrate_fd_put_ready
We only use it once, just remove the callback indirection.
Signed-off-by: Juan Quintela quint...@redhat.com
---
buffered_file.c | 5 +
buffered_file.h | 2 --
migration.c | 4 +---
migration.h | 1 +
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/buffered_file.c b/buffered_file.c
index 702a726..4c6a797 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -23,7 +23,6 @@
typedef struct QEMUFileBuffered
{
-BufferedPutReadyFunc *put_ready;
BufferedWaitForUnfreezeFunc *wait_for_unfreeze;
BufferedCloseFunc *close;
MigrationState *migration_state;
@@ -128,7 +127,7 @@ static int buffered_put_buffer(void *opaque, const uint8_t
*buf, int64_t pos, in
DPRINTF(file is ready\n);
if (!s-freeze_output s-bytes_xfer s-xfer_limit) {
DPRINTF(notifying client\n);
-s-put_ready(s-migration_state);
+migrate_fd_put_ready(s-migration_state);
}
}
@@ -227,7 +226,6 @@ static void buffered_rate_tick(void *opaque)
QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
size_t bytes_per_sec,
- BufferedPutReadyFunc *put_ready,
BufferedWaitForUnfreezeFunc
*wait_for_unfreeze,
BufferedCloseFunc *close)
{
@@ -237,7 +235,6 @@ QEMUFile *qemu_fopen_ops_buffered(MigrationState
*migration_state,
s-migration_state = migration_state;
s-xfer_limit = bytes_per_sec / 10;
-s-put_ready = put_ready;
s-wait_for_unfreeze = wait_for_unfreeze;
s-close = close;
diff --git a/buffered_file.h b/buffered_file.h
index ca7e62d..dd239b3 100644
--- a/buffered_file.h
+++ b/buffered_file.h
@@ -17,13 +17,11 @@
#include hw/hw.h
#include migration.h
-typedef void (BufferedPutReadyFunc)(void *opaque);
typedef void (BufferedWaitForUnfreezeFunc)(void *opaque);
typedef int (BufferedCloseFunc)(void *opaque);
QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
size_t xfer_limit,
- BufferedPutReadyFunc *put_ready,
BufferedWaitForUnfreezeFunc
*wait_for_unfreeze,
BufferedCloseFunc *close);
diff --git a/migration.c b/migration.c
index a958f4f..d0d1014 100644
--- a/migration.c
+++ b/migration.c
@@ -316,9 +316,8 @@ ssize_t migrate_fd_put_buffer(MigrationState *s, const void
*data,
return ret;
}
-static void migrate_fd_put_ready(void *opaque)
+void migrate_fd_put_ready(MigrationState *s)
{
-MigrationState *s = opaque;
int ret;
if (s-state != MIG_STATE_ACTIVE) {
@@ -433,7 +432,6 @@ void migrate_fd_connect(MigrationState *s)
s-state = MIG_STATE_ACTIVE;
s-file = qemu_fopen_ops_buffered(s,
s-bandwidth_limit,
- migrate_fd_put_ready,
migrate_fd_wait_for_unfreeze,
migrate_fd_close);
diff --git a/migration.h b/migration.h
index 02d0219..031c2ab 100644
--- a/migration.h
+++ b/migration.h
@@ -80,6 +80,7 @@ void migrate_fd_connect(MigrationState *s);
ssize_t migrate_fd_put_buffer(MigrationState *s, const void *data,
size_t size);
+void migrate_fd_put_ready(MigrationState *s);
void add_migration_state_change_notifier(Notifier *notify);
void remove_migration_state_change_notifier(Notifier *notify);
--
1.7.11.4
