| Message ID | 20170531103509.22021-4-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
* Juan Quintela (quintela@redhat.com) wrote: Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > Signed-off-by: Juan Quintela <quintela@redhat.com> > --- > include/migration/migration.h | 4 ---- > migration/exec.c | 1 + > migration/exec.h | 26 ++++++++++++++++++++++++++ > migration/migration.c | 1 + > 4 files changed, 28 insertions(+), 4 deletions(-) > create mode 100644 migration/exec.h > > diff --git a/include/migration/migration.h b/include/migration/migration.h > index d1a353a..d04f045 100644 > --- a/include/migration/migration.h > +++ b/include/migration/migration.h > @@ -163,10 +163,6 @@ void migration_tls_channel_connect(MigrationState *s, > > uint64_t migrate_max_downtime(void); > > -void exec_start_incoming_migration(const char *host_port, Error **errp); > - > -void exec_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp); > - > void tcp_start_incoming_migration(const char *host_port, Error **errp); > > void tcp_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp); > diff --git a/migration/exec.c b/migration/exec.c > index 57a9335..9077024 100644 > --- a/migration/exec.c > +++ b/migration/exec.c > @@ -21,6 +21,7 @@ > #include "qapi/error.h" > #include "qemu-common.h" > #include "channel.h" > +#include "exec.h" > #include "migration/migration.h" > #include "io/channel-command.h" > #include "trace.h" > diff --git a/migration/exec.h b/migration/exec.h > new file mode 100644 > index 0000000..b210ffd > --- /dev/null > +++ b/migration/exec.h > @@ -0,0 +1,26 @@ > +/* > + * QEMU live migration > + * > + * Copyright IBM, Corp. 2008 > + * Copyright Dell MessageOne 2008 > + * Copyright Red Hat, Inc. 2015-2016 > + * > + * Authors: > + * Anthony Liguori <aliguori@us.ibm.com> > + * Charles Duffy <charles_duffy@messageone.com> > + * Daniel P. Berrange <berrange@redhat.com> > + * > + * This work is licensed under the terms of the GNU GPL, version 2. See > + * the COPYING file in the top-level directory. > + * > + * Contributions after 2012-01-13 are licensed under the terms of the > + * GNU GPL, version 2 or (at your option) any later version. > + */ > + > +#ifndef QEMU_MIGRATION_EXEC_H > +#define QEMU_MIGRATION_EXEC_H > +void exec_start_incoming_migration(const char *host_port, Error **errp); > + > +void exec_start_outgoing_migration(MigrationState *s, const char *host_port, > + Error **errp); > +#endif > diff --git a/migration/migration.c b/migration/migration.c > index ea61650..31fa56f 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -18,6 +18,7 @@ > #include "qemu/error-report.h" > #include "qemu/main-loop.h" > #include "migration/blocker.h" > +#include "exec.h" > #include "migration/migration.h" > #include "savevm.h" > #include "qemu-file-channel.h" > -- > 2.9.4 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/include/migration/migration.h b/include/migration/migration.h index d1a353a..d04f045 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -163,10 +163,6 @@ void migration_tls_channel_connect(MigrationState *s, uint64_t migrate_max_downtime(void); -void exec_start_incoming_migration(const char *host_port, Error **errp); - -void exec_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp); - void tcp_start_incoming_migration(const char *host_port, Error **errp); void tcp_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp); diff --git a/migration/exec.c b/migration/exec.c index 57a9335..9077024 100644 --- a/migration/exec.c +++ b/migration/exec.c @@ -21,6 +21,7 @@ #include "qapi/error.h" #include "qemu-common.h" #include "channel.h" +#include "exec.h" #include "migration/migration.h" #include "io/channel-command.h" #include "trace.h" diff --git a/migration/exec.h b/migration/exec.h new file mode 100644 index 0000000..b210ffd --- /dev/null +++ b/migration/exec.h @@ -0,0 +1,26 @@ +/* + * QEMU live migration + * + * Copyright IBM, Corp. 2008 + * Copyright Dell MessageOne 2008 + * Copyright Red Hat, Inc. 2015-2016 + * + * Authors: + * Anthony Liguori <aliguori@us.ibm.com> + * Charles Duffy <charles_duffy@messageone.com> + * Daniel P. Berrange <berrange@redhat.com> + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + * Contributions after 2012-01-13 are licensed under the terms of the + * GNU GPL, version 2 or (at your option) any later version. + */ + +#ifndef QEMU_MIGRATION_EXEC_H +#define QEMU_MIGRATION_EXEC_H +void exec_start_incoming_migration(const char *host_port, Error **errp); + +void exec_start_outgoing_migration(MigrationState *s, const char *host_port, + Error **errp); +#endif diff --git a/migration/migration.c b/migration/migration.c index ea61650..31fa56f 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -18,6 +18,7 @@ #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "migration/blocker.h" +#include "exec.h" #include "migration/migration.h" #include "savevm.h" #include "qemu-file-channel.h"
Signed-off-by: Juan Quintela <quintela@redhat.com> --- include/migration/migration.h | 4 ---- migration/exec.c | 1 + migration/exec.h | 26 ++++++++++++++++++++++++++ migration/migration.c | 1 + 4 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 migration/exec.h