From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M6uFe-0007FJ-K1 for qemu-devel@nongnu.org; Wed, 20 May 2009 18:27:06 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M6uFZ-0007Eg-Kx for qemu-devel@nongnu.org; Wed, 20 May 2009 18:27:05 -0400 Received: from [199.232.76.173] (port=44450 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M6uFZ-0007EP-AZ for qemu-devel@nongnu.org; Wed, 20 May 2009 18:27:01 -0400 Received: from mx2.redhat.com ([66.187.237.31]:43521) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M6uFY-0000Je-RB for qemu-devel@nongnu.org; Wed, 20 May 2009 18:27:01 -0400 From: Glauber Costa Date: Wed, 20 May 2009 18:26:57 -0400 Message-Id: <1242858418-10553-2-git-send-email-glommer@redhat.com> In-Reply-To: <1242858418-10553-1-git-send-email-glommer@redhat.com> References: <1242858418-10553-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] introduce set_rate_limit function for QEMUFile List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com Ladies and Gentlemen! I'm pleased to announce the debut of a set_rate_limit function in QEMUFile. It will allow us to do exactly what it suggests: setting the cap limitations of a file on the fly. This patch converts the current callers of qemu_fopen_ops(). Signed-off-by: Glauber Costa --- buffered_file.c | 16 +++++++++++++++- hw/hw.h | 10 +++++++++- savevm.c | 27 +++++++++++++++++++-------- 3 files changed, 43 insertions(+), 10 deletions(-) diff --git a/buffered_file.c b/buffered_file.c index ec4f664..364b912 100644 --- a/buffered_file.c +++ b/buffered_file.c @@ -198,6 +198,19 @@ static int buffered_rate_limit(void *opaque) return 0; } +static size_t buffered_set_rate_limit(void *opaque, size_t new_rate) +{ + QEMUFileBuffered *s = opaque; + + if (s->has_error) + goto out; + + s->xfer_limit = new_rate / 10; + +out: + return s->xfer_limit; +} + static void buffered_rate_tick(void *opaque) { QEMUFileBuffered *s = opaque; @@ -237,7 +250,8 @@ QEMUFile *qemu_fopen_ops_buffered(void *opaque, s->close = close; s->file = qemu_fopen_ops(s, buffered_put_buffer, NULL, - buffered_close, buffered_rate_limit); + buffered_close, buffered_rate_limit, + buffered_set_rate_limit); s->timer = qemu_new_timer(rt_clock, buffered_rate_tick, s); diff --git a/hw/hw.h b/hw/hw.h index c990d1a..dd11f0a 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -36,10 +36,17 @@ typedef int (QEMUFileCloseFunc)(void *opaque); */ typedef int (QEMUFileRateLimit)(void *opaque); +/* Called to change the current bandwidth allocation. This function must return + * the new actual bandwidth. It should be new_rate if everything goes ok, and + * the old rate otherwise + */ +typedef size_t (QEMUFileSetRateLimit)(void *opaque, size_t new_rate); + QEMUFile *qemu_fopen_ops(void *opaque, QEMUFilePutBufferFunc *put_buffer, QEMUFileGetBufferFunc *get_buffer, QEMUFileCloseFunc *close, - QEMUFileRateLimit *rate_limit); + QEMUFileRateLimit *rate_limit, + QEMUFileSetRateLimit *set_rate_limit); QEMUFile *qemu_fopen(const char *filename, const char *mode); QEMUFile *qemu_fopen_socket(int fd); QEMUFile *qemu_popen(FILE *popen_file, const char *mode); @@ -73,6 +80,7 @@ unsigned int qemu_get_be16(QEMUFile *f); unsigned int qemu_get_be32(QEMUFile *f); uint64_t qemu_get_be64(QEMUFile *f); int qemu_file_rate_limit(QEMUFile *f); +size_t qemu_file_set_rate_limit(QEMUFile *f, size_t new_rate); int qemu_file_has_error(QEMUFile *f); void qemu_file_set_error(QEMUFile *f); diff --git a/savevm.c b/savevm.c index 8b7909a..3478bb8 100644 --- a/savevm.c +++ b/savevm.c @@ -144,6 +144,7 @@ struct QEMUFile { QEMUFileGetBufferFunc *get_buffer; QEMUFileCloseFunc *close; QEMUFileRateLimit *rate_limit; + QEMUFileSetRateLimit *set_rate_limit; void *opaque; int is_write; @@ -224,9 +225,9 @@ QEMUFile *qemu_popen(FILE *popen_file, const char *mode) s->popen_file = popen_file; if(mode[0] == 'r') { - s->file = qemu_fopen_ops(s, NULL, popen_get_buffer, popen_close, NULL); + s->file = qemu_fopen_ops(s, NULL, popen_get_buffer, popen_close, NULL, NULL); } else { - s->file = qemu_fopen_ops(s, popen_put_buffer, NULL, popen_close, NULL); + s->file = qemu_fopen_ops(s, popen_put_buffer, NULL, popen_close, NULL, NULL); } fprintf(stderr, "qemu_popen: returning result of qemu_fopen_ops\n"); return s->file; @@ -249,7 +250,7 @@ QEMUFile *qemu_fopen_socket(int fd) QEMUFileSocket *s = qemu_mallocz(sizeof(QEMUFileSocket)); s->fd = fd; - s->file = qemu_fopen_ops(s, NULL, socket_get_buffer, socket_close, NULL); + s->file = qemu_fopen_ops(s, NULL, socket_get_buffer, socket_close, NULL, NULL); return s->file; } @@ -293,9 +294,9 @@ QEMUFile *qemu_fopen(const char *filename, const char *mode) goto fail; if (!strcmp(mode, "wb")) - return qemu_fopen_ops(s, file_put_buffer, NULL, file_close, NULL); + return qemu_fopen_ops(s, file_put_buffer, NULL, file_close, NULL, NULL); else if (!strcmp(mode, "rb")) - return qemu_fopen_ops(s, NULL, file_get_buffer, file_close, NULL); + return qemu_fopen_ops(s, NULL, file_get_buffer, file_close, NULL, NULL); fail: if (s->outfile) @@ -341,15 +342,16 @@ static QEMUFile *qemu_fopen_bdrv(BlockDriverState *bs, int64_t offset, int is_wr s->base_offset = offset; if (is_writable) - return qemu_fopen_ops(s, block_put_buffer, NULL, bdrv_fclose, NULL); + return qemu_fopen_ops(s, block_put_buffer, NULL, bdrv_fclose, NULL, NULL); - return qemu_fopen_ops(s, NULL, block_get_buffer, bdrv_fclose, NULL); + return qemu_fopen_ops(s, NULL, block_get_buffer, bdrv_fclose, NULL, NULL); } QEMUFile *qemu_fopen_ops(void *opaque, QEMUFilePutBufferFunc *put_buffer, QEMUFileGetBufferFunc *get_buffer, QEMUFileCloseFunc *close, - QEMUFileRateLimit *rate_limit) + QEMUFileRateLimit *rate_limit, + QEMUFileSetRateLimit *set_rate_limit) { QEMUFile *f; @@ -360,6 +362,7 @@ QEMUFile *qemu_fopen_ops(void *opaque, QEMUFilePutBufferFunc *put_buffer, f->get_buffer = get_buffer; f->close = close; f->rate_limit = rate_limit; + f->set_rate_limit = set_rate_limit; f->is_write = 0; return f; @@ -537,6 +540,14 @@ int qemu_file_rate_limit(QEMUFile *f) return 0; } +size_t qemu_file_set_rate_limit(QEMUFile *f, size_t new_rate) +{ + if (f->set_rate_limit) + return f->set_rate_limit(f->opaque, new_rate); + + return 0; +} + void qemu_put_be16(QEMUFile *f, unsigned int v) { qemu_put_byte(f, v >> 8); -- 1.5.6.6