diff options
author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2020-04-14 15:30:43 +0200 |
---|---|---|
committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2020-04-15 09:15:53 -0500 |
commit | ead83a136d54f7faa315922aff26fa11d216909f (patch) | |
tree | 9780b832182caa810e72a4b45e99c2a38f31ab16 /qga/commands-win32.c | |
parent | 5d3586b834633c8ac462d4741b85b4036cbc0f93 (diff) | |
download | qemu-ead83a136d54f7faa315922aff26fa11d216909f.zip qemu-ead83a136d54f7faa315922aff26fa11d216909f.tar.gz qemu-ead83a136d54f7faa315922aff26fa11d216909f.tar.bz2 |
qga: Extract qmp_guest_file_read() to common commands.c
Extract the common code shared by both POSIX/Win32 implementations.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'qga/commands-win32.c')
-rw-r--r-- | qga/commands-win32.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/qga/commands-win32.c b/qga/commands-win32.c index cfaf6b8..9717a8d 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -322,33 +322,19 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp) } } -GuestFileRead *qmp_guest_file_read(int64_t handle, bool has_count, - int64_t count, Error **errp) +GuestFileRead *guest_file_read_unsafe(GuestFileHandle *gfh, + int64_t count, Error **errp) { GuestFileRead *read_data = NULL; guchar *buf; - HANDLE fh; + HANDLE fh = gfh->fh; bool is_ok; DWORD read_count; - GuestFileHandle *gfh = guest_file_handle_find(handle, errp); - - if (!gfh) { - return NULL; - } - if (!has_count) { - count = QGA_READ_COUNT_DEFAULT; - } else if (count < 0 || count >= UINT32_MAX) { - error_setg(errp, "value '%" PRId64 - "' is invalid for argument count", count); - return NULL; - } - fh = gfh->fh; buf = g_malloc0(count + 1); is_ok = ReadFile(fh, buf, count, &read_count, NULL); if (!is_ok) { error_setg_win32(errp, GetLastError(), "failed to read file"); - slog("guest-file-read failed, handle %" PRId64, handle); } else { buf[read_count] = 0; read_data = g_new0(GuestFileRead, 1); |