| Message ID | 20190725032321.12721-6-alxndr@bu.edu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add virtual device fuzzing support | expand |
* Oleinik, Alexander (alxndr@bu.edu) wrote: > Signed-off-by: Alexander Oleinik <alxndr@bu.edu> > --- > migration/savevm.c | 8 ++++++-- > migration/savevm.h | 3 +++ > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/migration/savevm.c b/migration/savevm.c > index 79ed44d475..80c00ea560 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -1404,8 +1404,11 @@ void qemu_savevm_state_cleanup(void) > } > } > } > - > +#ifdef CONFIG_FUZZ > +int qemu_savevm_state(QEMUFile *f, Error **errp) > +#else > static int qemu_savevm_state(QEMUFile *f, Error **errp) > +#endif If it's useful to you, I'd rather you just dropped the 'static' rather than add the ifdef. > { > int ret; > MigrationState *ms = migrate_get_current(); > @@ -1471,11 +1474,12 @@ void qemu_savevm_live_state(QEMUFile *f) > int qemu_save_device_state(QEMUFile *f) > { > SaveStateEntry *se; > - > +#ifndef CONFIG_FUZZ > if (!migration_in_colo_state()) { > qemu_put_be32(f, QEMU_VM_FILE_MAGIC); > qemu_put_be32(f, QEMU_VM_FILE_VERSION); > } > +#endif Can you explain why you want to skip the header? Dave > cpu_synchronize_all_states(); > > QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { > diff --git a/migration/savevm.h b/migration/savevm.h > index 51a4b9caa8..30315d0cfd 100644 > --- a/migration/savevm.h > +++ b/migration/savevm.h > @@ -64,4 +64,7 @@ void qemu_loadvm_state_cleanup(void); > int qemu_loadvm_state_main(QEMUFile *f, MigrationIncomingState *mis); > int qemu_load_device_state(QEMUFile *f); > > +#ifdef CONFIG_FUZZ > +int qemu_savevm_state(QEMUFile *f, Error **errp); > +#endif > #endif > -- > 2.20.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/migration/savevm.c b/migration/savevm.c index 79ed44d475..80c00ea560 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1404,8 +1404,11 @@ void qemu_savevm_state_cleanup(void) } } } - +#ifdef CONFIG_FUZZ +int qemu_savevm_state(QEMUFile *f, Error **errp) +#else static int qemu_savevm_state(QEMUFile *f, Error **errp) +#endif { int ret; MigrationState *ms = migrate_get_current(); @@ -1471,11 +1474,12 @@ void qemu_savevm_live_state(QEMUFile *f) int qemu_save_device_state(QEMUFile *f) { SaveStateEntry *se; - +#ifndef CONFIG_FUZZ if (!migration_in_colo_state()) { qemu_put_be32(f, QEMU_VM_FILE_MAGIC); qemu_put_be32(f, QEMU_VM_FILE_VERSION); } +#endif cpu_synchronize_all_states(); QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { diff --git a/migration/savevm.h b/migration/savevm.h index 51a4b9caa8..30315d0cfd 100644 --- a/migration/savevm.h +++ b/migration/savevm.h @@ -64,4 +64,7 @@ void qemu_loadvm_state_cleanup(void); int qemu_loadvm_state_main(QEMUFile *f, MigrationIncomingState *mis); int qemu_load_device_state(QEMUFile *f); +#ifdef CONFIG_FUZZ +int qemu_savevm_state(QEMUFile *f, Error **errp); +#endif #endif
Signed-off-by: Alexander Oleinik <alxndr@bu.edu> --- migration/savevm.c | 8 ++++++-- migration/savevm.h | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-)