From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46073) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNe1f-0000ww-Rb for qemu-devel@nongnu.org; Fri, 07 Aug 2015 05:33:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZNe1e-0002J0-TS for qemu-devel@nongnu.org; Fri, 07 Aug 2015 05:33:19 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:19843 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNe1e-0002Bn-G7 for qemu-devel@nongnu.org; Fri, 07 Aug 2015 05:33:18 -0400 From: Vladimir Sementsov-Ogievskiy Date: Fri, 7 Aug 2015 12:32:39 +0300 Message-Id: <1438939964-12584-8-git-send-email-vsementsov@virtuozzo.com> In-Reply-To: <1438939964-12584-1-git-send-email-vsementsov@virtuozzo.com> References: <1438939964-12584-1-git-send-email-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 07/12] migration/qemu-file: add qemu_put_counted_string() 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, Vladimir Sementsov-Ogievskiy , quintela@redhat.com, dgilbert@redhat.com, vsementsov@parallels.com, stefanha@redhat.com, den@openvz.org, amit.shah@redhat.com, pbonzini@redhat.com, jsnow@redhat.com Add function opposite to qemu_get_counted_string. qemu_put_counted_string puts one-byte length of the string (string should not be longer than 255 characters), and then it puts the string, without last zero byte. Signed-off-by: Vladimir Sementsov-Ogievskiy --- include/migration/qemu-file.h | 2 ++ migration/qemu-file.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h index ea49f33..cfbbdcb 100644 --- a/include/migration/qemu-file.h +++ b/include/migration/qemu-file.h @@ -319,4 +319,6 @@ static inline void qemu_get_sbe64s(QEMUFile *f, int64_t *pv) size_t qemu_get_counted_string(QEMUFile *f, char buf[256]); +void qemu_put_counted_string(QEMUFile *f, const char *name); + #endif diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 6bb3dc1..206cb54 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -611,3 +611,12 @@ size_t qemu_get_counted_string(QEMUFile *f, char buf[256]) return res == len ? res : 0; } + +void qemu_put_counted_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); +} -- 2.1.4