a7b9285033
Alias qemu-system-* man page to qemu.1 (bz #907746) Drop execute bit on service files (bz #963917) Conditionalize KSM service on host virt support (bz #963681) Split out KSM package, make it not pulled in by default
115 lines
3.7 KiB
Diff
115 lines
3.7 KiB
Diff
From 1b49e3073fada9243cb16e24aaa09e19a6675881 Mon Sep 17 00:00:00 2001
|
|
From: Juan Quintela <quintela@redhat.com>
|
|
Date: Fri, 22 Feb 2013 17:36:30 +0100
|
|
Subject: [PATCH] Rename buffered_ to migration_
|
|
|
|
This is consistent once that we have moved everything to migration.c
|
|
|
|
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
|
|
Reviewed-by: Juan Quintela <quintela@redhat.com>
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
(cherry picked from commit 5f496a1be3d15f192be1ab1fed3a3278fd5a91a1)
|
|
---
|
|
migration.c | 32 ++++++++++++++++----------------
|
|
1 file changed, 16 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/migration.c b/migration.c
|
|
index 62a7f8e..71c6c10 100644
|
|
--- a/migration.c
|
|
+++ b/migration.c
|
|
@@ -514,7 +514,7 @@ int64_t migrate_xbzrle_cache_size(void)
|
|
|
|
/* migration thread support */
|
|
|
|
-static int buffered_put_buffer(void *opaque, const uint8_t *buf,
|
|
+static int migration_put_buffer(void *opaque, const uint8_t *buf,
|
|
int64_t pos, int size)
|
|
{
|
|
MigrationState *s = opaque;
|
|
@@ -551,7 +551,7 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf,
|
|
return sent;
|
|
}
|
|
|
|
-static int buffered_close(void *opaque)
|
|
+static int migration_close(void *opaque)
|
|
{
|
|
MigrationState *s = opaque;
|
|
|
|
@@ -565,7 +565,7 @@ static int buffered_close(void *opaque)
|
|
return migrate_fd_close(s);
|
|
}
|
|
|
|
-static int buffered_get_fd(void *opaque)
|
|
+static int migration_get_fd(void *opaque)
|
|
{
|
|
MigrationState *s = opaque;
|
|
|
|
@@ -578,7 +578,7 @@ static int buffered_get_fd(void *opaque)
|
|
* 1: Time to stop
|
|
* negative: There has been an error
|
|
*/
|
|
-static int buffered_rate_limit(void *opaque)
|
|
+static int migration_rate_limit(void *opaque)
|
|
{
|
|
MigrationState *s = opaque;
|
|
int ret;
|
|
@@ -595,7 +595,7 @@ static int buffered_rate_limit(void *opaque)
|
|
return 0;
|
|
}
|
|
|
|
-static int64_t buffered_set_rate_limit(void *opaque, int64_t new_rate)
|
|
+static int64_t migration_set_rate_limit(void *opaque, int64_t new_rate)
|
|
{
|
|
MigrationState *s = opaque;
|
|
if (qemu_file_get_error(s->file)) {
|
|
@@ -611,14 +611,14 @@ out:
|
|
return s->xfer_limit;
|
|
}
|
|
|
|
-static int64_t buffered_get_rate_limit(void *opaque)
|
|
+static int64_t migration_get_rate_limit(void *opaque)
|
|
{
|
|
MigrationState *s = opaque;
|
|
|
|
return s->xfer_limit;
|
|
}
|
|
|
|
-static void *buffered_file_thread(void *opaque)
|
|
+static void *migration_thread(void *opaque)
|
|
{
|
|
MigrationState *s = opaque;
|
|
int64_t initial_time = qemu_get_clock_ms(rt_clock);
|
|
@@ -705,13 +705,13 @@ static void *buffered_file_thread(void *opaque)
|
|
return NULL;
|
|
}
|
|
|
|
-static const QEMUFileOps buffered_file_ops = {
|
|
- .get_fd = buffered_get_fd,
|
|
- .put_buffer = buffered_put_buffer,
|
|
- .close = buffered_close,
|
|
- .rate_limit = buffered_rate_limit,
|
|
- .get_rate_limit = buffered_get_rate_limit,
|
|
- .set_rate_limit = buffered_set_rate_limit,
|
|
+static const QEMUFileOps migration_file_ops = {
|
|
+ .get_fd = migration_get_fd,
|
|
+ .put_buffer = migration_put_buffer,
|
|
+ .close = migration_close,
|
|
+ .rate_limit = migration_rate_limit,
|
|
+ .get_rate_limit = migration_get_rate_limit,
|
|
+ .set_rate_limit = migration_set_rate_limit,
|
|
};
|
|
|
|
void migrate_fd_connect(MigrationState *s)
|
|
@@ -726,9 +726,9 @@ void migrate_fd_connect(MigrationState *s)
|
|
s->xfer_limit = s->bandwidth_limit / XFER_LIMIT_RATIO;
|
|
|
|
s->cleanup_bh = qemu_bh_new(migrate_fd_cleanup, s);
|
|
- s->file = qemu_fopen_ops(s, &buffered_file_ops);
|
|
+ s->file = qemu_fopen_ops(s, &migration_file_ops);
|
|
|
|
- qemu_thread_create(&s->thread, buffered_file_thread, s,
|
|
+ qemu_thread_create(&s->thread, migration_thread, s,
|
|
QEMU_THREAD_JOINABLE);
|
|
notifier_list_notify(&migration_state_notifiers, s);
|
|
}
|