diff options
| author | Juan Quintela <quintela@redhat.com> | 2023-05-04 13:38:38 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2023-05-05 02:01:59 +0200 |
| commit | ac7d25b8163cfd16604cd7d92135dd14713d084b (patch) | |
| tree | eb230d65cf45d420eb964e38a5147fcb3a8baa27 /migration | |
| parent | 27a1243f14af1bc9430c94d5c13f51c734788959 (diff) | |
| download | qemu-ac7d25b8163cfd16604cd7d92135dd14713d084b.zip qemu-ac7d25b8163cfd16604cd7d92135dd14713d084b.tar.gz qemu-ac7d25b8163cfd16604cd7d92135dd14713d084b.tar.bz2 | |
qemu-file: remove shutdown member
The first thing that we do after setting the shutdown value is set the
error as -EIO if there is not a previous error.
So this value is redundant. Just remove it and use
qemu_file_get_error() in the places that it was tested.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Message-Id: <20230504113841.23130-7-quintela@redhat.com>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/qemu-file.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/migration/qemu-file.c b/migration/qemu-file.c index a4ea808..11b510a 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -63,8 +63,6 @@ struct QEMUFile { int last_error; Error *last_error_obj; - /* has the file has been shutdown */ - bool shutdown; }; /* @@ -78,8 +76,6 @@ int qemu_file_shutdown(QEMUFile *f) { int ret = 0; - f->shutdown = true; - /* * We must set qemufile error before the real shutdown(), otherwise * there can be a race window where we thought IO all went though @@ -294,7 +290,7 @@ void qemu_fflush(QEMUFile *f) return; } - if (f->shutdown) { + if (qemu_file_get_error(f)) { return; } if (f->iovcnt > 0) { @@ -397,7 +393,7 @@ static ssize_t coroutine_mixed_fn qemu_fill_buffer(QEMUFile *f) f->buf_index = 0; f->buf_size = pending; - if (f->shutdown) { + if (qemu_file_get_error(f)) { return 0; } @@ -486,7 +482,7 @@ static int add_to_iovec(QEMUFile *f, const uint8_t *buf, size_t size, } else { if (f->iovcnt >= MAX_IOV_SIZE) { /* Should only happen if a previous fflush failed */ - assert(f->shutdown || !qemu_file_is_writable(f)); + assert(qemu_file_get_error(f) || !qemu_file_is_writable(f)); return 1; } if (may_free) { |