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

qemu-ga: guest_file_handle_find(): take an Error argument

Browse Source 
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>

*Fixed missing space character in error message

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Luiz Capitulino 2012-11-27 11:01:55 -02:00 committed by Michael Roth
parent 4b274b1603
commit a9de6d01df
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qga/commands-posix.c
View File

@ -111,7 +111,7 @@ static void guest_file_handle_add(FILE *fh)
QTAILQ_INSERT_TAIL(&guest_file_state.filehandles, gfh, next); QTAILQ_INSERT_TAIL(&guest_file_state.filehandles, gfh, next);
} }
static GuestFileHandle *guest_file_handle_find(int64_t id) static GuestFileHandle *guest_file_handle_find(int64_t id, Error **err)
{ {
GuestFileHandle *gfh; GuestFileHandle *gfh;
@ -122,6 +122,7 @@ static GuestFileHandle *guest_file_handle_find(int64_t id)
} }
} }
error_setg(err, "handle '%" PRId64 "' has not been found", id);
return NULL; return NULL;
} }
@ -160,12 +161,11 @@ int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode, E
void qmp_guest_file_close(int64_t handle, Error **err) void qmp_guest_file_close(int64_t handle, Error **err)
{ {
GuestFileHandle *gfh = guest_file_handle_find(handle); GuestFileHandle *gfh = guest_file_handle_find(handle, err);
int ret; int ret;
slog("guest-file-close called, handle: %ld", handle); slog("guest-file-close called, handle: %ld", handle);
if (!gfh) { if (!gfh) {
error_set(err, QERR_FD_NOT_FOUND, "handle");
return; return;
} }
@ -182,14 +182,13 @@ void qmp_guest_file_close(int64_t handle, Error **err)
struct GuestFileRead *qmp_guest_file_read(int64_t handle, bool has_count, struct GuestFileRead *qmp_guest_file_read(int64_t handle, bool has_count,
int64_t count, Error **err) int64_t count, Error **err)
{ {
GuestFileHandle *gfh = guest_file_handle_find(handle); GuestFileHandle *gfh = guest_file_handle_find(handle, err);
GuestFileRead *read_data = NULL; GuestFileRead *read_data = NULL;
guchar *buf; guchar *buf;
FILE *fh; FILE *fh;
size_t read_count; size_t read_count;
if (!gfh) { if (!gfh) {
error_set(err, QERR_FD_NOT_FOUND, "handle");
return NULL; return NULL;
} }
@ -228,11 +227,10 @@ GuestFileWrite *qmp_guest_file_write(int64_t handle, const char *buf_b64,
guchar *buf; guchar *buf;
gsize buf_len; gsize buf_len;
int write_count; int write_count;
GuestFileHandle *gfh = guest_file_handle_find(handle); GuestFileHandle *gfh = guest_file_handle_find(handle, err);
FILE *fh; FILE *fh;
if (!gfh) { if (!gfh) {
error_set(err, QERR_FD_NOT_FOUND, "handle");
return NULL; return NULL;
} }
@ -265,13 +263,12 @@ GuestFileWrite *qmp_guest_file_write(int64_t handle, const char *buf_b64,
struct GuestFileSeek *qmp_guest_file_seek(int64_t handle, int64_t offset, struct GuestFileSeek *qmp_guest_file_seek(int64_t handle, int64_t offset,
int64_t whence, Error **err) int64_t whence, Error **err)
{ {
GuestFileHandle *gfh = guest_file_handle_find(handle); GuestFileHandle *gfh = guest_file_handle_find(handle, err);
GuestFileSeek *seek_data = NULL; GuestFileSeek *seek_data = NULL;
FILE *fh; FILE *fh;
int ret; int ret;
if (!gfh) { if (!gfh) {
error_set(err, QERR_FD_NOT_FOUND, "handle");
return NULL; return NULL;
} }
@ -291,12 +288,11 @@ struct GuestFileSeek *qmp_guest_file_seek(int64_t handle, int64_t offset,
void qmp_guest_file_flush(int64_t handle, Error **err) void qmp_guest_file_flush(int64_t handle, Error **err)
{ {
GuestFileHandle *gfh = guest_file_handle_find(handle); GuestFileHandle *gfh = guest_file_handle_find(handle, err);
FILE *fh; FILE *fh;
int ret; int ret;
if (!gfh) { if (!gfh) {
error_set(err, QERR_FD_NOT_FOUND, "handle");
return; return;
} }