From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QmmoI-00045C-Oq for qemu-devel@nongnu.org; Fri, 29 Jul 2011 09:09:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QmmoH-0004op-J1 for qemu-devel@nongnu.org; Fri, 29 Jul 2011 09:09:02 -0400 Received: from mail-gw0-f45.google.com ([74.125.83.45]:49372) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QmmoH-0004ol-GP for qemu-devel@nongnu.org; Fri, 29 Jul 2011 09:09:01 -0400 Received: by gwb19 with SMTP id 19so3213098gwb.4 for ; Fri, 29 Jul 2011 06:09:00 -0700 (PDT) Message-ID: <4E32B0E7.3060204@codemonkey.ws> Date: Fri, 29 Jul 2011 08:08:55 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1309448777-1447-1-git-send-email-pbonzini@redhat.com> <1309448777-1447-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1309448777-1447-2-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [RFC PATCH 1/4] add support for machine models to specify their migration format List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org On 06/30/2011 10:46 AM, Paolo Bonzini wrote: > We need to provide a new migration format, and not break migration > in old machine models. So add a migration_format field to QEMUMachine. > > Signed-off-by: Paolo Bonzini > --- > cpu-common.h | 3 --- > hw/boards.h | 1 + > qemu-common.h | 3 +++ > savevm.c | 7 +++++-- > 4 files changed, 9 insertions(+), 5 deletions(-) > > diff --git a/cpu-common.h b/cpu-common.h > index b027e43..8c06dbb 100644 > --- a/cpu-common.h > +++ b/cpu-common.h > @@ -26,9 +26,6 @@ enum device_endian { > DEVICE_LITTLE_ENDIAN, > }; > > -/* address in the RAM (different from a physical address) */ > -typedef unsigned long ram_addr_t; > - > /* memory API */ > > typedef void CPUWriteMemoryFunc(void *opaque, target_phys_addr_t addr, uint32_t value); > diff --git a/hw/boards.h b/hw/boards.h > index 716fd7b..560dbaf 100644 > --- a/hw/boards.h > +++ b/hw/boards.h > @@ -19,6 +19,7 @@ typedef struct QEMUMachine { > QEMUMachineInitFunc *init; > int use_scsi; > int max_cpus; > + unsigned migration_format; > unsigned int no_serial:1, > no_parallel:1, > use_virtcon:1, > diff --git a/qemu-common.h b/qemu-common.h > index 109498d..550fe2c 100644 > --- a/qemu-common.h > +++ b/qemu-common.h > @@ -119,6 +119,9 @@ static inline char *realpath(const char *path, char *resolved_path) > #define PRIo64 "I64o" > #endif > > +/* address in the RAM (different from a physical address) */ > +typedef unsigned long ram_addr_t; > + > /* FIXME: Remove NEED_CPU_H. */ > #ifndef NEED_CPU_H > > diff --git a/savevm.c b/savevm.c > index 8139bc7..74e6e99 100644 > --- a/savevm.c > +++ b/savevm.c > @@ -72,6 +72,7 @@ > #include "qemu-common.h" > #include "hw/hw.h" > #include "hw/qdev.h" > +#include "hw/boards.h" > #include "net.h" > #include "monitor.h" > #include "sysemu.h" > @@ -1474,7 +1475,7 @@ int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, > } > > qemu_put_be32(f, QEMU_VM_FILE_MAGIC); > - qemu_put_be32(f, QEMU_VM_FILE_VERSION); > + qemu_put_be32(f, current_machine->migration_format ?: QEMU_VM_FILE_VERSION); Please avoid this gcc extension as it's relatively obscure. But in addition, why would use you 0 as the new format instead of QEMU_VM_FILE_VERSION + 1? Regards, Anthony Liguori > QTAILQ_FOREACH(se,&savevm_handlers, entry) { > int len; > @@ -1747,8 +1748,10 @@ int qemu_loadvm_state(QEMUFile *f) > fprintf(stderr, "SaveVM v2 format is obsolete and don't work anymore\n"); > return -ENOTSUP; > } > - if (v != QEMU_VM_FILE_VERSION) > + if (v != (current_machine->migration_format ?: QEMU_VM_FILE_VERSION)) { > + fprintf(stderr, "Mismatching SaveVM format v%d\n", v); > return -ENOTSUP; > + } > > while ((section_type = qemu_get_byte(f)) != QEMU_VM_EOF) { > uint32_t instance_id, version_id, section_id;