Commit 0bbac626 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140616' into staging 



migration/next for 20140616

# gpg: Signature made Mon 16 Jun 2014 04:10:18 BST using RSA key ID 5872D723
# gpg: Can't check signature: public key not found

* remotes/juanquintela/tags/migration/20140616:
  migration: catch unknown flags in ram_load
  rdma: Fix block during rdma migration
  migration: Increase default max_downtime from 30ms to 300ms
  vmstate: Refactor opening of files
  savevm: Remove all the unneeded version_minimum_id_old (x86)
  savevm: Remove all the unneeded version_minimum_id_old (ppc)

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 06a59afa db80face

arch_init.c

+23 −19
Original line number Diff line number Diff line
@@ -1040,17 +1040,15 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) 
{

    ram_addr_t addr;

    int flags, ret = 0;

    int error;

    static uint64_t seq_iter;



    seq_iter++;



    if (version_id != 4) {

        ret = -EINVAL;

        goto done;

    }



    do {

    while (!ret) {

        addr = qemu_get_be64(f);



        flags = addr & ~TARGET_PAGE_MASK;
@@ -1078,7 +1076,6 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) 
                                         " in != " RAM_ADDR_FMT, id, length,

                                         block->length);

                            ret =  -EINVAL;

                            goto done;

                        }

                        break;

                    }
@@ -1088,21 +1085,22 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) 
                    error_report("Unknown ramblock \"%s\", cannot "

                                 "accept migration", id);

                    ret = -EINVAL;

                    goto done;

                }

                if (ret) {

                    break;

                }



                total_ram_bytes -= length;

            }

        }



        if (flags & RAM_SAVE_FLAG_COMPRESS) {

        } else if (flags & RAM_SAVE_FLAG_COMPRESS) {

            void *host;

            uint8_t ch;



            host = host_from_stream_offset(f, addr, flags);

            if (!host) {

                error_report("Illegal RAM offset " RAM_ADDR_FMT, addr);

                ret = -EINVAL;

                goto done;

                break;

            }



            ch = qemu_get_byte(f);
@@ -1112,33 +1110,39 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) 


            host = host_from_stream_offset(f, addr, flags);

            if (!host) {

                error_report("Illegal RAM offset " RAM_ADDR_FMT, addr);

                ret = -EINVAL;

                goto done;

                break;

            }



            qemu_get_buffer(f, host, TARGET_PAGE_SIZE);

        } else if (flags & RAM_SAVE_FLAG_XBZRLE) {

            void *host = host_from_stream_offset(f, addr, flags);

            if (!host) {

                error_report("Illegal RAM offset " RAM_ADDR_FMT, addr);

                ret = -EINVAL;

                goto done;

                break;

            }



            if (load_xbzrle(f, addr, host) < 0) {

                error_report("Failed to decompress XBZRLE page at "

                             RAM_ADDR_FMT, addr);

                ret = -EINVAL;

                goto done;

                break;

            }

        } else if (flags & RAM_SAVE_FLAG_HOOK) {

            ram_control_load_hook(f, flags);

        } else if (flags & RAM_SAVE_FLAG_EOS) {

            /* normal exit */

            break;

        } else {

            error_report("Unknown migration flags: %#x", flags);

            ret = -EINVAL;

            break;

        }

        error = qemu_file_get_error(f);

        if (error) {

            ret = error;

            goto done;

        ret = qemu_file_get_error(f);

    }

    } while (!(flags & RAM_SAVE_FLAG_EOS));



done:

    DPRINTF("Completed load of VM with exit code %d seq iteration "

            "%" PRIu64 "\n", ret, seq_iter);

    return ret;

hw/acpi/ich9.c

+0 −1
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ const VMStateDescription vmstate_ich9_pm = { 
    .name = "ich9_pm",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .post_load = ich9_pm_post_load,

    .fields = (VMStateField[]) {

        VMSTATE_UINT16(acpi_regs.pm1.evt.sts, ICH9LPCPMRegs),

hw/acpi/pcihp.c

+1 −2
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ const VMStateDescription vmstate_acpi_pcihp_pci_status = { 
    .name = "acpi_pcihp_pci_status",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields = (VMStateField[]) {

        VMSTATE_UINT32(up, AcpiPciHpPciStatus),

        VMSTATE_UINT32(down, AcpiPciHpPciStatus),

hw/acpi/piix4.c

+3 −5
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ static const VMStateDescription vmstate_gpe = { 
    .name = "gpe",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields = (VMStateField[]) {

        VMSTATE_GPE_ARRAY(sts, ACPIGPE),

        VMSTATE_GPE_ARRAY(en, ACPIGPE),
@@ -189,7 +188,6 @@ static const VMStateDescription vmstate_pci_status = { 
    .name = "pci_status",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields = (VMStateField[]) {

        VMSTATE_UINT32(up, struct AcpiPciHpPciStatus),

        VMSTATE_UINT32(down, struct AcpiPciHpPciStatus),

hw/audio/ac97.c

+2 −4
Original line number Diff line number Diff line
@@ -1163,7 +1163,6 @@ static const VMStateDescription vmstate_ac97_bm_regs = { 
    .name = "ac97_bm_regs",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields = (VMStateField[]) {

        VMSTATE_UINT32 (bdbar, AC97BusMasterRegs),

        VMSTATE_UINT8 (civ, AC97BusMasterRegs),
@@ -1211,7 +1210,6 @@ static const VMStateDescription vmstate_ac97 = { 
    .name = "ac97",

    .version_id = 3,

    .minimum_version_id = 2,

    .minimum_version_id_old = 2,

    .post_load = ac97_post_load,

    .fields = (VMStateField[]) {

        VMSTATE_PCI_DEVICE (dev, AC97LinkState),