From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c9FHF-0005PK-9P for qemu-devel@nongnu.org; Tue, 22 Nov 2016 12:54:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c9FHE-00033z-2T for qemu-devel@nongnu.org; Tue, 22 Nov 2016 12:54:41 -0500 From: Vladimir Sementsov-Ogievskiy Date: Tue, 22 Nov 2016 20:54:23 +0300 Message-Id: <1479837270-79005-11-git-send-email-vsementsov@virtuozzo.com> In-Reply-To: <1479837270-79005-1-git-send-email-vsementsov@virtuozzo.com> References: <1479837270-79005-1-git-send-email-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 10/17] migration/qemu-file: add qemu_put_counted_string() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org, qemu-devel@nongnu.org Cc: pbonzini@redhat.com, armbru@redhat.com, eblake@redhat.com, famz@redhat.com, stefanha@redhat.com, amit.shah@redhat.com, quintela@redhat.com, mreitz@redhat.com, kwolf@redhat.com, peter.maydell@linaro.org, dgilbert@redhat.com, den@openvz.org, jsnow@redhat.com, vsementsov@virtuozzo.com, lirans@il.ibm.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. Reviewed-by: John Snow Signed-off-by: Vladimir Sementsov-Ogievskiy --- include/migration/qemu-file.h | 2 ++ migration/qemu-file.c | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h index abedd46..d860c92 100644 --- a/include/migration/qemu-file.h +++ b/include/migration/qemu-file.h @@ -309,4 +309,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 e9fae31..8e928b2 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -691,6 +691,19 @@ size_t qemu_get_counted_string(QEMUFile *f, char buf[256]) } /* + * Put a string with one preceding byte containing its length. The length of + * the string should be less than 256. + */ +void qemu_put_counted_string(QEMUFile *f, const char *str) +{ + size_t len = strlen(str); + + assert(len < 256); + qemu_put_byte(f, len); + qemu_put_buffer(f, (const uint8_t *)str, len); +} + +/* * Set the blocking state of the QEMUFile. * Note: On some transports the OS only keeps a single blocking state for * both directions, and thus changing the blocking on the main -- 1.8.3.1