Commit b3cd91e0 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



migration/next for 20150205

# gpg: Signature made Thu 05 Feb 2015 16:17:08 GMT using RSA key ID 5872D723
# gpg: Can't check signature: public key not found

* remotes/juanquintela/tags/migration/20150205:
  fix mc146818rtc wrong subsection name to avoid vmstate_subsection_load() fail
  Tracify migration/rdma.c
  Add migration stream analyzation script
  migration: Append JSON description of migration stream
  qemu-file: Add fast ftell code path
  QJSON: Add JSON writer
  Print errors in some of the early migration failure cases.
  Migration: Add lots of trace events
  savevm: Convert fprintf to error_report
  vmstate-static-checker: update whitelist

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 651621b7 bb426311

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ common-obj-$(CONFIG_LINUX) += fsdev/ 
common-obj-y += migration/

common-obj-y += qemu-char.o #aio.o

common-obj-y += page_cache.o

common-obj-y += qjson.o



common-obj-$(CONFIG_SPICE) += spice-qemu-char.o

hw/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ void pci_device_save(PCIDevice *s, QEMUFile *f) 
     * This makes us compatible with old devices

     * which never set or clear this bit. */

    s->config[PCI_STATUS] &= ~PCI_STATUS_INTERRUPT;

    vmstate_save_state(f, pci_get_vmstate(s), s);

    vmstate_save_state(f, pci_get_vmstate(s), s, NULL);

    /* Restore the interrupt status bit. */

    pci_update_irq_status(s);

}

hw/scsi/spapr_vscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ static void vscsi_save_request(QEMUFile *f, SCSIRequest *sreq) 
    vscsi_req *req = sreq->hba_private;

    assert(req->active);



    vmstate_save_state(f, &vmstate_spapr_vscsi_req, req);

    vmstate_save_state(f, &vmstate_spapr_vscsi_req, req, NULL);



    DPRINTF("VSCSI: saving tag=%u, current desc#%d, offset=%x\n",

            req->qtag, req->cur_desc_num, req->cur_desc_offset);

hw/timer/mc146818rtc.c

+1 −1
Original line number Diff line number Diff line
@@ -734,7 +734,7 @@ static int rtc_post_load(void *opaque, int version_id) 
}



static const VMStateDescription vmstate_rtc_irq_reinject_on_ack_count = {

    .name = "irq_reinject_on_ack_count",

    .name = "mc146818rtc/irq_reinject_on_ack_count",

    .version_id = 1,

    .minimum_version_id = 1,

    .fields = (VMStateField[]) {

hw/virtio/virtio.c

+1 −1
Original line number Diff line number Diff line
@@ -955,7 +955,7 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f) 
    }



    /* Subsections */

    vmstate_save_state(f, &vmstate_virtio, vdev);

    vmstate_save_state(f, &vmstate_virtio, vdev, NULL);

}



int virtio_set_features(VirtIODevice *vdev, uint32_t val)