Patchwork [15/19] savevm: introduce qemu_savevm_trans_{begin, commit}.

login
register
mail settings
Submitter Yoshiaki Tamura
Date Jan. 13, 2011, 5:15 p.m.
Message ID <1294938941-9532-16-git-send-email-tamura.yoshiaki@lab.ntt.co.jp>
Download mbox | patch
Permalink /patch/78781/
State New
Headers show

Comments

Yoshiaki Tamura - Jan. 13, 2011, 5:15 p.m.
Introduce qemu_savevm_state_{begin,commit} to send the memory and
device info together, while avoiding cancelling memory state tracking.

Signed-off-by: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp>
---
 savevm.c |   88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sysemu.h |    2 +
 2 files changed, 90 insertions(+), 0 deletions(-)
Blue Swirl - Jan. 13, 2011, 9:16 p.m.
On Thu, Jan 13, 2011 at 5:15 PM, Yoshiaki Tamura
<tamura.yoshiaki@lab.ntt.co.jp> wrote:
> Introduce qemu_savevm_state_{begin,commit} to send the memory and
> device info together, while avoiding cancelling memory state tracking.
>
> Signed-off-by: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp>
> ---
>  savevm.c |   88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  sysemu.h |    2 +
>  2 files changed, 90 insertions(+), 0 deletions(-)
>
> diff --git a/savevm.c b/savevm.c
> index ebb3ef8..9d20c37 100644
> --- a/savevm.c
> +++ b/savevm.c
> @@ -1722,6 +1722,94 @@ int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f)
>     return 0;
>  }
>
> +int qemu_savevm_trans_begin(Monitor *mon, QEMUFile *f, int init)
> +{
> +    SaveStateEntry *se;
> +    int skipped = 0;
> +
> +    QTAILQ_FOREACH(se, &savevm_handlers, entry) {
> +        int len, stage, ret;
> +
> +        if (se->save_live_state == NULL)
> +            continue;

Missing braces.

> +
> +        /* Section type */
> +        qemu_put_byte(f, QEMU_VM_SECTION_START);
> +        qemu_put_be32(f, se->section_id);
> +
> +        /* ID string */
> +        len = strlen(se->idstr);
> +        qemu_put_byte(f, len);
> +        qemu_put_buffer(f, (uint8_t *)se->idstr, len);
> +
> +        qemu_put_be32(f, se->instance_id);
> +        qemu_put_be32(f, se->version_id);
> +
> +        stage = init ? QEMU_VM_SECTION_START : QEMU_VM_SECTION_PART;
> +        ret = se->save_live_state(mon, f, stage, se->opaque);
> +        if (!ret) {
> +            skipped++;
> +        }
> +    }
> +
> +    if (qemu_file_has_error(f))
> +        return -EIO;

Also here

> +
> +    return skipped;
> +}
> +
> +int qemu_savevm_trans_complete(Monitor *mon, QEMUFile *f)
> +{
> +    SaveStateEntry *se;
> +
> +    cpu_synchronize_all_states();
> +
> +    QTAILQ_FOREACH(se, &savevm_handlers, entry) {
> +        int ret;
> +
> +        if (se->save_live_state == NULL)
> +            continue;

here

> +
> +        /* Section type */
> +        qemu_put_byte(f, QEMU_VM_SECTION_PART);
> +        qemu_put_be32(f, se->section_id);
> +
> +        ret = se->save_live_state(mon, f, QEMU_VM_SECTION_PART, se->opaque);
> +        if (!ret) {
> +            /* do not proceed to the next vmstate. */
> +            return 1;
> +        }
> +    }
> +
> +    QTAILQ_FOREACH(se, &savevm_handlers, entry) {
> +        int len;
> +
> +        if (se->save_state == NULL && se->vmsd == NULL)
> +            continue;

here

> +
> +        /* Section type */
> +        qemu_put_byte(f, QEMU_VM_SECTION_FULL);
> +        qemu_put_be32(f, se->section_id);
> +
> +        /* ID string */
> +        len = strlen(se->idstr);
> +        qemu_put_byte(f, len);
> +        qemu_put_buffer(f, (uint8_t *)se->idstr, len);
> +
> +        qemu_put_be32(f, se->instance_id);
> +        qemu_put_be32(f, se->version_id);
> +
> +        vmstate_save(f, se);
> +    }
> +
> +    qemu_put_byte(f, QEMU_VM_EOF);
> +
> +    if (qemu_file_has_error(f))
> +        return -EIO;

and here.
Yoshiaki Tamura - Jan. 14, 2011, 5:29 p.m.
2011/1/14 Blue Swirl <blauwirbel@gmail.com>:
> On Thu, Jan 13, 2011 at 5:15 PM, Yoshiaki Tamura
> <tamura.yoshiaki@lab.ntt.co.jp> wrote:
>> Introduce qemu_savevm_state_{begin,commit} to send the memory and
>> device info together, while avoiding cancelling memory state tracking.
>>
>> Signed-off-by: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp>
>> ---
>>  savevm.c |   88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>>  sysemu.h |    2 +
>>  2 files changed, 90 insertions(+), 0 deletions(-)
>>
>> diff --git a/savevm.c b/savevm.c
>> index ebb3ef8..9d20c37 100644
>> --- a/savevm.c
>> +++ b/savevm.c
>> @@ -1722,6 +1722,94 @@ int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f)
>>     return 0;
>>  }
>>
>> +int qemu_savevm_trans_begin(Monitor *mon, QEMUFile *f, int init)
>> +{
>> +    SaveStateEntry *se;
>> +    int skipped = 0;
>> +
>> +    QTAILQ_FOREACH(se, &savevm_handlers, entry) {
>> +        int len, stage, ret;
>> +
>> +        if (se->save_live_state == NULL)
>> +            continue;
>
> Missing braces.

Thanks:)  I've started using your checkpatch.pl.

Yoshi

>
>> +
>> +        /* Section type */
>> +        qemu_put_byte(f, QEMU_VM_SECTION_START);
>> +        qemu_put_be32(f, se->section_id);
>> +
>> +        /* ID string */
>> +        len = strlen(se->idstr);
>> +        qemu_put_byte(f, len);
>> +        qemu_put_buffer(f, (uint8_t *)se->idstr, len);
>> +
>> +        qemu_put_be32(f, se->instance_id);
>> +        qemu_put_be32(f, se->version_id);
>> +
>> +        stage = init ? QEMU_VM_SECTION_START : QEMU_VM_SECTION_PART;
>> +        ret = se->save_live_state(mon, f, stage, se->opaque);
>> +        if (!ret) {
>> +            skipped++;
>> +        }
>> +    }
>> +
>> +    if (qemu_file_has_error(f))
>> +        return -EIO;
>
> Also here
>
>> +
>> +    return skipped;
>> +}
>> +
>> +int qemu_savevm_trans_complete(Monitor *mon, QEMUFile *f)
>> +{
>> +    SaveStateEntry *se;
>> +
>> +    cpu_synchronize_all_states();
>> +
>> +    QTAILQ_FOREACH(se, &savevm_handlers, entry) {
>> +        int ret;
>> +
>> +        if (se->save_live_state == NULL)
>> +            continue;
>
> here
>
>> +
>> +        /* Section type */
>> +        qemu_put_byte(f, QEMU_VM_SECTION_PART);
>> +        qemu_put_be32(f, se->section_id);
>> +
>> +        ret = se->save_live_state(mon, f, QEMU_VM_SECTION_PART, se->opaque);
>> +        if (!ret) {
>> +            /* do not proceed to the next vmstate. */
>> +            return 1;
>> +        }
>> +    }
>> +
>> +    QTAILQ_FOREACH(se, &savevm_handlers, entry) {
>> +        int len;
>> +
>> +        if (se->save_state == NULL && se->vmsd == NULL)
>> +            continue;
>
> here
>
>> +
>> +        /* Section type */
>> +        qemu_put_byte(f, QEMU_VM_SECTION_FULL);
>> +        qemu_put_be32(f, se->section_id);
>> +
>> +        /* ID string */
>> +        len = strlen(se->idstr);
>> +        qemu_put_byte(f, len);
>> +        qemu_put_buffer(f, (uint8_t *)se->idstr, len);
>> +
>> +        qemu_put_be32(f, se->instance_id);
>> +        qemu_put_be32(f, se->version_id);
>> +
>> +        vmstate_save(f, se);
>> +    }
>> +
>> +    qemu_put_byte(f, QEMU_VM_EOF);
>> +
>> +    if (qemu_file_has_error(f))
>> +        return -EIO;
>
> and here.
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Patch

diff --git a/savevm.c b/savevm.c
index ebb3ef8..9d20c37 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1722,6 +1722,94 @@  int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f)
     return 0;
 }
 
