From: "Michael S. Tsirkin" <mst@redhat.com>
To: Laurent Vivier <lvivier@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>,
Juan Quintela <quintela@redhat.com>,
qemu-devel@nongnu.org,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>
Subject: Re: [PATCH 2/2] failover: don't allow to migrate a paused VM that needs PCI unplug
Date: Tue, 2 Nov 2021 11:04:55 -0400 [thread overview]
Message-ID: <20211102110043-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20210929144311.1168561-3-lvivier@redhat.com>
On Wed, Sep 29, 2021 at 04:43:11PM +0200, Laurent Vivier wrote:
> As the guest OS is paused, we will never receive the unplug event
> from the kernel and the migration cannot continue.
>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Well ... what if user previously did
pause
start migration
unpause
we are breaking it now for no good reason.
Further, how about
start migration
pause
are we going to break this too? by failing pause?
> ---
> hw/net/virtio-net.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
> index f205331dcf8c..e54b6c8cd86c 100644
> --- a/hw/net/virtio-net.c
> +++ b/hw/net/virtio-net.c
> @@ -37,8 +37,10 @@
> #include "qapi/qapi-events-migration.h"
> #include "hw/virtio/virtio-access.h"
> #include "migration/misc.h"
> +#include "migration/migration.h"
> #include "standard-headers/linux/ethtool.h"
> #include "sysemu/sysemu.h"
> +#include "sysemu/runstate.h"
> #include "trace.h"
> #include "monitor/qdev.h"
> #include "hw/pci/pci.h"
> @@ -3279,7 +3281,13 @@ static void virtio_net_handle_migration_primary(VirtIONet *n, MigrationState *s)
> should_be_hidden = qatomic_read(&n->failover_primary_hidden);
>
> if (migration_in_setup(s) && !should_be_hidden) {
> - if (failover_unplug_primary(n, dev)) {
> + if (!runstate_is_running()) {
> + Error *err = NULL;
> + error_setg(&err,
> + "cannot unplug primary device while VM is paused");
> + migration_cancel(err);
> + error_free(err);
> + } else if (failover_unplug_primary(n, dev)) {
> vmstate_unregister(VMSTATE_IF(dev), qdev_get_vmsd(dev), dev);
> qapi_event_send_unplug_primary(dev->id);
> qatomic_set(&n->failover_primary_hidden, true);
> --
> 2.31.1
next prev parent reply other threads:[~2021-11-02 15:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-29 14:43 [PATCH 0/2] failover: don't allow to migrate a paused VM that needs PCI unplug Laurent Vivier
2021-09-29 14:43 ` [PATCH 1/2] migration: provide an error message to migration_cancel() Laurent Vivier
2021-11-02 9:04 ` Juan Quintela
2021-09-29 14:43 ` [PATCH 2/2] failover: don't allow to migrate a paused VM that needs PCI unplug Laurent Vivier
2021-11-02 9:04 ` Juan Quintela
2021-11-02 15:04 ` Michael S. Tsirkin [this message]
2021-11-02 15:28 ` Juan Quintela
2021-11-02 17:06 ` Laurent Vivier
2021-11-02 17:08 ` Michael S. Tsirkin
2021-11-02 17:26 ` Juan Quintela
2021-11-02 17:47 ` Laurent Vivier
2021-11-02 18:09 ` Juan Quintela
2021-11-02 17:43 ` Laurent Vivier
2021-10-06 9:22 ` [PATCH 0/2] " Laurent Vivier
2021-10-21 8:49 ` Laurent Vivier
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=20211102110043-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=dgilbert@redhat.com \
--cc=jasowang@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).