diff options
| author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2015-05-19 12:29:51 +0100 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2015-06-12 06:54:01 +0200 |
| commit | 37fb569c0198cba58e3e1bdf6b9702c8248b89dd (patch) | |
| tree | 413b7e62608c18abc60bb11418f77344babee278 | |
| parent | ce39bfc9186005d222a78db4a7fbdc83e2d62481 (diff) | |
| download | focaccia-qemu-37fb569c0198cba58e3e1bdf6b9702c8248b89dd.tar.gz focaccia-qemu-37fb569c0198cba58e3e1bdf6b9702c8248b89dd.zip | |
Disable section footers on older machine types
The next patch adds section footers; but we don't want to break migration compatibility so disable them on older machine types Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
| -rw-r--r-- | hw/i386/pc_piix.c | 2 | ||||
| -rw-r--r-- | hw/i386/pc_q35.c | 2 | ||||
| -rw-r--r-- | include/migration/migration.h | 2 | ||||
| -rw-r--r-- | migration/savevm.c | 7 |
4 files changed, 12 insertions, 1 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 5253e6d4fa..e142f75649 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -52,6 +52,7 @@ #ifdef CONFIG_XEN # include <xen/hvm/hvm_info_table.h> #endif +#include "migration/migration.h" #define MAX_IDE_BUS 2 @@ -305,6 +306,7 @@ static void pc_init1(MachineState *machine) static void pc_compat_2_3(MachineState *machine) { + savevm_skip_section_footers(); } static void pc_compat_2_2(MachineState *machine) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 110dfb78a8..b68263d231 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -45,6 +45,7 @@ #include "hw/usb.h" #include "hw/cpu/icc_bus.h" #include "qemu/error-report.h" +#include "migration/migration.h" /* ICH9 AHCI has 6 ports */ #define MAX_SATA_PORTS 6 @@ -289,6 +290,7 @@ static void pc_q35_init(MachineState *machine) static void pc_compat_2_3(MachineState *machine) { + savevm_skip_section_footers(); } static void pc_compat_2_2(MachineState *machine) diff --git a/include/migration/migration.h b/include/migration/migration.h index 720a949f0b..7bdaf5593e 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -194,6 +194,6 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset, ram_addr_t offset, size_t size, uint64_t *bytes_sent); - void ram_mig_init(void); +void savevm_skip_section_footers(void); #endif diff --git a/migration/savevm.c b/migration/savevm.c index 2942ed6563..80c4389ac4 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -55,6 +55,8 @@ #define ARP_PTYPE_IP 0x0800 #define ARP_OP_REQUEST_REV 0x3 +static bool skip_section_footers; + static int announce_self_create(uint8_t *buf, uint8_t *mac_addr) { @@ -611,6 +613,11 @@ static void vmstate_save(QEMUFile *f, SaveStateEntry *se, QJSON *vmdesc) vmstate_save_state(f, se->vmsd, se->opaque, vmdesc); } +void savevm_skip_section_footers(void) +{ + skip_section_footers = true; +} + /* * Write the header for device section (QEMU_VM_SECTION START/END/PART/FULL) */ |