+int qemu_savevm_trans_begin(Monitor *mon, QEMUFile *f, int init)
+{
+    SaveStateEntry *se;
+    int skipped = 0;
+    
+    QTAILQ_FOREACH(se, &savevm_handlers, entry) {
+        int len, stage, ret;
+
+        if (se->save_live_state == NULL)
+            continue;
+
+        /* Section type */
+        qemu_put_byte(f, QEMU_VM_SECTION_START);
+        qemu_put_be32(f, se->section_id);
+
+        /* ID string */
+        len = strlen(se->idstr);
+        qemu_put_byte(f, len);
+        qemu_put_buffer(f, (uint8_t *)se->idstr, len);
+
+        qemu_put_be32(f, se->instance_id);
+        qemu_put_be32(f, se->version_id);
+    
+        stage = init ? QEMU_VM_SECTION_START : QEMU_VM_SECTION_PART;
+        ret = se->save_live_state(mon, f, stage, se->opaque);
+        if (!ret) {
+            skipped++;
+        }
+    }
+
+    if (qemu_file_has_error(f))
+        return -EIO;
+
+    return skipped;
+}
+
+int qemu_savevm_trans_complete(Monitor *mon, QEMUFile *f)
+{
+    SaveStateEntry *se;
+    
+    cpu_synchronize_all_states();
+
+    QTAILQ_FOREACH(se, &savevm_handlers, entry) {
+        int ret;
+
+        if (se->save_live_state == NULL)
+            continue;
+
+        /* Section type */
+        qemu_put_byte(f, QEMU_VM_SECTION_PART);
+        qemu_put_be32(f, se->section_id);
+    
+        ret = se->save_live_state(mon, f, QEMU_VM_SECTION_PART, se->opaque);
+        if (!ret) {
+            /* do not proceed to the next vmstate. */
+            return 1;
+        }
+    }
+
+    QTAILQ_FOREACH(se, &savevm_handlers, entry) {
+        int len;
+
+        if (se->save_state == NULL && se->vmsd == NULL)
+            continue;
+
+        /* Section type */
+        qemu_put_byte(f, QEMU_VM_SECTION_FULL);
+        qemu_put_be32(f, se->section_id);
+
+        /* ID string */
+        len = strlen(se->idstr);
+        qemu_put_byte(f, len);
+        qemu_put_buffer(f, (uint8_t *)se->idstr, len);
+
+        qemu_put_be32(f, se->instance_id);
+        qemu_put_be32(f, se->version_id);
+
+        vmstate_save(f, se);
+    }
+
+    qemu_put_byte(f, QEMU_VM_EOF);
+
+    if (qemu_file_has_error(f))
+        return -EIO;
+
+    return 0;
+}
+
 void qemu_savevm_state_cancel(Monitor *mon, QEMUFile *f)
 {
     SaveStateEntry *se;
diff --git a/sysemu.h b/sysemu.h
index 81bcf00..9c2c45e 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -80,6 +80,8 @@  int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable,
 int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f);
 int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f);
 void qemu_savevm_state_cancel(Monitor *mon, QEMUFile *f);
+int qemu_savevm_trans_begin(Monitor *mon, QEMUFile *f, int init);
+int qemu_savevm_trans_complete(Monitor *mon, QEMUFile *f);
 int qemu_loadvm_state(QEMUFile *f, int skip_header);
 
 /* SLIRP */