Message ID | 1479837270-79005-11-git-send-email-vsementsov@virtuozzo.com |
---|---|
State | New |
Headers | show |
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> wrote: > 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> Reviewed-by: Juan Quintela <quintela@redhat.com>
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