[PATCH 3/5] qemu-file: qemu_file_get_fd(): get byte in one shot

Vladimir Sementsov-Ogievskiy posted 5 patches 3 weeks, 5 days ago
Maintainers: Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>
[PATCH 3/5] qemu-file: qemu_file_get_fd(): get byte in one shot
Posted by Vladimir Sementsov-Ogievskiy 3 weeks, 5 days ago
No reason to split into peek + get.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
---
 migration/qemu-file.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 02f30c1c21..3a9a0a49d4 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);
-- 
2.48.1
Re: [PATCH 3/5] qemu-file: qemu_file_get_fd(): get byte in one shot
Posted by Fabiano Rosas 3 weeks, 5 days ago
Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> writes:

> No reason to split into peek + get.
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
> ---
>  migration/qemu-file.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/migration/qemu-file.c b/migration/qemu-file.c
> index 02f30c1c21..3a9a0a49d4 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);

Reviewed-by: Fabiano Rosas <farosas@suse.de>