From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaBnn-0006ng-1A for qemu-devel@nongnu.org; Thu, 10 Sep 2015 20:02:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZaBnj-0002gg-0H for qemu-devel@nongnu.org; Thu, 10 Sep 2015 20:02:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42752) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaBni-0002ff-Rs for qemu-devel@nongnu.org; Thu, 10 Sep 2015 20:02:46 -0400 References: <1438939964-12584-1-git-send-email-vsementsov@virtuozzo.com> <1438939964-12584-8-git-send-email-vsementsov@virtuozzo.com> From: John Snow Message-ID: <55F21A24.8010104@redhat.com> Date: Thu, 10 Sep 2015 20:02:44 -0400 MIME-Version: 1.0 In-Reply-To: <1438939964-12584-8-git-send-email-vsementsov@virtuozzo.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 07/12] migration/qemu-file: add qemu_put_counted_string() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, quintela@redhat.com, dgilbert@redhat.com, vsementsov@parallels.com, stefanha@redhat.com, pbonzini@redhat.com, amit.shah@redhat.com, den@openvz.org On 08/07/2015 05:32 AM, Vladimir Sementsov-Ogievskiy 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. > > Signed-off-by: Vladimir Sementsov-Ogievskiy > --- > include/migration/qemu-file.h | 2 ++ > migration/qemu-file.c | 9 +++++++++ > 2 files changed, 11 insertions(+) > > diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h > index ea49f33..cfbbdcb 100644 > --- a/include/migration/qemu-file.h > +++ b/include/migration/qemu-file.h > @@ -319,4 +319,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 6bb3dc1..206cb54 100644 > --- a/migration/qemu-file.c > +++ b/migration/qemu-file.c > @@ -611,3 +611,12 @@ size_t qemu_get_counted_string(QEMUFile *f, char buf[256]) > > return res == len ? res : 0; > } > + > +void qemu_put_counted_string(QEMUFile *f, const char *name) > +{ > + int len = strlen(name); > + > + assert(len < 256); > + qemu_put_byte(f, len); > + qemu_put_buffer(f, (const uint8_t *)name, len); > +} > Reviewed-by: John Snow