diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-04-08 14:00:57 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-04-08 14:00:57 +0100 |
| commit | d8724020dd13c88a72fc391a6a2cf63abbd3dcca (patch) | |
| tree | 5ff191d498a3f787c5353cf08e9e0f69832c3272 /hw | |
| parent | 9692c7b0373677badcf8bb299ab8e2597244d436 (diff) | |
| parent | e999fa47b220274082cb238d5ccb2c9bacd42bf1 (diff) | |
| download | focaccia-qemu-d8724020dd13c88a72fc391a6a2cf63abbd3dcca.tar.gz focaccia-qemu-d8724020dd13c88a72fc391a6a2cf63abbd3dcca.zip | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20210407b' into staging
V2 migration+virtiofs fixes pull 2021-04-07 A seg fix in virtiofsd, a bunch of fixes for background snapshots, and a migration test fix. Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> v2 Fix for !linux build # gpg: Signature made Wed 07 Apr 2021 18:53:13 BST # gpg: using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7 # gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full] # Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7 * remotes/dgilbert/tags/pull-migration-20210407b: tests/migration: fix parameter of auto-converge migration migration: Rename 'bs' to 'block' in background snapshot code migration: Pre-fault memory before starting background snasphot migration: Inhibit virtio-balloon for the duration of background snapshot migration: Fix missing qemu_fflush() on buffer file in bg_migration_thread virtiofsd: Fix security.capability comparison Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/virtio/virtio-balloon.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index e770955176..d120bf8f43 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -66,8 +66,12 @@ static bool virtio_balloon_pbp_matches(PartiallyBalloonedPage *pbp, static bool virtio_balloon_inhibited(void) { - /* Postcopy cannot deal with concurrent discards, so it's special. */ - return ram_block_discard_is_disabled() || migration_in_incoming_postcopy(); + /* + * Postcopy cannot deal with concurrent discards, + * so it's special, as well as background snapshots. + */ + return ram_block_discard_is_disabled() || migration_in_incoming_postcopy() || + migration_in_bg_snapshot(); } static void balloon_inflate_page(VirtIOBalloon *balloon, |