Merge remote-tracking branch 'remotes/amit-migration/tags/migration-for-2.6-1' into...

[qemu.git] / migration / qemu-file-buf.c

diff --git a/migration/qemu-file-buf.c b/migration/qemu-file-buf.c
index d33dd44747daf7c649a5ef5bf8189557a0ccc321..49516b8643a35455a1f807dfe8c26110b6ca425f 100644 (file)
--- a/migration/qemu-file-buf.c
+++ b/migration/qemu-file-buf.c
@@ -2,6 +2,10 @@
  * QEMU System Emulator
  *
  * Copyright (c) 2003-2008 Fabrice Bellard
  * QEMU System Emulator
  *
  * Copyright (c) 2003-2008 Fabrice Bellard

+ * Copyright (c) 2014 IBM Corp.
+ *
+ * Authors:
+ *  Stefan Berger <[email protected]>

  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal


@@ -22,9 +26,10 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
  * THE SOFTWARE.
  */
 #include "qemu-common.h"

+#include "qemu/error-report.h"

 #include "qemu/iov.h"
 #include "qemu/sockets.h"
 #include "qemu/iov.h"
 #include "qemu/sockets.h"

-#include "block/coroutine.h"
+#include "qemu/coroutine.h"

 #include "migration/migration.h"
 #include "migration/qemu-file.h"
 #include "migration/qemu-file-internal.h"
 #include "migration/migration.h"
 #include "migration/qemu-file.h"
 #include "migration/qemu-file-internal.h"


@@ -361,43 +366,14 @@ ssize_t qsb_write_at(QEMUSizedBuffer *qsb, const uint8_t *source,
     return count;
 }
 
     return count;
 }
 

-/**
- * Create a deep copy of the given QEMUSizedBuffer.
- *
- * @qsb: A QEMUSizedBuffer
- *
- * Returns a clone of @qsb or NULL on allocation failure
- */
-QEMUSizedBuffer *qsb_clone(const QEMUSizedBuffer *qsb)
-{
-    QEMUSizedBuffer *out = qsb_create(NULL, qsb_get_length(qsb));
-    size_t i;
-    ssize_t res;
-    off_t pos = 0;
-
-    if (!out) {
-        return NULL;
-    }
-
-    for (i = 0; i < qsb->n_iov; i++) {
-        res =  qsb_write_at(out, qsb->iov[i].iov_base,
-                            pos, qsb->iov[i].iov_len);
-        if (res < 0) {
-            qsb_free(out);
-            return NULL;
-        }
-        pos += res;
-    }
-
-    return out;
-}
-

 typedef struct QEMUBuffer {
     QEMUSizedBuffer *qsb;
     QEMUFile *file;
 typedef struct QEMUBuffer {
     QEMUSizedBuffer *qsb;
     QEMUFile *file;

+    bool qsb_allocated;

 } QEMUBuffer;
 
 } QEMUBuffer;
 

-static int buf_get_buffer(void *opaque, uint8_t *buf, int64_t pos, int size)
+static ssize_t buf_get_buffer(void *opaque, uint8_t *buf, int64_t pos,
+                              size_t size)

 {
     QEMUBuffer *s = opaque;
     ssize_t len = qsb_get_length(s->qsb) - pos;
 {
     QEMUBuffer *s = opaque;
     ssize_t len = qsb_get_length(s->qsb) - pos;


@@ -412,8 +388,8 @@ static int buf_get_buffer(void *opaque, uint8_t *buf, int64_t pos, int size)
     return qsb_get_buffer(s->qsb, pos, len, buf);
 }
 
     return qsb_get_buffer(s->qsb, pos, len, buf);
 }
 

-static int buf_put_buffer(void *opaque, const uint8_t *buf,
-                          int64_t pos, int size)
+static ssize_t buf_put_buffer(void *opaque, const uint8_t *buf,
+                              int64_t pos, size_t size)

 {
     QEMUBuffer *s = opaque;
 
 {
     QEMUBuffer *s = opaque;
 


@@ -424,7 +400,9 @@ static int buf_close(void *opaque)
 {
     QEMUBuffer *s = opaque;
 
 {
     QEMUBuffer *s = opaque;
 

-    qsb_free(s->qsb);
+    if (s->qsb_allocated) {
+        qsb_free(s->qsb);
+    }

 
     g_free(s);
 
 
     g_free(s);
 


@@ -462,13 +440,12 @@ QEMUFile *qemu_bufopen(const char *mode, QEMUSizedBuffer *input)
         return NULL;
     }
 
         return NULL;
     }
 

-    s = g_malloc0(sizeof(QEMUBuffer));
-    if (mode[0] == 'r') {
-        s->qsb = input;
-    }
+    s = g_new0(QEMUBuffer, 1);
+    s->qsb = input;

 
     if (s->qsb == NULL) {
         s->qsb = qsb_create(NULL, 0);
 
     if (s->qsb == NULL) {
         s->qsb = qsb_create(NULL, 0);

+        s->qsb_allocated = true;

     }
     if (!s->qsb) {
         g_free(s);
     }
     if (!s->qsb) {
         g_free(s);