Commit 8227e2d1 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



pci, virtio, acpi: fixes for 2.6

Fixes all over the place. Most notably, fixes migration
for systems with pci express bridges, and random crashes
observed with virtio blk and scsi dataplane.

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

# gpg: Signature made Fri 08 Apr 2016 08:53:46 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"

* remotes/mst/tags/for_upstream:
  hw/pci-bridge: Add missing unref in case register-bus fails
  virtio: merge virtio_queue_aio_set_host_notifier_handler with virtio_queue_set_aio
  virtio-scsi: use aio handler for data plane
  virtio-blk: use aio handler for data plane
  virtio: add aio handler
  virtio-scsi: fix disabled mode
  virtio-blk: fix disabled mode
  virtio: make virtio_queue_notify_vq static
  tests/bios-tables-test: fix assert
  virtio-balloon: reset the statistic timer to load device
  Migration: Add i82801b11 migration data
  Sort the fw_cfg file list
  xen: piix reuse pci generic class init function
  pci-testdev: fast mmio support
  acpi: Add missing GCC_FMT_ATTR

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3be4f4d7 2e4278b5

hw/block/dataplane/virtio-blk.c

+17 −6
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
struct VirtIOBlockDataPlane {

    bool starting;

    bool stopping;

    bool disabled;



    VirtIOBlkConf *conf;
@@ -185,6 +184,17 @@ void virtio_blk_data_plane_destroy(VirtIOBlockDataPlane *s) 
    g_free(s);

}



static void virtio_blk_data_plane_handle_output(VirtIODevice *vdev,

                                                VirtQueue *vq)

{

    VirtIOBlock *s = (VirtIOBlock *)vdev;



    assert(s->dataplane);

    assert(s->dataplane_started);



    virtio_blk_handle_vq(s, vq);

}



/* Context: QEMU global mutex held */

void virtio_blk_data_plane_start(VirtIOBlockDataPlane *s)

{
@@ -227,14 +237,15 @@ void virtio_blk_data_plane_start(VirtIOBlockDataPlane *s) 


    /* Get this show started by hooking up our callbacks */

    aio_context_acquire(s->ctx);

    virtio_queue_aio_set_host_notifier_handler(s->vq, s->ctx, true, true);

    virtio_queue_aio_set_host_notifier_handler(s->vq, s->ctx,

                                               virtio_blk_data_plane_handle_output);

    aio_context_release(s->ctx);

    return;



  fail_host_notifier:

    k->set_guest_notifiers(qbus->parent, 1, false);

  fail_guest_notifiers:

    s->disabled = true;

    vblk->dataplane_disabled = true;

    s->starting = false;

    vblk->dataplane_started = true;

}
@@ -251,8 +262,8 @@ void virtio_blk_data_plane_stop(VirtIOBlockDataPlane *s) 
    }



    /* Better luck next time. */

    if (s->disabled) {

        s->disabled = false;

    if (vblk->dataplane_disabled) {

        vblk->dataplane_disabled = false;

        vblk->dataplane_started = false;

        return;

    }
@@ -262,7 +273,7 @@ void virtio_blk_data_plane_stop(VirtIOBlockDataPlane *s) 
    aio_context_acquire(s->ctx);



    /* Stop notifications for new requests from guest */

    virtio_queue_aio_set_host_notifier_handler(s->vq, s->ctx, false, false);

    virtio_queue_aio_set_host_notifier_handler(s->vq, s->ctx, NULL);



    /* Drain and switch bs back to the QEMU main loop */

    blk_set_aio_context(s->conf->conf.blk, qemu_get_aio_context());

hw/block/virtio-blk.c

+18 −11
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static void virtio_blk_req_complete(VirtIOBlockReq *req, unsigned char status) 


    stb_p(&req->in->status, status);

    virtqueue_push(s->vq, &req->elem, req->in_len);

    if (s->dataplane) {

    if (s->dataplane_started && !s->dataplane_disabled) {

        virtio_blk_data_plane_notify(s->dataplane);

    } else {

        virtio_notify(vdev, s->vq);
@@ -578,20 +578,11 @@ void virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb) 
    }

}



static void virtio_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)

void virtio_blk_handle_vq(VirtIOBlock *s, VirtQueue *vq)

{

    VirtIOBlock *s = VIRTIO_BLK(vdev);

    VirtIOBlockReq *req;

    MultiReqBuffer mrb = {};



    /* Some guests kick before setting VIRTIO_CONFIG_S_DRIVER_OK so start

     * dataplane here instead of waiting for .set_status().

     */

    if (s->dataplane && !s->dataplane_started) {

        virtio_blk_data_plane_start(s->dataplane);

        return;

    }



    blk_io_plug(s->blk);



    while ((req = virtio_blk_get_request(s))) {
@@ -605,6 +596,22 @@ static void virtio_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq) 
    blk_io_unplug(s->blk);

}



static void virtio_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)

{

    VirtIOBlock *s = (VirtIOBlock *)vdev;



    if (s->dataplane) {

        /* Some guests kick before setting VIRTIO_CONFIG_S_DRIVER_OK so start

         * dataplane here instead of waiting for .set_status().

         */

        virtio_blk_data_plane_start(s->dataplane);

        if (!s->dataplane_disabled) {

            return;

        }

    }

    virtio_blk_handle_vq(s, vq);

}



static void virtio_blk_dma_restart_bh(void *opaque)

{

    VirtIOBlock *s = opaque;

hw/core/loader.c

+14 −0
Original line number Diff line number Diff line
@@ -1053,6 +1053,20 @@ void rom_set_fw(FWCfgState *f) 
    fw_cfg = f;

}



void rom_set_order_override(int order)

{

    if (!fw_cfg)

        return;

    fw_cfg_set_order_override(fw_cfg, order);

}



void rom_reset_order_override(void)

{

    if (!fw_cfg)

        return;

    fw_cfg_reset_order_override(fw_cfg);

}



static Rom *find_rom(hwaddr addr)

{

    Rom *rom;

hw/i386/pc.c

+4 −0
Original line number Diff line number Diff line
@@ -1406,6 +1406,7 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus) 
{

    DeviceState *dev = NULL;



    rom_set_order_override(FW_CFG_ORDER_OVERRIDE_VGA);

    if (pci_bus) {

        PCIDevice *pcidev = pci_vga_init(pci_bus);

        dev = pcidev ? &pcidev->qdev : NULL;
@@ -1413,6 +1414,7 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus) 
        ISADevice *isadev = isa_vga_init(isa_bus);

        dev = isadev ? DEVICE(isadev) : NULL;

    }

    rom_reset_order_override();

    return dev;

}
@@ -1541,6 +1543,7 @@ void pc_nic_init(ISABus *isa_bus, PCIBus *pci_bus) 
{

    int i;



    rom_set_order_override(FW_CFG_ORDER_OVERRIDE_NIC);

    for (i = 0; i < nb_nics; i++) {

        NICInfo *nd = &nd_table[i];
@@ -1550,6 +1553,7 @@ void pc_nic_init(ISABus *isa_bus, PCIBus *pci_bus) 
            pci_nic_init_nofail(nd, pci_bus, "e1000", NULL);

        }

    }

    rom_reset_order_override();

}



void pc_pci_device_init(PCIBus *pci_bus)

hw/i386/pc_piix.c

+1 −0
Original line number Diff line number Diff line
@@ -434,6 +434,7 @@ static void pc_i440fx_2_5_machine_options(MachineClass *m) 
    m->alias = NULL;

    m->is_default = 0;

    pcmc->save_tsc_khz = false;

    m->legacy_fw_cfg_order = 1;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_5);

}