motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 12:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qemu-file: Don't do IO after shutdown

Browse source 
Be sure that we are not doing neither read/write after shutdown of the
QEMUFile.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Juan Quintela 2019-12-18 05:11:31 +01:00
parent 3d4095b222
commit a555b8092a
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
migration/qemu-file.c
View file

@ -53,6 +53,8 @@ struct QEMUFile {
int last_error; int last_error;
Error *last_error_obj; Error *last_error_obj;
/* has the file has been shutdown */
bool shutdown;
}; };
/* /*
@ -61,10 +63,18 @@ struct QEMUFile {
*/ */
int qemu_file_shutdown(QEMUFile *f) int qemu_file_shutdown(QEMUFile *f)
{ {
int ret;
f->shutdown = true;
if (!f->ops->shut_down) { if (!f->ops->shut_down) {
return -ENOSYS; return -ENOSYS;
} }
return f->ops->shut_down(f->opaque, true, true, NULL); ret = f->ops->shut_down(f->opaque, true, true, NULL);
if (!f->last_error) {
qemu_file_set_error(f, -EIO);
}
return ret;
} }
/* /*
@ -214,6 +224,9 @@ void qemu_fflush(QEMUFile *f)
return; return;
} }
if (f->shutdown) {
return;
}
if (f->iovcnt > 0) { if (f->iovcnt > 0) {
expect = iov_size(f->iov, f->iovcnt); expect = iov_size(f->iov, f->iovcnt);
ret = f->ops->writev_buffer(f->opaque, f->iov, f->iovcnt, f->pos, ret = f->ops->writev_buffer(f->opaque, f->iov, f->iovcnt, f->pos,
@ -328,6 +341,10 @@ static ssize_t qemu_fill_buffer(QEMUFile *f)
f->buf_index = 0; f->buf_index = 0;
f->buf_size = pending; f->buf_size = pending;
if (f->shutdown) {
return 0;
}
len = f->ops->get_buffer(f->opaque, f->buf + pending, f->pos, len = f->ops->get_buffer(f->opaque, f->buf + pending, f->pos,
IO_BUF_SIZE - pending, &local_error); IO_BUF_SIZE - pending, &local_error);
if (len > 0) { if (len > 0) {
@ -642,6 +659,9 @@ int64_t qemu_ftell(QEMUFile *f)
int qemu_file_rate_limit(QEMUFile *f) int qemu_file_rate_limit(QEMUFile *f)
{ {
if (f->shutdown) {
return 1;
}
if (qemu_file_get_error(f)) { if (qemu_file_get_error(f)) {
return 1; return 1;
} }