From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43277) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csofe-0006Ph-1B for qemu-devel@nongnu.org; Tue, 28 Mar 2017 06:48:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1csofZ-000230-2V for qemu-devel@nongnu.org; Tue, 28 Mar 2017 06:48:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40504) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1csofY-000222-QT for qemu-devel@nongnu.org; Tue, 28 Mar 2017 06:48:09 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 659437E9FF for ; Tue, 28 Mar 2017 10:48:07 +0000 (UTC) From: Juan Quintela In-Reply-To: <20170324153218.05864a87@nial.brq.redhat.com> (Igor Mammedov's message of "Fri, 24 Mar 2017 15:32:18 +0100") References: <20170323205025.12113-1-quintela@redhat.com> <20170323205025.12113-2-quintela@redhat.com> <20170324153218.05864a87@nial.brq.redhat.com> Reply-To: quintela@redhat.com Date: Tue, 28 Mar 2017 12:48:06 +0200 Message-ID: <8760itsmmx.fsf@secure.mitica> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH 1/2] migration: Disable hotplug/unplug during migration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: qemu-devel@nongnu.org, dgilbert@redhat.com Igor Mammedov wrote: > On Thu, 23 Mar 2017 21:50:24 +0100 > Juan Quintela wrote: > >> Until we have reviewed what can/can't be hotplug during migration, >> disable it. We can enable it later for the things that we know that >> work. For instance, memory hotplug during postcopy don't work >> currently. >> >> Signed-off-by: Juan Quintela >> --- >> hw/core/qdev.c | 5 +++++ >> qdev-monitor.c | 7 ++++++- >> 2 files changed, 11 insertions(+), 1 deletion(-) >> >> diff --git a/hw/core/qdev.c b/hw/core/qdev.c >> index 1e7fb33..8c4a3f3 100644 >> --- a/hw/core/qdev.c >> +++ b/hw/core/qdev.c >> @@ -277,6 +277,11 @@ void qdev_unplug(DeviceState *dev, Error **errp) >> HotplugHandler *hotplug_ctrl; >> HotplugHandlerClass *hdc; >> >> + if (!migration_is_idle()) { >> + error_setg(errp, "device_add not allowed while migrating"); > s/device_add/device_del/ > > > I'd put this check after "if (!dc->hotpluggable)" block, so error > message won't hide wrong upluggable device error cases Thanks. I did both changes. Not sure yet what *should* came 1st: - device is not plugable/unplugable - you can't do it while on migration But I don't care, and as you seemed to preffer that other way, changed. Later, Juan. >> + return; >> + } >> + >> if (dev->parent_bus && !qbus_is_hotpluggable(dev->parent_bus)) { >> error_setg(errp, QERR_BUS_NO_HOTPLUG, dev->parent_bus->name); >> return; >> diff --git a/qdev-monitor.c b/qdev-monitor.c >> index 5f2fcdf..e0622b4 100644 >> --- a/qdev-monitor.c >> +++ b/qdev-monitor.c >> @@ -29,7 +29,7 @@ >> #include "qemu/error-report.h" >> #include "qemu/help_option.h" >> #include "sysemu/block-backend.h" >> - >> +#include "migration/migration.h" >> /* >> * Aliases were a bad idea from the start. Let's keep them >> * from spreading further. >> @@ -566,6 +566,11 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp) >> BusState *bus = NULL; >> Error *err = NULL; >> >> + if (!migration_is_idle()) { >> + error_setg(errp, "device_add not allowed while migrating"); >> + return NULL; >> + } > the same here, do it right before "/* create device */" > >> driver = qemu_opt_get(opts, "driver"); >> if (!driver) { >> error_setg(errp, QERR_MISSING_PARAMETER, "driver");