mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qga: Extract qmp_guest_file_read() to common commands.c

Browse Source 
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>
This commit is contained in:
Philippe Mathieu-Daudé 2020-04-14 15:30:43 +02:00 committed by Michael Roth
parent 5d3586b834
commit ead83a136d
4 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qga/commands-common.h
View File

@ -15,4 +15,7 @@ typedef struct GuestFileHandle GuestFileHandle;
GuestFileHandle *guest_file_handle_find(int64_t id, Error **errp); GuestFileHandle *guest_file_handle_find(int64_t id, Error **errp);
GuestFileRead *guest_file_read_unsafe(GuestFileHandle *gfh,
int64_t count, Error **errp);
#endif #endif

22
qga/commands-posix.c
View File

@ -461,29 +461,14 @@ void qmp_guest_file_close(int64_t handle, Error **errp)
g_free(gfh); g_free(gfh);
} }
struct GuestFileRead *qmp_guest_file_read(int64_t handle, bool has_count, GuestFileRead *guest_file_read_unsafe(GuestFileHandle *gfh,
int64_t count, Error **errp) int64_t count, Error **errp)
{ {
GuestFileHandle *gfh = guest_file_handle_find(handle, errp);
GuestFileRead *read_data = NULL; GuestFileRead *read_data = NULL;
guchar *buf; guchar *buf;
FILE *fh; FILE *fh = gfh->fh;
size_t read_count; size_t read_count;
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;
/* explicitly flush when switching from writing to reading */ /* explicitly flush when switching from writing to reading */
if (gfh->state == RW_STATE_WRITING) { if (gfh->state == RW_STATE_WRITING) {
int ret = fflush(fh); int ret = fflush(fh);
@ -498,7 +483,6 @@ struct GuestFileRead *qmp_guest_file_read(int64_t handle, bool has_count,
read_count = fread(buf, 1, count, fh); read_count = fread(buf, 1, count, fh);
if (ferror(fh)) { if (ferror(fh)) {
error_setg_errno(errp, errno, "failed to read file"); error_setg_errno(errp, errno, "failed to read file");
slog("guest-file-read failed, handle: %" PRId64, handle);
} else { } else {
buf[read_count] = 0; buf[read_count] = 0;
read_data = g_new0(GuestFileRead, 1); read_data = g_new0(GuestFileRead, 1);

20
qga/commands-win32.c
View File

@ -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, GuestFileRead *guest_file_read_unsafe(GuestFileHandle *gfh,
int64_t count, Error **errp) int64_t count, Error **errp)
{ {
GuestFileRead *read_data = NULL; GuestFileRead *read_data = NULL;
guchar *buf; guchar *buf;
HANDLE fh; HANDLE fh = gfh->fh;
bool is_ok; bool is_ok;
DWORD read_count; 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); buf = g_malloc0(count + 1);
is_ok = ReadFile(fh, buf, count, &read_count, NULL); is_ok = ReadFile(fh, buf, count, &read_count, NULL);
if (!is_ok) { if (!is_ok) {
error_setg_win32(errp, GetLastError(), "failed to read file"); error_setg_win32(errp, GetLastError(), "failed to read file");
slog("guest-file-read failed, handle %" PRId64, handle);
} else { } else {
buf[read_count] = 0; buf[read_count] = 0;
read_data = g_new0(GuestFileRead, 1); read_data = g_new0(GuestFileRead, 1);

26
qga/commands.c
View File

@ -18,6 +18,7 @@
#include "qemu/base64.h" #include "qemu/base64.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "qemu/atomic.h" #include "qemu/atomic.h"
#include "commands-common.h"
/* Maximum captured guest-exec out_data/err_data - 16MB */ /* Maximum captured guest-exec out_data/err_data - 16MB */
#define GUEST_EXEC_MAX_OUTPUT (16*1024*1024) #define GUEST_EXEC_MAX_OUTPUT (16*1024*1024)
@ -547,3 +548,28 @@ error:
g_free(info); g_free(info);
return NULL; return NULL;
} }
GuestFileRead *qmp_guest_file_read(int64_t handle, bool has_count,
int64_t count, Error **errp)
{
GuestFileHandle *gfh = guest_file_handle_find(handle, errp);
GuestFileRead *read_data;
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;
}
read_data = guest_file_read_unsafe(gfh, count, errp);
if (!read_data) {
slog("guest-file-write failed, handle: %" PRId64, handle);
}
return read_data;
}