To utilize ft_transaction function, savevm needs interfaces to be exported. Signed-off-by: Yoshiaki Tamura <tamura.yoshiaki@xxxxxxxxxxxxx> --- hw/hw.h | 5 +++++ savevm.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/hw/hw.h b/hw/hw.h index fc9ed29..5a48a91 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -54,6 +54,8 @@ QEMUFile *qemu_fopen_ops(void *opaque, QEMUFilePutBufferFunc *put_buffer, QEMUFile *qemu_fopen(const char *filename, const char *mode); QEMUFile *qemu_fdopen(int fd, const char *mode); QEMUFile *qemu_fopen_socket(int fd); +QEMUFile *qemu_fopen_transaction(int fd); +QEMUFile *qemu_fopen_tranx_sender(void *opaque); QEMUFile *qemu_popen(FILE *popen_file, const char *mode); QEMUFile *qemu_popen_cmd(const char *command, const char *mode); int qemu_stdio_fd(QEMUFile *f); @@ -63,6 +65,9 @@ void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size); void qemu_put_byte(QEMUFile *f, int v); void *qemu_realloc_buffer(QEMUFile *f, int size); void qemu_clear_buffer(QEMUFile *f); +int qemu_transaction_begin(QEMUFile *f); +int qemu_transaction_commit(QEMUFile *f); +int qemu_transaction_cancel(QEMUFile *f); static inline void qemu_put_ubyte(QEMUFile *f, unsigned int v) { diff --git a/savevm.c b/savevm.c index 2ab883b..81cb711 100644 --- a/savevm.c +++ b/savevm.c @@ -82,6 +82,7 @@ #include "migration.h" #include "qemu_socket.h" #include "qemu-queue.h" +#include "ft_transaction.h" /* point to the block driver where the snapshots are managed */ static BlockDriverState *bs_snapshots; @@ -207,6 +208,21 @@ static int socket_get_buffer(void *opaque, uint8_t *buf, int64_t pos, int size) return len; } +static ssize_t socket_put_buffer(void *opaque, const void *buf, size_t size) +{ + QEMUFileSocket *s = opaque; + ssize_t len; + + do { + len = send(s->fd, (void *)buf, size, 0); + } while (len == -1 && socket_error() == EINTR); + + if (len == -1) + len = -socket_error(); + + return len; +} + static int socket_close(void *opaque) { QEMUFileSocket *s = opaque; @@ -335,6 +351,16 @@ QEMUFile *qemu_fopen_socket(int fd) return s->file; } +QEMUFile *qemu_fopen_transaction(int fd) +{ + QEMUFileSocket *s = qemu_mallocz(sizeof(QEMUFileSocket)); + + s->fd = fd; + s->file = qemu_fopen_ops_ft_tranx(s, socket_put_buffer, socket_get_buffer, + socket_close, 0); + return s->file; +} + static int file_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, int size) { @@ -472,6 +498,21 @@ void qemu_clear_buffer(QEMUFile *f) memset(f->buf, 0, f->buf_max_size); } +int qemu_transaction_begin(QEMUFile *f) +{ + return qemu_ft_tranx_begin(f->opaque); +} + +int qemu_transaction_commit(QEMUFile *f) +{ + return qemu_ft_tranx_commit(f->opaque); +} + +int qemu_transaction_cancel(QEMUFile *f) +{ + return qemu_ft_tranx_cancel(f->opaque); +} + static void qemu_fill_buffer(QEMUFile *f) { int len; -- 1.7.0.31.g1df487 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html