Message ID | 20230508130909.65420-5-quintela@redhat.com |
---|---|
State | Handled Elsewhere |
Headers | show |
Series | Migration: More migration atomic counters | expand |
On 5/8/23 15:08, Juan Quintela wrote: > It is really size_t. Everything else uses uint64_t, so move this to > uint64_t as well. A size can't be negative anyways. > > Signed-off-by: Juan Quintela <quintela@redhat.com> > Message-Id: <20230504113841.23130-4-quintela@redhat.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> C. * > > --- > > Don't drop the check if rate_limit_max is zero. > --- > migration/qemu-file.c | 6 +++--- > migration/qemu-file.h | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/migration/qemu-file.c b/migration/qemu-file.c > index 12cf7fb04e..346b683929 100644 > --- a/migration/qemu-file.c > +++ b/migration/qemu-file.c > @@ -44,7 +44,7 @@ struct QEMUFile { > * Maximum amount of data in bytes to transfer during one > * rate limiting time window > */ > - int64_t rate_limit_max; > + uint64_t rate_limit_max; > /* > * Total amount of data in bytes queued for transfer > * during this rate limiting time window > @@ -741,12 +741,12 @@ int qemu_file_rate_limit(QEMUFile *f) > return 0; > } > > -int64_t qemu_file_get_rate_limit(QEMUFile *f) > +uint64_t qemu_file_get_rate_limit(QEMUFile *f) > { > return f->rate_limit_max; > } > > -void qemu_file_set_rate_limit(QEMUFile *f, int64_t limit) > +void qemu_file_set_rate_limit(QEMUFile *f, uint64_t limit) > { > /* > * 'limit' is per second. But we check it each 100 miliseconds. > diff --git a/migration/qemu-file.h b/migration/qemu-file.h > index 4f26bf6961..04ca48cbef 100644 > --- a/migration/qemu-file.h > +++ b/migration/qemu-file.h > @@ -138,8 +138,8 @@ void qemu_file_reset_rate_limit(QEMUFile *f); > * need to be applied to the rate limiting calcuations > */ > void qemu_file_acct_rate_limit(QEMUFile *f, int64_t len); > -void qemu_file_set_rate_limit(QEMUFile *f, int64_t new_rate); > -int64_t qemu_file_get_rate_limit(QEMUFile *f); > +void qemu_file_set_rate_limit(QEMUFile *f, uint64_t new_rate); > +uint64_t qemu_file_get_rate_limit(QEMUFile *f); > int qemu_file_get_error_obj(QEMUFile *f, Error **errp); > int qemu_file_get_error_obj_any(QEMUFile *f1, QEMUFile *f2, Error **errp); > void qemu_file_set_error_obj(QEMUFile *f, int ret, Error *err);
diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 12cf7fb04e..346b683929 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -44,7 +44,7 @@ struct QEMUFile { * Maximum amount of data in bytes to transfer during one * rate limiting time window */ - int64_t rate_limit_max; + uint64_t rate_limit_max; /* * Total amount of data in bytes queued for transfer * during this rate limiting time window @@ -741,12 +741,12 @@ int qemu_file_rate_limit(QEMUFile *f) return 0; } -int64_t qemu_file_get_rate_limit(QEMUFile *f) +uint64_t qemu_file_get_rate_limit(QEMUFile *f) { return f->rate_limit_max; } -void qemu_file_set_rate_limit(QEMUFile *f, int64_t limit) +void qemu_file_set_rate_limit(QEMUFile *f, uint64_t limit) { /* * 'limit' is per second. But we check it each 100 miliseconds. diff --git a/migration/qemu-file.h b/migration/qemu-file.h index 4f26bf6961..04ca48cbef 100644 --- a/migration/qemu-file.h +++ b/migration/qemu-file.h @@ -138,8 +138,8 @@ void qemu_file_reset_rate_limit(QEMUFile *f); * need to be applied to the rate limiting calcuations */ void qemu_file_acct_rate_limit(QEMUFile *f, int64_t len); -void qemu_file_set_rate_limit(QEMUFile *f, int64_t new_rate); -int64_t qemu_file_get_rate_limit(QEMUFile *f); +void qemu_file_set_rate_limit(QEMUFile *f, uint64_t new_rate); +uint64_t qemu_file_get_rate_limit(QEMUFile *f); int qemu_file_get_error_obj(QEMUFile *f, Error **errp); int qemu_file_get_error_obj_any(QEMUFile *f1, QEMUFile *f2, Error **errp); void qemu_file_set_error_obj(QEMUFile *f, int ret, Error *err);
It is really size_t. Everything else uses uint64_t, so move this to uint64_t as well. A size can't be negative anyways. Signed-off-by: Juan Quintela <quintela@redhat.com> Message-Id: <20230504113841.23130-4-quintela@redhat.com> --- Don't drop the check if rate_limit_max is zero. --- migration/qemu-file.c | 6 +++--- migration/qemu-file.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)