[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 10/18] migration/qemu-file: add qemu_put_counted_str
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH 10/18] migration/qemu-file: add qemu_put_counted_string() |
Date: |
Tue, 16 Aug 2016 13:26:07 +0300 |
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 <address@hidden>
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
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 bbc565e..6fcdd68 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -690,6 +690,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
--
1.8.3.1
- [Qemu-block] [PATCH 00/18] Dirty bitmaps postcopy migration, Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 07/18] qapi: add dirty-bitmaps migration capability, Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 17/18] iotests: add dirty bitmap migration test 169, Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 06/18] block: add bdrv_dirty_bitmap_enable_successor(), Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 08/18] block/dirty-bitmap: add bdrv_dirty_bitmap_release_successor, Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 10/18] migration/qemu-file: add qemu_put_counted_string(),
Vladimir Sementsov-Ogievskiy <=
- [Qemu-block] [PATCH 11/18] migration: add is_active_iterate handler, Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 03/18] migration: split common postcopy out of ram postcopy, Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 01/18] migration: add has_postcopy savevm handler, Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 05/18] block: add bdrv_next_dirty_bitmap(), Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 15/18] qapi: add md5 checksum of last dirty bitmap level to query-block, Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 18/18] iotests: add dirty bitmap postcopy test, Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 12/18] migration: add postcopy migration of dirty bitmaps, Vladimir Sementsov-Ogievskiy, 2016/08/16