[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/5] vmstate: add subsections code
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 3/5] vmstate: add subsections code |
Date: |
Tue, 15 Jun 2010 15:31:03 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/hw.h | 6 ++++
savevm.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 95 insertions(+), 1 deletions(-)
diff --git a/hw/hw.h b/hw/hw.h
index a49d866..f3a7a5a 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -311,6 +311,11 @@ typedef struct {
bool (*field_exists)(void *opaque, int version_id);
} VMStateField;
+typedef struct VMStateSubsection {
+ const VMStateDescription *vmsd;
+ bool (*needed)(void *opaque);
+} VMStateSubsection;
+
struct VMStateDescription {
const char *name;
int version_id;
@@ -321,6 +326,7 @@ struct VMStateDescription {
int (*post_load)(void *opaque, int version_id);
void (*pre_save)(void *opaque);
VMStateField *fields;
+ const VMStateSubsection *subsections;
};
extern const VMStateInfo vmstate_info_int8;
diff --git a/savevm.c b/savevm.c
index 1173a22..31f6443 100644
--- a/savevm.c
+++ b/savevm.c
@@ -553,6 +553,19 @@ int qemu_get_buffer(QEMUFile *f, uint8_t *buf, int size1)
return size1 - size;
}
+static int qemu_peek_byte(QEMUFile *f)
+{
+ if (f->is_write)
+ abort();
+
+ if (f->buf_index >= f->buf_size) {
+ qemu_fill_buffer(f);
+ if (f->buf_index >= f->buf_size)
+ return 0;
+ }
+ return f->buf[f->buf_index];
+}
+
int qemu_get_byte(QEMUFile *f)
{
if (f->is_write)
@@ -1130,10 +1143,16 @@ void vmstate_unregister(const VMStateDescription *vmsd,
void *opaque)
}
}
+static void vmstate_subsection_save(QEMUFile *f, const VMStateDescription
*vmsd,
+ void *opaque);
+static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd,
+ void *opaque);
+
int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
void *opaque, int version_id)
{
VMStateField *field = vmsd->fields;
+ int ret;
if (version_id > vmsd->version_id) {
return -EINVAL;
@@ -1155,7 +1174,7 @@ int vmstate_load_state(QEMUFile *f, const
VMStateDescription *vmsd,
(!field->field_exists &&
field->version_id <= version_id)) {
void *base_addr = opaque + field->offset;
- int ret, i, n_elems = 1;
+ int i, n_elems = 1;
int size = field->size;
if (field->flags & VMS_VBUFFER) {
@@ -1193,6 +1212,10 @@ int vmstate_load_state(QEMUFile *f, const
VMStateDescription *vmsd,
}
field++;
}
+ ret = vmstate_subsection_load(f, vmsd, opaque);
+ if (ret != 0) {
+ return ret;
+ }
if (vmsd->post_load) {
return vmsd->post_load(opaque, version_id);
}
@@ -1245,6 +1268,7 @@ void vmstate_save_state(QEMUFile *f, const
VMStateDescription *vmsd,
}
field++;
}
+ vmstate_subsection_save(f, vmsd, opaque);
}
static int vmstate_load(QEMUFile *f, SaveStateEntry *se, int version_id)
@@ -1273,6 +1297,7 @@ static void vmstate_save(QEMUFile *f, SaveStateEntry *se)
#define QEMU_VM_SECTION_PART 0x02
#define QEMU_VM_SECTION_END 0x03
#define QEMU_VM_SECTION_FULL 0x04
+#define QEMU_VM_SUBSECTION 0x05
int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable,
int shared)
@@ -1454,6 +1479,69 @@ static SaveStateEntry *find_se(const char *idstr, int
instance_id)
return NULL;
}
+static const VMStateDescription *vmstate_get_subsection(const
VMStateSubsection *sub, char *idstr)
+{
+ while(sub && sub->needed) {
+ printf("%s == %s\n", idstr, sub->vmsd->name);
+ if (strcmp(idstr, sub->vmsd->name) == 0) {
+ return sub->vmsd;
+ }
+ sub++;
+ }
+ return NULL;
+}
+
+static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd,
+ void *opaque)
+{
+ while (qemu_peek_byte(f) == QEMU_VM_SUBSECTION) {
+ char idstr[256];
+ int ret;
+ uint8_t version_id, subsection, len;
+ const VMStateDescription *sub_vmsd;
+
+ subsection = qemu_get_byte(f);
+ len = qemu_get_byte(f);
+ qemu_get_buffer(f, (uint8_t *)idstr, len);
+ idstr[len] = 0;
+ version_id = qemu_get_be32(f);
+
+ printf("weeee %s\n", idstr);
+ sub_vmsd = vmstate_get_subsection(vmsd->subsections, idstr);
+ if (sub_vmsd == NULL) {
+ return -ENOENT;
+ }
+ printf("weeee %s\n", idstr);
+ ret = vmstate_load_state(f, sub_vmsd, opaque, version_id);
+ if (ret) {
+ return ret;
+ }
+ }
+ return 0;
+}
+
+static void vmstate_subsection_save(QEMUFile *f, const VMStateDescription
*vmsd,
+ void *opaque)
+{
+ const VMStateSubsection *sub = vmsd->subsections;
+
+ while (sub && sub->needed) {
+ if (sub->needed(opaque)) {
+ const VMStateDescription *vmsd = sub->vmsd;
+ uint8_t len;
+
+ qemu_put_byte(f, QEMU_VM_SUBSECTION);
+ len = strlen(vmsd->name);
+ qemu_put_byte(f, len);
+ printf("subsection %s\n", vmsd->name);
+ qemu_put_buffer(f, (uint8_t *)vmsd->name, len);
+ qemu_put_be32(f, vmsd->version_id);
+ vmstate_save_state(f, vmsd, opaque);
+ }
+ sub++;
+ }
+}
+
typedef struct LoadStateEntry {
QLIST_ENTRY(LoadStateEntry) entry;
SaveStateEntry *se;
--
1.6.6.1
- [Qemu-devel] [PATCH 0/5] Migration subsections (and ide as example), Juan Quintela, 2010/06/15
- [Qemu-devel] [PATCH 4/5] ide: fix migration in the middle of pio operation, Juan Quintela, 2010/06/15
- [Qemu-devel] [PATCH 2/5] Revert "ide save/restore current transfer fields", Juan Quintela, 2010/06/15
- [Qemu-devel] [PATCH 3/5] vmstate: add subsections code,
Juan Quintela <=
- [Qemu-devel] [PATCH 1/5] Revert "ide save/restore pio/atapi cmd transfer fields and io buffer", Juan Quintela, 2010/06/15
- [Qemu-devel] [PATCH 5/5] ide: fix migration in the middle of a bmdma transfer, Juan Quintela, 2010/06/15
- Re: [Qemu-devel] [PATCH 0/5] Migration subsections (and ide as example), Anthony Liguori, 2010/06/15