From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 3/4] tools/libxl: Identify copywhat in stream v2 datacopiers Date: Fri, 17 Jul 2015 17:51:17 +0100 Message-ID: <1437151878-11792-4-git-send-email-andrew.cooper3@citrix.com> References: <1437151878-11792-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1437151878-11792-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Andrew Cooper , Ian Jackson , Ian Campbell , Wei Liu List-Id: xen-devel@lists.xenproject.org This is an aid to debugging Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu --- tools/libxl/libxl_stream_read.c | 18 ++++++++++-------- tools/libxl/libxl_stream_write.c | 4 +++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/tools/libxl/libxl_stream_read.c b/tools/libxl/libxl_stream_read.c index 2d17403..3e1cd2a 100644 --- a/tools/libxl/libxl_stream_read.c +++ b/tools/libxl/libxl_stream_read.c @@ -223,9 +223,10 @@ void libxl__stream_read_start(libxl__egc *egc, } /* stream->fd is now a v2 stream. */ - dc->ao = stream->ao; - dc->readfd = stream->fd; - dc->writefd = -1; + dc->ao = stream->ao; + dc->copywhat = "restore v2 stream"; + dc->readfd = stream->fd; + dc->writefd = -1; /* Start reading the stream header. */ rc = setup_read(stream, "stream header", @@ -606,11 +607,12 @@ static void write_emulator_blob(libxl__egc *egc, } FILLZERO(*dc); - dc->ao = stream->ao; - dc->writewhat = "qemu save file"; - dc->writefd = writefd; - dc->maxsz = -1; - dc->callback = write_emulator_done; + dc->ao = stream->ao; + dc->writewhat = "qemu save file"; + dc->copywhat = "restore v2 stream"; + dc->writefd = writefd; + dc->maxsz = -1; + dc->callback = write_emulator_done; rc = libxl__datacopier_start(dc); if (rc) diff --git a/tools/libxl/libxl_stream_write.c b/tools/libxl/libxl_stream_write.c index 944a87b..94f681b 100644 --- a/tools/libxl/libxl_stream_write.c +++ b/tools/libxl/libxl_stream_write.c @@ -180,7 +180,8 @@ void libxl__stream_write_start(libxl__egc *egc, dc->ao = ao; dc->readfd = -1; - dc->writewhat = "save/migration stream"; + dc->writewhat = "stream header"; + dc->copywhat = "save v2 stream"; dc->writefd = stream->fd; dc->maxsz = -1; dc->callback = stream_header_done; @@ -386,6 +387,7 @@ static void write_emulator_record(libxl__egc *egc, FILLZERO(*dc); dc->ao = stream->ao; dc->readwhat = "qemu save file"; + dc->copywhat = "save v2 stream"; dc->readfd = readfd; dc->maxsz = -1; dc->readbuf = stream->emu_body + sizeof(*ehdr); -- 1.7.10.4