mirror/xemu
3
0
Fork 0
mirror of https://github.com/mborgerson/xemu.git synced 2025-12-01 16:10:01 +00:00
Code Issues Projects Releases Wiki Activity

migration: Use normal VMStateDescriptions for Subsections

Browse Source 
We create optional sections with this patch.  But we already have
optional subsections.  Instead of having two mechanism that do the
same, we can just generalize it.

For subsections we just change:

- Add a needed function to VMStateDescription
- Remove VMStateSubsection (after removal of the needed function
  it is just a VMStateDescription)
- Adjust the whole tree, moving the needed function to the corresponding
  VMStateDescription

Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Juan Quintela
2014-09-23 14:09:54 +02:00
parent 0163a2e025
commit 5cd8cadae8
32 changed files with 266 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
migration/vmstate.c
View File

@ -341,11 +341,11 @@ void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,
}
static const VMStateDescription *
vmstate_get_subsection(const VMStateSubsection *sub, char *idstr)
vmstate_get_subsection(const VMStateDescription **sub, char *idstr)
{
while (sub && sub->needed) {
if (strcmp(idstr, sub->vmsd->name) == 0) {
return sub->vmsd;
while (sub && *sub && (*sub)->needed) {
if (strcmp(idstr, (*sub)->name) == 0) {
return *sub;
}
sub++;
}
@ -405,12 +405,12 @@ static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd,
static void vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd,
void *opaque, QJSON *vmdesc)
{
const VMStateSubsection *sub = vmsd->subsections;
const VMStateDescription **sub = vmsd->subsections;
bool subsection_found = false;
while (sub && sub->needed) {
if (sub->needed(opaque)) {
const VMStateDescription *vmsd = sub->vmsd;
while (sub && *sub && (*sub)->needed) {
if ((*sub)->needed(opaque)) {
const VMStateDescription *vmsd = *sub;
uint8_t len;
if (vmdesc) {