Commit 3a958f55 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging 



# gpg: Signature made Thu 29 Oct 2015 18:09:16 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/block-pull-request:
  block: Consider all child nodes in bdrv_requests_pending()
  target-arm: xlnx-zynqmp: Add sdhci support.
  sdhci: Split sdhci.h for public and internal device usage
  sd.h: Move sd.h to include/hw/sd/
  virtio: sync the dataplane vring state to the virtqueue before virtio_save
  gdb command: qemu handlers
  virtio-blk: switch off scsi-passthrough by default
  ppc/spapr: add 2.4 compat props
  s390x: include HW_COMPAT_* props
  qemu-gdb: add $qemu_coroutine_sp and $qemu_coroutine_pc
  qemu-gdb: extract parts of "qemu coroutine" implementation
  qemu-gdb: allow using glibc_pointer_guard() on core dumps

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e79ea9e4 37a639a7

block/io.c

+8 −5
Original line number Diff line number Diff line
@@ -216,6 +216,8 @@ void bdrv_disable_copy_on_read(BlockDriverState *bs) 
/* Check if any requests are in-flight (including throttled requests) */

bool bdrv_requests_pending(BlockDriverState *bs)

{

    BdrvChild *child;



    if (!QLIST_EMPTY(&bs->tracked_requests)) {

        return true;

    }
@@ -225,12 +227,13 @@ bool bdrv_requests_pending(BlockDriverState *bs) 
    if (!qemu_co_queue_empty(&bs->throttled_reqs[1])) {

        return true;

    }

    if (bs->file && bdrv_requests_pending(bs->file->bs)) {



    QLIST_FOREACH(child, &bs->children, next) {

        if (bdrv_requests_pending(child->bs)) {

            return true;

        }

    if (bs->backing && bdrv_requests_pending(bs->backing->bs)) {

        return true;

    }



    return false;

}

hw/arm/xlnx-zynqmp.c

+28 −0
Original line number Diff line number Diff line
@@ -48,6 +48,14 @@ static const int uart_intr[XLNX_ZYNQMP_NUM_UARTS] = { 
    21, 22,

};



static const uint64_t sdhci_addr[XLNX_ZYNQMP_NUM_SDHCI] = {

    0xFF160000, 0xFF170000,

};



static const int sdhci_intr[XLNX_ZYNQMP_NUM_SDHCI] = {

    48, 49,

};



typedef struct XlnxZynqMPGICRegion {

    int region_index;

    uint32_t address;
@@ -97,6 +105,13 @@ static void xlnx_zynqmp_init(Object *obj) 


    object_initialize(&s->sata, sizeof(s->sata), TYPE_SYSBUS_AHCI);

    qdev_set_parent_bus(DEVICE(&s->sata), sysbus_get_default());



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

        object_initialize(&s->sdhci[i], sizeof(s->sdhci[i]),

                          TYPE_SYSBUS_SDHCI);

        qdev_set_parent_bus(DEVICE(&s->sdhci[i]),

                            sysbus_get_default());

    }

}



static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
@@ -258,6 +273,19 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) 


    sysbus_mmio_map(SYS_BUS_DEVICE(&s->sata), 0, SATA_ADDR);

    sysbus_connect_irq(SYS_BUS_DEVICE(&s->sata), 0, gic_spi[SATA_INTR]);



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

        object_property_set_bool(OBJECT(&s->sdhci[i]), true,

                                 "realized", &err);

        if (err) {

            error_propagate(errp, err);

            return;

        }

        sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdhci[i]), 0,

                        sdhci_addr[i]);

        sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhci[i]), 0,

                           gic_spi[sdhci_intr[i]]);

    }

}



static Property xlnx_zynqmp_props[] = {

hw/block/virtio-blk.c

+6 −1
Original line number Diff line number Diff line
@@ -798,6 +798,11 @@ static void virtio_blk_set_status(VirtIODevice *vdev, uint8_t status) 
static void virtio_blk_save(QEMUFile *f, void *opaque)

{

    VirtIODevice *vdev = VIRTIO_DEVICE(opaque);

    VirtIOBlock *s = VIRTIO_BLK(vdev);



    if (s->dataplane) {

        virtio_blk_data_plane_stop(s->dataplane);

    }



    virtio_save(vdev, f);

}
@@ -972,7 +977,7 @@ static Property virtio_blk_properties[] = { 
    DEFINE_PROP_STRING("serial", VirtIOBlock, conf.serial),

    DEFINE_PROP_BIT("config-wce", VirtIOBlock, conf.config_wce, 0, true),

#ifdef __linux__

    DEFINE_PROP_BIT("scsi", VirtIOBlock, conf.scsi, 0, true),

    DEFINE_PROP_BIT("scsi", VirtIOBlock, conf.scsi, 0, false),

#endif

    DEFINE_PROP_BIT("request-merging", VirtIOBlock, conf.request_merging, 0,

                    true),

hw/ppc/spapr.c

+9 −0
Original line number Diff line number Diff line
@@ -2285,7 +2285,11 @@ static const TypeInfo spapr_machine_info = { 
    },

};



#define SPAPR_COMPAT_2_4 \

        HW_COMPAT_2_4



#define SPAPR_COMPAT_2_3 \

        SPAPR_COMPAT_2_4 \

        HW_COMPAT_2_3 \

        {\

            .driver   = "spapr-pci-host-bridge",\
@@ -2399,11 +2403,16 @@ static const TypeInfo spapr_machine_2_3_info = { 


static void spapr_machine_2_4_class_init(ObjectClass *oc, void *data)

{

    static GlobalProperty compat_props[] = {

        SPAPR_COMPAT_2_4

        { /* end of list */ }

    };

    MachineClass *mc = MACHINE_CLASS(oc);



    mc->desc = "pSeries Logical Partition (PAPR compliant) v2.4";

    mc->alias = "pseries";

    mc->is_default = 0;

    mc->compat_props = compat_props;

}



static const TypeInfo spapr_machine_2_4_info = {

hw/s390x/s390-virtio-ccw.c

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "qemu/config-file.h"

#include "s390-pci-bus.h"

#include "hw/s390x/storage-keys.h"

#include "hw/compat.h"



#define TYPE_S390_CCW_MACHINE               "s390-ccw-machine"
@@ -236,6 +237,7 @@ static const TypeInfo ccw_machine_info = { 
};



#define CCW_COMPAT_2_4 \

        HW_COMPAT_2_4 \

        {\

            .driver   = TYPE_S390_SKEYS,\

            .property = "migration-enabled",\