starred/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-02-04 05:35:39 +00:00
Code Issues 380 Packages Projects Releases Wiki Activity

qemu-file: qemu_file_get_fd(): improve interface

Browse Source 
Make it symmetrical with qemu_file_put_fd() and simplify callers.

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-6-vsementsov@yandex-team.ru
Signed-off-by: Fabiano Rosas <farosas@suse.de>
This commit is contained in:
Vladimir Sementsov-Ogievskiy
2026-01-14 09:47:10 +03:00
committed by Fabiano Rosas
parent 20125d93af
commit f43a45ba09
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
migration/qemu-file.c
View File

@@ -385,9 +385,8 @@ int qemu_file_put_fd(QEMUFile *f, int fd)
return ret;
}
int qemu_file_get_fd(QEMUFile *f)
int qemu_file_get_fd(QEMUFile *f, int *fd)
{
int fd = -1;
FdEntry *fde;
Error *err = NULL;
int service_byte;
@@ -410,12 +409,12 @@ int qemu_file_get_fd(QEMUFile *f)
goto fail;
}
fd = fde->fd;
*fd = fde->fd;
QTAILQ_REMOVE(&f->fds, fde, entry);
g_free(fde);
trace_qemu_file_get_fd(f->ioc->name, fd);
return fd;
trace_qemu_file_get_fd(f->ioc->name, *fd);
return 0;
fail:
error_report_err(error_copy(err));

2
migration/qemu-file.h
View File

@@ -82,6 +82,6 @@ size_t qemu_get_buffer_at(QEMUFile *f, const uint8_t *buf, size_t buflen,
QIOChannel *qemu_file_get_ioc(QEMUFile *file);
int qemu_file_put_fd(QEMUFile *f, int fd);
int qemu_file_get_fd(QEMUFile *f);
int qemu_file_get_fd(QEMUFile *f, int *fd);
#endif

10
migration/vmstate-types.c
View File

@@ -321,7 +321,6 @@ const VMStateInfo vmstate_info_uint64 = {
static int get_fd(QEMUFile *f, void *pv, size_t size,
const VMStateField *field)
{
int fd;
int32_t *v = pv;
if (migrate_mode() == MIG_MODE_CPR_EXEC) {
@@ -329,14 +328,7 @@ static int get_fd(QEMUFile *f, void *pv, size_t size,
return 0;
}
fd = qemu_file_get_fd(f);
if (fd < 0) {
return -1;
}
*v = fd;
return 0;
return qemu_file_get_fd(f, v);
}
static int put_fd(QEMUFile *f, void *pv, size_t size,