From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: Markus Armbruster <armbru@redhat.com>,
Laurent Vivier <lvivier@redhat.com>,
Juan Quintela <quintela@redhat.com>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
peterx@redhat.com
Subject: [Qemu-devel] [PATCH v2 2/6] migration: let MigrationState be a qdev
Date: Fri, 9 Jun 2017 11:48:58 +0800 [thread overview]
Message-ID: <1496980142-8986-3-git-send-email-peterx@redhat.com> (raw)
In-Reply-To: <1496980142-8986-1-git-send-email-peterx@redhat.com>
Let the old man "MigrationState" join the object family. Direct benefit
is that we can start to use all the property features derived from
current QDev, like: HW_COMPAT_* bits, command line setup for migration
parameters (so will never need to set them up each time using HMP/QMP,
this is really, really attractive for test writters), etc.
I see no reason to disallow this happen yet. So let's start from this
one, to see whether it would be anything good.
No functional change at all.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
include/migration/migration.h | 19 ++++++++++++++
migration/migration.c | 61 ++++++++++++++++++++++++++++---------------
2 files changed, 59 insertions(+), 21 deletions(-)
diff --git a/include/migration/migration.h b/include/migration/migration.h
index 79b5484..bd0186c 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -21,6 +21,7 @@
#include "qapi-types.h"
#include "exec/cpu-common.h"
#include "qemu/coroutine_int.h"
+#include "hw/qdev.h"
#define QEMU_VM_FILE_MAGIC 0x5145564d
#define QEMU_VM_FILE_VERSION_COMPAT 0x00000002
@@ -49,6 +50,8 @@ enum mig_rp_message_type {
MIG_RP_MSG_MAX
};
+#define TYPE_MIGRATION "migration"
+
/* State for the incoming migration */
struct MigrationIncomingState {
QEMUFile *from_src_file;
@@ -91,8 +94,24 @@ struct MigrationIncomingState {
MigrationIncomingState *migration_incoming_get_current(void);
void migration_incoming_state_destroy(void);
+#define MIGRATION_CLASS(klass) \
+ OBJECT_CLASS_CHECK(MigrationClass, (klass), TYPE_MIGRATION)
+#define MIGRATION_OBJ(obj) \
+ OBJECT_CHECK(MigrationState, (obj), TYPE_MIGRATION)
+#define MIGRATION_GET_CLASS(obj) \
+ OBJECT_GET_CLASS(MigrationClass, (obj), TYPE_MIGRATION)
+
+typedef struct MigrationClass {
+ /*< private >*/
+ DeviceClass parent_class;
+} MigrationClass;
+
struct MigrationState
{
+ /*< private >*/
+ DeviceState parent_obj;
+
+ /*< public >*/
size_t bytes_xfer;
size_t xfer_limit;
QemuThread thread;
diff --git a/migration/migration.c b/migration/migration.c
index 48c94c9..98b77e2 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -93,29 +93,13 @@ static bool deferred_incoming;
/* For outgoing */
MigrationState *migrate_get_current(void)
{
- static bool once;
- static MigrationState current_migration = {
- .state = MIGRATION_STATUS_NONE,
- .xbzrle_cache_size = DEFAULT_MIGRATE_CACHE_SIZE,
- .mbps = -1,
- .parameters = {
- .compress_level = DEFAULT_MIGRATE_COMPRESS_LEVEL,
- .compress_threads = DEFAULT_MIGRATE_COMPRESS_THREAD_COUNT,
- .decompress_threads = DEFAULT_MIGRATE_DECOMPRESS_THREAD_COUNT,
- .cpu_throttle_initial = DEFAULT_MIGRATE_CPU_THROTTLE_INITIAL,
- .cpu_throttle_increment = DEFAULT_MIGRATE_CPU_THROTTLE_INCREMENT,
- .max_bandwidth = MAX_THROTTLE,
- .downtime_limit = DEFAULT_MIGRATE_SET_DOWNTIME,
- .x_checkpoint_delay = DEFAULT_MIGRATE_X_CHECKPOINT_DELAY,
- },
- };
+ static MigrationState *current_migration;
- if (!once) {
- current_migration.parameters.tls_creds = g_strdup("");
- current_migration.parameters.tls_hostname = g_strdup("");
- once = true;
+ if (!current_migration) {
+ current_migration = MIGRATION_OBJ(object_new(TYPE_MIGRATION));
}
- return ¤t_migration;
+
+ return current_migration;
}
MigrationIncomingState *migration_incoming_get_current(void)
@@ -2123,3 +2107,38 @@ void migrate_fd_connect(MigrationState *s)
s->migration_thread_running = true;
}
+static void migration_instance_init(Object *obj)
+{
+ MigrationState *ms = MIGRATION_OBJ(obj);
+
+ ms->state = MIGRATION_STATUS_NONE;
+ ms->xbzrle_cache_size = DEFAULT_MIGRATE_CACHE_SIZE;
+ ms->mbps = -1;
+ ms->parameters = (MigrationParameters) {
+ .compress_level = DEFAULT_MIGRATE_COMPRESS_LEVEL,
+ .compress_threads = DEFAULT_MIGRATE_COMPRESS_THREAD_COUNT,
+ .decompress_threads = DEFAULT_MIGRATE_DECOMPRESS_THREAD_COUNT,
+ .cpu_throttle_initial = DEFAULT_MIGRATE_CPU_THROTTLE_INITIAL,
+ .cpu_throttle_increment = DEFAULT_MIGRATE_CPU_THROTTLE_INCREMENT,
+ .max_bandwidth = MAX_THROTTLE,
+ .downtime_limit = DEFAULT_MIGRATE_SET_DOWNTIME,
+ .x_checkpoint_delay = DEFAULT_MIGRATE_X_CHECKPOINT_DELAY,
+ };
+ ms->parameters.tls_creds = g_strdup("");
+ ms->parameters.tls_hostname = g_strdup("");
+}
+
+static const TypeInfo migration_type = {
+ .name = TYPE_MIGRATION,
+ .parent = TYPE_DEVICE,
+ .class_size = sizeof(MigrationClass),
+ .instance_size = sizeof(MigrationState),
+ .instance_init = migration_instance_init,
+};
+
+static void register_migration_types(void)
+{
+ type_register_static(&migration_type);
+}
+
+type_init(register_migration_types);
--
2.7.4
next prev parent reply other threads:[~2017-06-09 3:49 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-09 3:48 [Qemu-devel] [PATCH v2 0/6] migration: objectify MigrationState Peter Xu
2017-06-09 3:48 ` [Qemu-devel] [PATCH v2 1/6] machine: export register_compat_prop() Peter Xu
2017-06-09 7:41 ` Juan Quintela
2017-06-09 3:48 ` Peter Xu [this message]
2017-06-09 7:42 ` [Qemu-devel] [PATCH v2 2/6] migration: let MigrationState be a qdev Juan Quintela
2017-06-09 13:39 ` Markus Armbruster
2017-06-12 4:46 ` Peter Xu
2017-06-12 16:13 ` Eduardo Habkost
2017-06-13 3:52 ` Peter Xu
2017-06-13 11:27 ` Eduardo Habkost
2017-06-19 9:09 ` Markus Armbruster
2017-06-21 9:28 ` Peter Xu
2017-06-09 3:48 ` [Qemu-devel] [PATCH v2 3/6] migration: move global_state.optional out Peter Xu
2017-06-09 7:43 ` Juan Quintela
2017-06-09 13:40 ` Eduardo Habkost
2017-06-09 17:33 ` Juan Quintela
2017-06-12 8:18 ` Peter Xu
2017-06-13 3:41 ` Peter Xu
2017-06-13 11:16 ` Eduardo Habkost
2017-06-14 2:52 ` Peter Xu
2017-06-16 7:58 ` Peter Xu
2017-06-16 14:34 ` Eduardo Habkost
2017-06-19 6:31 ` Peter Xu
2017-06-09 3:49 ` [Qemu-devel] [PATCH v2 4/6] migration: move only_migratable to MigrationState Peter Xu
2017-06-09 7:43 ` Juan Quintela
2017-06-09 3:49 ` [Qemu-devel] [PATCH v2 5/6] migration: move skip_configuration out Peter Xu
2017-06-09 7:45 ` Juan Quintela
2017-06-09 3:49 ` [Qemu-devel] [PATCH v2 6/6] migration: move skip_section_footers Peter Xu
2017-06-09 7:47 ` Juan Quintela
2017-06-09 8:39 ` Peter Xu
2017-06-09 10:47 ` Eric Blake
2017-06-12 4:37 ` Peter Xu
2017-06-09 7:48 ` [Qemu-devel] [PATCH v2 0/6] migration: objectify MigrationState Juan Quintela
2017-06-09 8:40 ` Peter Xu
2017-06-09 14:02 ` Markus Armbruster
2017-06-09 17:30 ` Juan Quintela
2017-06-12 7:24 ` Peter Xu
2017-06-19 8:58 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1496980142-8986-3-git-send-email-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=lvivier@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).