From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org,
vsementsov@virtuozzo.com, quintela@redhat.com,
dgilbert@redhat.com, stefanha@redhat.com, pbonzini@redhat.com,
amit.shah@redhat.com, den@openvz.org, jsnow@redhat.com
Subject: [Qemu-devel] [PATCH 07/13] migration/qemu-file: add qemu_put_counted_string()
Date: Wed, 11 Nov 2015 18:16:37 +0300 [thread overview]
Message-ID: <1447255003-2043-8-git-send-email-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <1447255003-2043-1-git-send-email-vsementsov@virtuozzo.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 <jsnow@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
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 b5d08d2..ea8aef8 100644
--- a/include/migration/qemu-file.h
+++ b/include/migration/qemu-file.h
@@ -329,4 +329,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 0bbd257..1e90810 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -662,6 +662,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 *name)
+{
+ size_t len = strlen(name);
+
+ assert(len < 256);
+ qemu_put_byte(f, len);
+ qemu_put_buffer(f, (const uint8_t *)name, 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
--
2.1.4
next prev parent reply other threads:[~2015-11-11 15:57 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-11 15:16 [Qemu-devel] [PATCH v7 00/13] Dirty bitmaps migration Vladimir Sementsov-Ogievskiy
2015-11-11 15:16 ` [Qemu-devel] [PATCH 01/13] hbitmap: serialization Vladimir Sementsov-Ogievskiy
2015-12-03 7:35 ` Fam Zheng
2015-12-03 7:44 ` Vladimir Sementsov-Ogievskiy
2015-11-11 15:16 ` [Qemu-devel] [PATCH 02/13] block: BdrvDirtyBitmap serialization interface Vladimir Sementsov-Ogievskiy
2015-11-11 15:16 ` [Qemu-devel] [PATCH 03/13] block: tiny refactoring: minimize hbitmap_(set/reset) usage Vladimir Sementsov-Ogievskiy
2015-11-11 15:16 ` [Qemu-devel] [PATCH 04/13] block: add meta bitmaps Vladimir Sementsov-Ogievskiy
2015-12-03 11:07 ` Fam Zheng
2015-11-11 15:16 ` [Qemu-devel] [PATCH 05/13] block: add bdrv_next_dirty_bitmap() Vladimir Sementsov-Ogievskiy
2015-11-11 15:16 ` [Qemu-devel] [PATCH 06/13] qapi: add dirty-bitmaps migration capability Vladimir Sementsov-Ogievskiy
2015-11-11 15:16 ` Vladimir Sementsov-Ogievskiy [this message]
2015-11-11 15:16 ` [Qemu-devel] [PATCH 08/13] migration: add migration/block-dirty-bitmap.c Vladimir Sementsov-Ogievskiy
2015-11-11 15:16 ` [Qemu-devel] [PATCH 09/13] iotests: maintain several vms in test Vladimir Sementsov-Ogievskiy
2015-11-11 15:16 ` [Qemu-devel] [PATCH 10/13] iotests: add add_incoming_migration to VM class Vladimir Sementsov-Ogievskiy
2015-11-11 15:16 ` [Qemu-devel] [PATCH 11/13] qapi: add md5 checksum of last dirty bitmap level to query-block Vladimir Sementsov-Ogievskiy
2015-11-11 15:16 ` [Qemu-devel] [PATCH 12/13] iotests: add default node-name Vladimir Sementsov-Ogievskiy
2015-11-11 15:16 ` [Qemu-devel] [PATCH 13/13] iotests: add dirty bitmap migration test Vladimir Sementsov-Ogievskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1447255003-2043-8-git-send-email-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=amit.shah@redhat.com \
--cc=den@openvz.org \
--cc=dgilbert@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).