[PULL 0/1] Migration patches for 2025-04-01

[PULL 0/1] Migration patches for 2025-04-01

[Fabiano Rosas]

The following changes since commit 0f15892acaf3f50ecc20c6dad4b3ebdd701aa93e:

  Merge tag 'pull-riscv-to-apply-20250328' of https://github.com/alistair23/qemu into staging (2025-03-28 08:06:53 -0400)

are available in the Git repository at:

  https://gitlab.com/farosas/qemu.git tags/migration-20250401-pull-request

for you to fetch changes up to c0b32426ce56182c1ce2a12904f3a702c2ecc460:

  migration: fix SEEK_CUR offset calculation in qio_channel_block_seek (2025-03-31 09:17:01 -0300)

----------------------------------------------------------------
Migration pull request

Fix QIOChannelBlock's seek routine

----------------------------------------------------------------

Marco Cavenati (1):
  migration: fix SEEK_CUR offset calculation in qio_channel_block_seek

 migration/channel-block.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.35.3

[PULL 1/1] migration: fix SEEK_CUR offset calculation in qio_channel_block_seek

[Fabiano Rosas]

From: Marco Cavenati <Marco.Cavenati@eurecom.fr>

The SEEK_CUR case in qio_channel_block_seek was incorrectly using the
'whence' parameter instead of the 'offset' parameter when calculating the
new position.

Fixes: 65cf200a51 ("migration: introduce a QIOChannel impl for BlockDriverState VMState")
Signed-off-by: Marco Cavenati <Marco.Cavenati@eurecom.fr>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Message-ID: <20250326162230.3323199-1-Marco.Cavenati@eurecom.fr>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
 migration/channel-block.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migration/channel-block.c b/migration/channel-block.c
index fff8d87094..b0477f5b6d 100644
--- a/migration/channel-block.c
+++ b/migration/channel-block.c
@@ -123,7 +123,7 @@ qio_channel_block_seek(QIOChannel *ioc,
         bioc->offset = offset;
         break;
     case SEEK_CUR:
-        bioc->offset += whence;
+        bioc->offset += offset;
         break;
     case SEEK_END:
         error_setg(errp, "Size of VMstate region is unknown");
-- 
2.35.3

Re: [PULL 0/1] Migration patches for 2025-04-01

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 116 bytes --]

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/10.0 for any user-visible changes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]