* [Qemu-devel] [PATCH 0/2] Misc followup fixes for migration tls series
@ 2016-06-01 10:17 Daniel P. Berrange
2016-06-01 10:17 ` [Qemu-devel] [PATCH 1/2] migration: fix typos in qapi-schema from latest migration additions Daniel P. Berrange
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Daniel P. Berrange @ 2016-06-01 10:17 UTC (permalink / raw)
To: qemu-devel; +Cc: Amit Shah, Juan Quintela, Eric Blake, Daniel P. Berrange
This small series addresses the few comments made about the
migration tls series after it was merged.
Daniel P. Berrange (2):
migration: fix typos in qapi-schema from latest migration additions
migration: rename functions to starting migrations
include/migration/migration.h | 26 +++++++++++++-------------
migration/exec.c | 4 ++--
migration/fd.c | 4 ++--
migration/migration.c | 18 +++++++++---------
migration/rdma.c | 4 ++--
migration/socket.c | 6 +++---
migration/tls.c | 18 +++++++++---------
qapi-schema.json | 10 +++++-----
8 files changed, 45 insertions(+), 45 deletions(-)
--
2.5.5
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH 1/2] migration: fix typos in qapi-schema from latest migration additions
2016-06-01 10:17 [Qemu-devel] [PATCH 0/2] Misc followup fixes for migration tls series Daniel P. Berrange
@ 2016-06-01 10:17 ` Daniel P. Berrange
2016-06-01 10:17 ` [Qemu-devel] [PATCH 2/2] migration: rename functions to starting migrations Daniel P. Berrange
2016-06-01 14:37 ` [Qemu-devel] [PATCH 0/2] Misc followup fixes for migration tls series Eric Blake
2 siblings, 0 replies; 4+ messages in thread
From: Daniel P. Berrange @ 2016-06-01 10:17 UTC (permalink / raw)
To: qemu-devel; +Cc: Amit Shah, Juan Quintela, Eric Blake, Daniel P. Berrange
Recent migration QAPI enhancements had a few spelling mistakes
and also incorrect version number in a few places.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
qapi-schema.json | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/qapi-schema.json b/qapi-schema.json
index 8483bdf..5c7b87c 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -486,7 +486,7 @@
#
# @error-desc: #optional the human readable error description string, when
# @status is 'failed'. Clients should not attempt to parse the
-# error strings. (Since 2.6)
+# error strings. (Since 2.7)
#
# Since: 0.14.0
##
@@ -631,7 +631,7 @@
# migration URI does not already include a hostname. For
# example if using fd: or exec: based migration, the
# hostname must be provided so that the server's x509
-# certificate identity canbe validated. (Since 2.7)
+# certificate identity can be validated. (Since 2.7)
#
# Since: 2.4
##
@@ -672,7 +672,7 @@
# migration URI does not already include a hostname. For
# example if using fd: or exec: based migration, the
# hostname must be provided so that the server's x509
-# certificate identity canbe validated. (Since 2.7)
+# certificate identity can be validated. (Since 2.7)
#
# Since: 2.4
##
@@ -708,14 +708,14 @@
# be for a 'client' endpoint, while for the incoming side the
# credentials must be for a 'server' endpoint. Setting this
# will enable TLS for all migrations. The default is unset,
-# resulting in unsecured migration at the QEMU level. (Since 2.6)
+# resulting in unsecured migration at the QEMU level. (Since 2.7)
#
# @tls-hostname: hostname of the target host for the migration. This is
# required when using x509 based TLS credentials and the
# migration URI does not already include a hostname. For
# example if using fd: or exec: based migration, the
# hostname must be provided so that the server's x509
-# certificate identity canbe validated. (Since 2.6)
+# certificate identity can be validated. (Since 2.7)
#
# Since: 2.4
##
--
2.5.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH 2/2] migration: rename functions to starting migrations
2016-06-01 10:17 [Qemu-devel] [PATCH 0/2] Misc followup fixes for migration tls series Daniel P. Berrange
2016-06-01 10:17 ` [Qemu-devel] [PATCH 1/2] migration: fix typos in qapi-schema from latest migration additions Daniel P. Berrange
@ 2016-06-01 10:17 ` Daniel P. Berrange
2016-06-01 14:37 ` [Qemu-devel] [PATCH 0/2] Misc followup fixes for migration tls series Eric Blake
2 siblings, 0 replies; 4+ messages in thread
From: Daniel P. Berrange @ 2016-06-01 10:17 UTC (permalink / raw)
To: qemu-devel; +Cc: Amit Shah, Juan Quintela, Eric Blake, Daniel P. Berrange
Apply the following renames for starting incoming migration:
process_incoming_migration -> migration_fd_process_incoming
migration_set_incoming_channel -> migration_channel_process_incoming
migration_tls_set_incoming_channel -> migration_tls_channel_process_incoming
and for starting outgoing migration:
migration_set_outgoing_channel -> migration_channel_connect
migration_tls_set_outgoing_channel -> migration_tls_channel_connect
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
include/migration/migration.h | 26 +++++++++++++-------------
migration/exec.c | 4 ++--
migration/fd.c | 4 ++--
migration/migration.c | 18 +++++++++---------
migration/rdma.c | 4 ++--
migration/socket.c | 6 +++---
migration/tls.c | 18 +++++++++---------
7 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/include/migration/migration.h b/include/migration/migration.h
index 13b12b7..8aa9860 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -181,25 +181,25 @@ struct MigrationState
void migrate_set_state(int *state, int old_state, int new_state);
-void process_incoming_migration(QEMUFile *f);
+void migration_fd_process_incoming(QEMUFile *f);
void qemu_start_incoming_migration(const char *uri, Error **errp);
-void migration_set_incoming_channel(MigrationState *s,
- QIOChannel *ioc);
+void migration_channel_process_incoming(MigrationState *s,
+ QIOChannel *ioc);
-void migration_tls_set_incoming_channel(MigrationState *s,
- QIOChannel *ioc,
- Error **errp);
+void migration_tls_channel_process_incoming(MigrationState *s,
+ QIOChannel *ioc,
+ Error **errp);
-void migration_set_outgoing_channel(MigrationState *s,
- QIOChannel *ioc,
- const char *hostname);
+void migration_channel_connect(MigrationState *s,
+ QIOChannel *ioc,
+ const char *hostname);
-void migration_tls_set_outgoing_channel(MigrationState *s,
- QIOChannel *ioc,
- const char *hostname,
- Error **errp);
+void migration_tls_channel_connect(MigrationState *s,
+ QIOChannel *ioc,
+ const char *hostname,
+ Error **errp);
uint64_t migrate_max_downtime(void);
diff --git a/migration/exec.c b/migration/exec.c
index 1515cc3..2af63cc 100644
--- a/migration/exec.c
+++ b/migration/exec.c
@@ -38,7 +38,7 @@ void exec_start_outgoing_migration(MigrationState *s, const char *command, Error
return;
}
- migration_set_outgoing_channel(s, ioc, NULL);
+ migration_channel_connect(s, ioc, NULL);
object_unref(OBJECT(ioc));
}
@@ -46,7 +46,7 @@ static gboolean exec_accept_incoming_migration(QIOChannel *ioc,
GIOCondition condition,
gpointer opaque)
{
- migration_set_incoming_channel(migrate_get_current(), ioc);
+ migration_channel_process_incoming(migrate_get_current(), ioc);
object_unref(OBJECT(ioc));
return FALSE; /* unregister */
}
diff --git a/migration/fd.c b/migration/fd.c
index fc5c9ee..84a10fd 100644
--- a/migration/fd.c
+++ b/migration/fd.c
@@ -38,7 +38,7 @@ void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **
return;
}
- migration_set_outgoing_channel(s, ioc, NULL);
+ migration_channel_connect(s, ioc, NULL);
object_unref(OBJECT(ioc));
}
@@ -46,7 +46,7 @@ static gboolean fd_accept_incoming_migration(QIOChannel *ioc,
GIOCondition condition,
gpointer opaque)
{
- migration_set_incoming_channel(migrate_get_current(), ioc);
+ migration_channel_process_incoming(migrate_get_current(), ioc);
object_unref(OBJECT(ioc));
return FALSE; /* unregister */
}
diff --git a/migration/migration.c b/migration/migration.c
index 7ecbade..af6db26 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -416,7 +416,7 @@ static void process_incoming_migration_co(void *opaque)
qemu_bh_schedule(mis->bh);
}
-void process_incoming_migration(QEMUFile *f)
+void migration_fd_process_incoming(QEMUFile *f)
{
Coroutine *co = qemu_coroutine_create(process_incoming_migration_co);
@@ -426,8 +426,8 @@ void process_incoming_migration(QEMUFile *f)
}
-void migration_set_incoming_channel(MigrationState *s,
- QIOChannel *ioc)
+void migration_channel_process_incoming(MigrationState *s,
+ QIOChannel *ioc)
{
trace_migration_set_incoming_channel(
ioc, object_get_typename(OBJECT(ioc)));
@@ -436,20 +436,20 @@ void migration_set_incoming_channel(MigrationState *s,
!object_dynamic_cast(OBJECT(ioc),
TYPE_QIO_CHANNEL_TLS)) {
Error *local_err = NULL;
- migration_tls_set_incoming_channel(s, ioc, &local_err);
+ migration_tls_channel_process_incoming(s, ioc, &local_err);
if (local_err) {
error_report_err(local_err);
}
} else {
QEMUFile *f = qemu_fopen_channel_input(ioc);
- process_incoming_migration(f);
+ migration_fd_process_incoming(f);
}
}
-void migration_set_outgoing_channel(MigrationState *s,
- QIOChannel *ioc,
- const char *hostname)
+void migration_channel_connect(MigrationState *s,
+ QIOChannel *ioc,
+ const char *hostname)
{
trace_migration_set_outgoing_channel(
ioc, object_get_typename(OBJECT(ioc)), hostname);
@@ -458,7 +458,7 @@ void migration_set_outgoing_channel(MigrationState *s,
!object_dynamic_cast(OBJECT(ioc),
TYPE_QIO_CHANNEL_TLS)) {
Error *local_err = NULL;
- migration_tls_set_outgoing_channel(s, ioc, hostname, &local_err);
+ migration_tls_channel_connect(s, ioc, hostname, &local_err);
if (local_err) {
migrate_fd_error(s, local_err);
error_free(local_err);
diff --git a/migration/rdma.c b/migration/rdma.c
index 51bafc7..5110ec8 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -1511,7 +1511,7 @@ static int qemu_rdma_block_for_wrid(RDMAContext *rdma, int wrid_requested,
while (1) {
/*
- * Coroutine doesn't start until process_incoming_migration()
+ * Coroutine doesn't start until migration_fd_process_incoming()
* so don't yield unless we know we're running inside of a coroutine.
*/
if (rdma->migration_started_on_destination) {
@@ -3620,7 +3620,7 @@ static void rdma_accept_incoming_migration(void *opaque)
}
rdma->migration_started_on_destination = 1;
- process_incoming_migration(f);
+ migration_fd_process_incoming(f);
}
void rdma_start_incoming_migration(const char *host_port, Error **errp)
diff --git a/migration/socket.c b/migration/socket.c
index 977a8d3..5c0a38f 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -83,7 +83,7 @@ static void socket_outgoing_migration(Object *src,
migrate_fd_error(data->s, err);
} else {
trace_migration_socket_outgoing_connected(data->hostname);
- migration_set_outgoing_channel(data->s, sioc, data->hostname);
+ migration_channel_connect(data->s, sioc, data->hostname);
}
object_unref(src);
}
@@ -140,8 +140,8 @@ static gboolean socket_accept_incoming_migration(QIOChannel *ioc,
trace_migration_socket_incoming_accepted();
- migration_set_incoming_channel(migrate_get_current(),
- QIO_CHANNEL(sioc));
+ migration_channel_process_incoming(migrate_get_current(),
+ QIO_CHANNEL(sioc));
object_unref(OBJECT(sioc));
out:
diff --git a/migration/tls.c b/migration/tls.c
index 75f959f..12c053d 100644
--- a/migration/tls.c
+++ b/migration/tls.c
@@ -72,14 +72,14 @@ static void migration_tls_incoming_handshake(Object *src,
error_report("%s", error_get_pretty(err));
} else {
trace_migration_tls_incoming_handshake_complete();
- migration_set_incoming_channel(migrate_get_current(), ioc);
+ migration_channel_process_incoming(migrate_get_current(), ioc);
}
object_unref(OBJECT(ioc));
}
-void migration_tls_set_incoming_channel(MigrationState *s,
- QIOChannel *ioc,
- Error **errp)
+void migration_tls_channel_process_incoming(MigrationState *s,
+ QIOChannel *ioc,
+ Error **errp)
{
QCryptoTLSCreds *creds;
QIOChannelTLS *tioc;
@@ -119,16 +119,16 @@ static void migration_tls_outgoing_handshake(Object *src,
migrate_fd_error(s, err);
} else {
trace_migration_tls_outgoing_handshake_complete();
- migration_set_outgoing_channel(s, ioc, NULL);
+ migration_channel_connect(s, ioc, NULL);
}
object_unref(OBJECT(ioc));
}
-void migration_tls_set_outgoing_channel(MigrationState *s,
- QIOChannel *ioc,
- const char *hostname,
- Error **errp)
+void migration_tls_channel_connect(MigrationState *s,
+ QIOChannel *ioc,
+ const char *hostname,
+ Error **errp)
{
QCryptoTLSCreds *creds;
QIOChannelTLS *tioc;
--
2.5.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH 0/2] Misc followup fixes for migration tls series
2016-06-01 10:17 [Qemu-devel] [PATCH 0/2] Misc followup fixes for migration tls series Daniel P. Berrange
2016-06-01 10:17 ` [Qemu-devel] [PATCH 1/2] migration: fix typos in qapi-schema from latest migration additions Daniel P. Berrange
2016-06-01 10:17 ` [Qemu-devel] [PATCH 2/2] migration: rename functions to starting migrations Daniel P. Berrange
@ 2016-06-01 14:37 ` Eric Blake
2 siblings, 0 replies; 4+ messages in thread
From: Eric Blake @ 2016-06-01 14:37 UTC (permalink / raw)
To: Daniel P. Berrange, qemu-devel; +Cc: Amit Shah, Juan Quintela
[-- Attachment #1: Type: text/plain, Size: 952 bytes --]
On 06/01/2016 04:17 AM, Daniel P. Berrange wrote:
> This small series addresses the few comments made about the
> migration tls series after it was merged.
>
> Daniel P. Berrange (2):
> migration: fix typos in qapi-schema from latest migration additions
> migration: rename functions to starting migrations
>
Reviewed-by: Eric Blake <eblake@redhat.com>
> include/migration/migration.h | 26 +++++++++++++-------------
> migration/exec.c | 4 ++--
> migration/fd.c | 4 ++--
> migration/migration.c | 18 +++++++++---------
> migration/rdma.c | 4 ++--
> migration/socket.c | 6 +++---
> migration/tls.c | 18 +++++++++---------
> qapi-schema.json | 10 +++++-----
> 8 files changed, 45 insertions(+), 45 deletions(-)
>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-06-01 14:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-01 10:17 [Qemu-devel] [PATCH 0/2] Misc followup fixes for migration tls series Daniel P. Berrange
2016-06-01 10:17 ` [Qemu-devel] [PATCH 1/2] migration: fix typos in qapi-schema from latest migration additions Daniel P. Berrange
2016-06-01 10:17 ` [Qemu-devel] [PATCH 2/2] migration: rename functions to starting migrations Daniel P. Berrange
2016-06-01 14:37 ` [Qemu-devel] [PATCH 0/2] Misc followup fixes for migration tls series Eric Blake
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.