From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Date: Wed, 14 Jan 2026 06:47:08 +0000 (+0300)
Subject: qemu-file: qemu_file_get_fd(): get byte in one shot
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ace0ad87ae133b78e4044fcc2328707f991e9b6f;p=thirdparty%2Fqemu.git

qemu-file: qemu_file_get_fd(): get byte in one shot

No reason to split into peek + get.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link: https://lore.kernel.org/qemu-devel/20260114064710.176268-4-vsementsov@yandex-team.ru
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---

diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 1f3b4cf4c5..847694e2cf 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -396,8 +396,7 @@ int qemu_file_get_fd(QEMUFile *f)
         goto fail;
     }
 
-    /* Force the dummy byte and its fd passenger to appear. */
-    qemu_peek_byte(f, 0);
+    qemu_get_byte(f);
 
     fde = QTAILQ_FIRST(&f->fds);
     if (!fde) {
@@ -405,7 +404,6 @@ int qemu_file_get_fd(QEMUFile *f)
         goto fail;
     }
 
-    qemu_get_byte(f);       /* Drop the dummy byte */
     fd = fde->fd;
     QTAILQ_REMOVE(&f->fds, fde, entry);
     g_free(fde);