From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Hailiang Zhang" <zhanghailiang@xfusion.com>,
"Eric Blake" <eblake@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Fam Zheng" <fam@euphon.net>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Juan Quintela" <quintela@redhat.com>,
qemu-block@nongnu.org, "Stefan Hajnoczi" <stefanha@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>
Subject: [PULL 11/25] migration: rename qemu_update_position to qemu_file_credit_transfer
Date: Wed, 22 Jun 2022 02:25:33 +0200 [thread overview]
Message-ID: <20220622002547.64784-12-quintela@redhat.com> (raw)
In-Reply-To: <20220622002547.64784-1-quintela@redhat.com>
From: Daniel P. Berrangé <berrange@redhat.com>
The qemu_update_position method name gives the misleading impression
that it is changing the current file offset. Most of the files are
just streams, however, so there's no concept of a file offset in the
general case.
What this method is actually used for is to report on the number of
bytes that have been transferred out of band from the main I/O methods.
This new name better reflects this purpose.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/qemu-file.h | 9 ++++++++-
migration/qemu-file.c | 4 ++--
migration/ram.c | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/migration/qemu-file.h b/migration/qemu-file.h
index 05f6aef903..d96f5f7118 100644
--- a/migration/qemu-file.h
+++ b/migration/qemu-file.h
@@ -179,7 +179,14 @@ int qemu_put_qemu_file(QEMUFile *f_des, QEMUFile *f_src);
*/
int qemu_peek_byte(QEMUFile *f, int offset);
void qemu_file_skip(QEMUFile *f, int size);
-void qemu_update_position(QEMUFile *f, size_t size);
+/*
+ * qemu_file_credit_transfer:
+ *
+ * Report on a number of bytes that have been transferred
+ * out of band from the main file object I/O methods. This
+ * accounting information tracks the total migration traffic.
+ */
+void qemu_file_credit_transfer(QEMUFile *f, size_t size);
void qemu_file_reset_rate_limit(QEMUFile *f);
void qemu_file_update_transfer(QEMUFile *f, int64_t len);
void qemu_file_set_rate_limit(QEMUFile *f, int64_t new_rate);
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 664ac77067..9a7f715e17 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -319,7 +319,7 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset,
if (ret != RAM_SAVE_CONTROL_DELAYED &&
ret != RAM_SAVE_CONTROL_NOT_SUPP) {
if (bytes_sent && *bytes_sent > 0) {
- qemu_update_position(f, *bytes_sent);
+ qemu_file_credit_transfer(f, *bytes_sent);
} else if (ret < 0) {
qemu_file_set_error(f, ret);
}
@@ -374,7 +374,7 @@ static ssize_t qemu_fill_buffer(QEMUFile *f)
return len;
}
-void qemu_update_position(QEMUFile *f, size_t size)
+void qemu_file_credit_transfer(QEMUFile *f, size_t size)
{
f->total_transferred += size;
}
diff --git a/migration/ram.c b/migration/ram.c
index 89082716d6..bf321e1e72 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2301,7 +2301,7 @@ void acct_update_position(QEMUFile *f, size_t size, bool zero)
} else {
ram_counters.normal += pages;
ram_transferred_add(size);
- qemu_update_position(f, size);
+ qemu_file_credit_transfer(f, size);
}
}
--
2.35.3
next prev parent reply other threads:[~2022-06-22 0:43 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-22 0:25 [PULL 00/25] Migration 20220621 patches Juan Quintela
2022-06-22 0:25 ` [PULL 01/25] migration: Remove RDMA_UNREGISTRATION_EXAMPLE Juan Quintela
2022-06-22 0:25 ` [PULL 02/25] QIOChannelSocket: Introduce assert and reduce ifdefs to improve readability Juan Quintela
2022-06-22 0:25 ` [PULL 03/25] QIOChannelSocket: Fix zero-copy send so socket flush works Juan Quintela
2022-06-22 0:25 ` [PULL 04/25] migration: Change zero_copy_send from migration parameter to migration capability Juan Quintela
2022-06-22 0:25 ` [PULL 05/25] io: add a QIOChannelNull equivalent to /dev/null Juan Quintela
2022-06-22 0:25 ` [PULL 06/25] migration: switch to use QIOChannelNull for dummy channel Juan Quintela
2022-06-22 0:25 ` [PULL 07/25] migration: remove unreachble RDMA code in save_hook impl Juan Quintela
2022-06-22 0:25 ` [PULL 08/25] migration: rename rate limiting fields in QEMUFile Juan Quintela
2022-06-22 0:25 ` [PULL 09/25] migration: rename 'pos' field in QEMUFile to 'bytes_processed' Juan Quintela
2022-06-22 0:25 ` [PULL 10/25] migration: rename qemu_ftell to qemu_file_total_transferred Juan Quintela
2022-06-22 0:25 ` Juan Quintela [this message]
2022-06-22 0:25 ` [PULL 12/25] migration: rename qemu_file_update_transfer to qemu_file_acct_rate_limit Juan Quintela
2022-06-22 0:25 ` [PULL 13/25] migration: introduce a QIOChannel impl for BlockDriverState VMState Juan Quintela
2022-06-22 0:25 ` [PULL 14/25] migration: convert savevm to use QIOChannelBlock for VMState Juan Quintela
2022-06-22 0:25 ` [PULL 15/25] migration: stop passing 'opaque' parameter to QEMUFile hooks Juan Quintela
2022-06-22 0:25 ` [PULL 16/25] migration: hardcode assumption that QEMUFile is backed with QIOChannel Juan Quintela
2022-06-22 0:25 ` [PULL 17/25] migration: introduce new constructors for QEMUFile Juan Quintela
2022-06-22 0:25 ` [PULL 18/25] migration: remove unused QEMUFileGetFD typedef / qemu_get_fd method Juan Quintela
2022-06-22 0:25 ` [PULL 19/25] migration: remove the QEMUFileOps 'shut_down' callback Juan Quintela
2022-06-22 0:25 ` [PULL 20/25] migration: remove the QEMUFileOps 'set_blocking' callback Juan Quintela
2022-06-22 0:25 ` [PULL 21/25] migration: remove the QEMUFileOps 'close' callback Juan Quintela
2022-06-22 0:25 ` [PULL 22/25] migration: remove the QEMUFileOps 'get_buffer' callback Juan Quintela
2022-06-22 0:25 ` [PULL 23/25] migration: remove the QEMUFileOps 'writev_buffer' callback Juan Quintela
2022-06-22 0:25 ` [PULL 24/25] migration: remove the QEMUFileOps 'get_return_path' callback Juan Quintela
2022-06-22 0:25 ` [PULL 25/25] migration: remove the QEMUFileOps abstraction Juan Quintela
2022-06-22 2:14 ` [PULL 00/25] Migration 20220621 patches Richard Henderson
2022-06-22 15:19 ` Dr. David Alan Gilbert
-- strict thread matches above, loose matches on Subject: below --
2022-06-23 16:53 [PULL 00/25] migration queue Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 11/25] migration: rename qemu_update_position to qemu_file_credit_transfer Dr. David Alan Gilbert (git)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220622002547.64784-12-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=fam@euphon.net \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=zhanghailiang@xfusion.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).