Commit 485cbda1 authored by Pavel Emelyanov's avatar Pavel Emelyanov

page-xfer: Sanitize opening page xfer

Make it be explicitly splitted into 2 sub-paths.
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 8f9dd8f7
...@@ -357,11 +357,8 @@ int page_xfer_dump_pages(struct page_xfer *xfer, struct page_pipe *pp, ...@@ -357,11 +357,8 @@ int page_xfer_dump_pages(struct page_xfer *xfer, struct page_pipe *pp,
return 0; return 0;
} }
int open_page_xfer(struct page_xfer *xfer, int fd_type, long id) static int open_page_local_xfer(struct page_xfer *xfer, int fd_type, long id)
{ {
if (opts.use_page_server)
return open_page_server_xfer(xfer, fd_type, id);
xfer->fd = open_image(fd_type, O_DUMP, id); xfer->fd = open_image(fd_type, O_DUMP, id);
if (xfer->fd < 0) if (xfer->fd < 0)
return -1; return -1;
...@@ -378,3 +375,11 @@ int open_page_xfer(struct page_xfer *xfer, int fd_type, long id) ...@@ -378,3 +375,11 @@ int open_page_xfer(struct page_xfer *xfer, int fd_type, long id)
xfer->close = close_page_xfer; xfer->close = close_page_xfer;
return 0; return 0;
} }
int open_page_xfer(struct page_xfer *xfer, int fd_type, long id)
{
if (opts.use_page_server)
return open_page_server_xfer(xfer, fd_type, id);
else
return open_page_local_xfer(xfer, fd_type, id);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment