[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/13] migration/qemu-file: add qemu_put_counted_stri
From: |
John Snow |
Subject: |
[Qemu-devel] [PULL 08/13] migration/qemu-file: add qemu_put_counted_string() |
Date: |
Tue, 13 Mar 2018 17:14:36 -0400 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
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 <address@hidden>
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Message-id: address@hidden
---
migration/qemu-file.c | 13 +++++++++++++
migration/qemu-file.h | 2 ++
2 files changed, 15 insertions(+)
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 2ab2bf362d..e85f501f86 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -733,6 +733,19 @@ size_t qemu_get_counted_string(QEMUFile *f, char buf[256])
return res == len ? res : 0;
}
+/*
+ * 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
diff --git a/migration/qemu-file.h b/migration/qemu-file.h
index aae4e5ed36..f4f356ab12 100644
--- a/migration/qemu-file.h
+++ b/migration/qemu-file.h
@@ -174,4 +174,6 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t
block_offset,
ram_addr_t offset, size_t size,
uint64_t *bytes_sent);
+void qemu_put_counted_string(QEMUFile *f, const char *name);
+
#endif
--
2.14.3
- [Qemu-devel] [PULL 00/13] Bitmaps patches, John Snow, 2018/03/13
- [Qemu-devel] [PULL 10/13] migration: allow qmp command migrate-start-postcopy for any postcopy, John Snow, 2018/03/13
- [Qemu-devel] [PULL 03/13] block/dirty-bitmap: add _locked version of bdrv_reclaim_dirty_bitmap, John Snow, 2018/03/13
- [Qemu-devel] [PULL 08/13] migration/qemu-file: add qemu_put_counted_string(),
John Snow <=
- [Qemu-devel] [PULL 09/13] migration: add is_active_iterate handler, John Snow, 2018/03/13
- [Qemu-devel] [PULL 05/13] migration: introduce postcopy-only pending, John Snow, 2018/03/13
- [Qemu-devel] [PULL 02/13] block/dirty-bitmap: fix locking in bdrv_reclaim_dirty_bitmap, John Snow, 2018/03/13
- [Qemu-devel] [PULL 01/13] block/dirty-bitmap: add bdrv_dirty_bitmap_enable_successor(), John Snow, 2018/03/13
- [Qemu-devel] [PULL 06/13] qapi: add dirty-bitmaps migration capability, John Snow, 2018/03/13
- [Qemu-devel] [PULL 07/13] migration: include migrate_dirty_bitmaps in migrate_postcopy, John Snow, 2018/03/13
- [Qemu-devel] [PULL 04/13] dirty-bitmap: add locked state, John Snow, 2018/03/13
- [Qemu-devel] [PULL 13/13] iotests: add dirty bitmap postcopy test, John Snow, 2018/03/13
- [Qemu-devel] [PULL 12/13] iotests: add dirty bitmap migration test, John Snow, 2018/03/13
- [Qemu-devel] [PULL 11/13] migration: add postcopy migration of dirty bitmaps, John Snow, 2018/03/13