On Thu, Nov 1, 2018 at 12:47 AM Dr. David Alan Gilbert <dgilb...@redhat.com>
wrote:
> * Dr. David Alan Gilbert (dgilb...@redhat.com) wrote:
> > * Zhang Chen (zhangc...@gmail.com) wrote:
> > > This compilation issue will occur when user use --disable-replication
> > > to config Qemu.
> > >
> > > Reported-by: Thomas Huth <th...@redhat.com>
> > > Signed-off-by: Zhang Chen <zhangc...@gmail.com>
> >
> > Queued.
>
> Unqueued; this still isn't building for me with replication disabled;
> I'm hitting one problem where the compiler is complaining that
> colo_send_message_value is unused, and then I'm hitting a bunch of link
> time errors.
>
> This needs a few more fixes first.
>
Sorry, my test machine's gcc version(5.4.0) is too old to catch this error.
I will fix it and send the V2 patch.
Thanks
Zhang Chen
>
> Dave
>
> > > ---
> > > migration/colo.c | 18 +++++++++++++++++-
> > > 1 file changed, 17 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/migration/colo.c b/migration/colo.c
> > > index 956ac236b7..b81e6ec5bb 100644
> > > --- a/migration/colo.c
> > > +++ b/migration/colo.c
> > > @@ -59,6 +59,8 @@ static bool colo_runstate_is_stopped(void)
> > >
> > > static void secondary_vm_do_failover(void)
> > > {
> > > +/* COLO needs enable block-replication */
> > > +#ifdef CONFIG_REPLICATION
> > > int old_state;
> > > MigrationIncomingState *mis = migration_incoming_get_current();
> > > Error *local_err = NULL;
> > > @@ -121,10 +123,14 @@ static void secondary_vm_do_failover(void)
> > > if (mis->migration_incoming_co) {
> > > qemu_coroutine_enter(mis->migration_incoming_co);
> > > }
> > > +#else
> > > + abort();
> > > +#endif
> > > }
> > >
> > > static void primary_vm_do_failover(void)
> > > {
> > > +#ifdef CONFIG_REPLICATION
> > > MigrationState *s = migrate_get_current();
> > > int old_state;
> > > Error *local_err = NULL;
> > > @@ -165,6 +171,9 @@ static void primary_vm_do_failover(void)
> > >
> > > /* Notify COLO thread that failover work is finished */
> > > qemu_sem_post(&s->colo_exit_sem);
> > > +#else
> > > + abort();
> > > +#endif
> > > }
> > >
> > > COLOMode get_colo_mode(void)
> > > @@ -373,6 +382,7 @@ static int
> colo_do_checkpoint_transaction(MigrationState *s,
> > > QIOChannelBuffer *bioc,
> > > QEMUFile *fb)
> > > {
> > > +#ifdef CONFIG_REPLICATION
> > > Error *local_err = NULL;
> > > int ret = -1;
> > >
> > > @@ -483,6 +493,9 @@ out:
> > > error_report_err(local_err);
> > > }
> > > return ret;
> > > +#else
> > > + abort();
> > > +#endif
> > > }
> > >
> > > static void colo_compare_notify_checkpoint(Notifier *notifier, void
> *data)
> > > @@ -790,13 +803,16 @@ void *colo_process_incoming_thread(void *opaque)
> > > qemu_mutex_unlock_iothread();
> > > goto out;
> > > }
> > > +#ifdef CONFIG_REPLICATION
> > > /* discard colo disk buffer */
> > > replication_do_checkpoint_all(&local_err);
> > > if (local_err) {
> > > qemu_mutex_unlock_iothread();
> > > goto out;
> > > }
> > > -
> > > +#else
> > > + abort();
> > > +#endif
> > > /* Notify all filters of all NIC to do checkpoint */
> > > colo_notify_filters_event(COLO_EVENT_CHECKPOINT, &local_err);
> > >
> > > --
> > > 2.17.GIT
> > >
> > --
> > Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
> --
> Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
>
