From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO5ms-00048f-Az for qemu-devel@nongnu.org; Wed, 18 Feb 2015 09:39:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YO5mm-0001jg-M9 for qemu-devel@nongnu.org; Wed, 18 Feb 2015 09:39:38 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:48945 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO5mm-0001ix-A1 for qemu-devel@nongnu.org; Wed, 18 Feb 2015 09:39:32 -0500 From: Vladimir Sementsov-Ogievskiy Date: Wed, 18 Feb 2015 17:00:14 +0300 Message-Id: <1424268014-13293-15-git-send-email-vsementsov@parallels.com> In-Reply-To: <1424268014-13293-1-git-send-email-vsementsov@parallels.com> References: <1424268014-13293-1-git-send-email-vsementsov@parallels.com> Subject: [Qemu-devel] [PATCH RFC v3 14/14] migration/qemu-file: make functions qemu_(get/put)_string public List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, quintela@redhat.com, dgilbert@redhat.com, vsementsov@parallels.com, stefanha@redhat.com, den@openvz.org, amit.shah@redhat.com, pbonzini@redhat.com Signed-off-by: Vladimir Sementsov-Ogievskiy --- include/migration/qemu-file.h | 17 +++++++++++++++++ migration/block-dirty-bitmap.c | 35 ----------------------------------- migration/qemu-file.c | 18 ++++++++++++++++++ 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h index a923cec..178ae63 100644 --- a/include/migration/qemu-file.h +++ b/include/migration/qemu-file.h @@ -310,4 +310,21 @@ static inline void qemu_get_sbe64s(QEMUFile *f, int64_t *pv) { qemu_get_be64s(f, (uint64_t *)pv); } + +/* read name from qemu file: + * format: + * 1 byte : len = name length (<256) + * len bytes : name without last zero byte + * + * name should point to the buffer >= 256 bytes length + */ +char *qemu_get_string(QEMUFile *f, char *name); + +/* write name to qemu file: + * format: + * same as for qemu_get_string + * + * maximum name length is 255 + */ +void qemu_put_string(QEMUFile *f, const char *name); #endif diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index 084ba22..8ebf7e5 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -161,41 +161,6 @@ static void qemu_put_flags(QEMUFile *f, uint32_t flags) qemu_put_be32(f, flags | DIRTY_BITMAP_MIG_FLAGS_SIZE_32); } -/* read name from qemu file: - * format: - * 1 byte : len = name length (<256) - * len bytes : name without last zero byte - * - * name should point to the buffer >= 256 bytes length - */ -static char *qemu_get_string(QEMUFile *f, char *name) -{ - int len = qemu_get_byte(f); - qemu_get_buffer(f, (uint8_t *)name, len); - name[len] = '\0'; - - DPRINTF("get name: %d %s\n", len, name); - - return name; -} - -/* write name to qemu file: - * format: - * same as for qemu_get_string - * - * maximum name length is 255 - */ -static void qemu_put_string(QEMUFile *f, const char *name) -{ - int len = strlen(name); - - DPRINTF("put name: %d %s\n", len, name); - - assert(len < 256); - qemu_put_byte(f, len); - qemu_put_buffer(f, (const uint8_t *)name, len); -} - static void send_bitmap_header(QEMUFile *f, DirtyBitmapMigBitmapState *dbms, uint32_t additional_flags) { diff --git a/migration/qemu-file.c b/migration/qemu-file.c index e66e557..5439f84 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -545,3 +545,21 @@ uint64_t qemu_get_be64(QEMUFile *f) v |= qemu_get_be32(f); return v; } + +char *qemu_get_string(QEMUFile *f, char *name) +{ + int len = qemu_get_byte(f); + qemu_get_buffer(f, (uint8_t *)name, len); + name[len] = '\0'; + + return name; +} + +void qemu_put_string(QEMUFile *f, const char *name) +{ + int len = strlen(name); + + assert(len < 256); + qemu_put_byte(f, len); + qemu_put_buffer(f, (const uint8_t *)name, len); +} -- 1.9.1