Commit 206d0c24 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 



pc, pci, virtio: new features, cleanups, fixes

- interrupt remapping for intel iommus
- a bunch of virtio cleanups
- fixes all over the place

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Thu 21 Jul 2016 18:49:30 BST
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream: (57 commits)
  intel_iommu: avoid unnamed fields
  virtio: Update migration docs
  virtio-gpu: Wrap in vmstate
  virtio-gpu: Use migrate_add_blocker for virgl migration blocking
  virtio-input: Wrap in vmstate
  9pfs: Wrap in vmstate
  virtio-serial: Wrap in vmstate
  virtio-net: Wrap in vmstate
  virtio-balloon: Wrap in vmstate
  virtio-rng: Wrap in vmstate
  virtio-blk: Wrap in vmstate
  virtio-scsi: Wrap in vmstate
  virtio: Migration helper function and macro
  virtio-serial: Remove old migration version support
  virtio-net: Remove old migration version support
  virtio-scsi: Replace HandleOutput typedef
  Revert "mirror: Workaround for unexpected iohandler events during completion"
  virtio-scsi: Call virtio_add_queue_aio
  virtio-blk: Call virtio_add_queue_aio
  virtio: Introduce virtio_add_queue_aio
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7239247a bc38ee10

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ trace-events-y += hw/alpha/trace-events 
trace-events-y += ui/trace-events

trace-events-y += audio/trace-events

trace-events-y += net/trace-events

trace-events-y += target-i386/trace-events

trace-events-y += target-sparc/trace-events

trace-events-y += target-s390x/trace-events

trace-events-y += target-ppc/trace-events

block/mirror.c

+0 −9
Original line number Diff line number Diff line
@@ -521,9 +521,6 @@ static void mirror_exit(BlockJob *job, void *opaque) 
    block_job_completed(&s->common, data->ret);

    g_free(data);

    bdrv_drained_end(src);

    if (qemu_get_aio_context() == bdrv_get_aio_context(src)) {

        aio_enable_external(iohandler_get_aio_context());

    }

    bdrv_unref(src);

}
@@ -793,12 +790,6 @@ immediate_exit: 
    /* Before we switch to target in mirror_exit, make sure data doesn't

     * change. */

    bdrv_drained_begin(bs);

    if (qemu_get_aio_context() == bdrv_get_aio_context(bs)) {

        /* FIXME: virtio host notifiers run on iohandler_ctx, therefore the

         * above bdrv_drained_end isn't enough to quiesce it. This is ugly, we

         * need a block layer API change to achieve this. */

        aio_disable_external(iohandler_get_aio_context());

    }

    block_job_defer_to_main_loop(&s->common, mirror_exit, data);

}

docs/virtio-migration.txt

+4 −2
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ virtio core virtio transport virtio device 
-----------               ----------------          -------------



                                                    save() function registered

                                                    via register_savevm()

                                                    via VMState wrapper on

                                                    device class

virtio_save()                                       <----------

             ------>      save_config()

                          - save proxy device
@@ -63,7 +64,8 @@ virtio core virtio transport virtio device 
-----------               ----------------          -------------



                                                    load() function registered

                                                    via register_savevm()

                                                    via VMState wrapper on

                                                    device class

virtio_load()                                       <----------

             ------>      load_config()

                          - load proxy device

hw/9pfs/virtio-9p-device.c

+5 −9
Original line number Diff line number Diff line
@@ -97,14 +97,9 @@ static void virtio_9p_get_config(VirtIODevice *vdev, uint8_t *config) 
    g_free(cfg);

}



static void virtio_9p_save(QEMUFile *f, void *opaque)

static int virtio_9p_load(QEMUFile *f, void *opaque, size_t size)

{

    virtio_save(VIRTIO_DEVICE(opaque), f);

}



static int virtio_9p_load(QEMUFile *f, void *opaque, int version_id)

{

    return virtio_load(VIRTIO_DEVICE(opaque), f, version_id);

    return virtio_load(VIRTIO_DEVICE(opaque), f, 1);

}



static void virtio_9p_device_realize(DeviceState *dev, Error **errp)
@@ -120,7 +115,6 @@ static void virtio_9p_device_realize(DeviceState *dev, Error **errp) 
    v->config_size = sizeof(struct virtio_9p_config) + strlen(s->fsconf.tag);

    virtio_init(vdev, "virtio-9p", VIRTIO_ID_9P, v->config_size);

    v->vq = virtio_add_queue(vdev, MAX_REQ, handle_9p_output);

    register_savevm(dev, "virtio-9p", -1, 1, virtio_9p_save, virtio_9p_load, v);



out:

    return;
@@ -133,7 +127,6 @@ static void virtio_9p_device_unrealize(DeviceState *dev, Error **errp) 
    V9fsState *s = &v->state;



    virtio_cleanup(vdev);

    unregister_savevm(dev, "virtio-9p", v);

    v9fs_device_unrealize_common(s, errp);

}
@@ -175,6 +168,8 @@ void virtio_init_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov, 


/* virtio-9p device */



VMSTATE_VIRTIO_DEVICE(9p, 1, virtio_9p_load, virtio_vmstate_save);



static Property virtio_9p_properties[] = {

    DEFINE_PROP_STRING("mount_tag", V9fsVirtioState, state.fsconf.tag),

    DEFINE_PROP_STRING("fsdev", V9fsVirtioState, state.fsconf.fsdev_id),
@@ -187,6 +182,7 @@ static void virtio_9p_class_init(ObjectClass *klass, void *data) 
    VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);



    dc->props = virtio_9p_properties;

    dc->vmsd = &vmstate_virtio_9p;

    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

    vdc->realize = virtio_9p_device_realize;

    vdc->unrealize = virtio_9p_device_unrealize;

hw/alpha/typhoon.c

+1 −1
Original line number Diff line number Diff line
@@ -824,7 +824,6 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus, 
    int i;



    dev = qdev_create(NULL, TYPE_TYPHOON_PCI_HOST_BRIDGE);

    qdev_init_nofail(dev);



    s = TYPHOON_PCI_HOST_BRIDGE(dev);

    phb = PCI_HOST_BRIDGE(dev);
@@ -889,6 +888,7 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus, 
                         &s->pchip.reg_mem, &s->pchip.reg_io,

                         0, 64, TYPE_PCI_BUS);

    phb->bus = b;

    qdev_init_nofail(dev);



    /* Host memory as seen from the PCI side, via the IOMMU.  */

    memory_region_init_iommu(&s->pchip.iommu, OBJECT(s), &typhoon_iommu_ops,