Commit 627eae7d authored by Peter Maydell's avatar Peter Maydell
Browse files

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



virtio, pc: fixes and features

more guest error handling for virtio devices
virtio migration rework
pc fixes

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

# gpg: Signature made Mon 10 Oct 2016 00:39:11 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: (33 commits)
  intel-iommu: Check IOAPIC's Trigger Mode against the one in IRTE
  virtio: cleanup VMSTATE_VIRTIO_DEVICE
  vhost-vsock: convert VMSTATE_VIRTIO_DEVICE
  virtio-rng: convert VMSTATE_VIRTIO_DEVICE
  virtio-balloon: convert VMSTATE_VIRTIO_DEVICE
  virtio-scsi: convert VMSTATE_VIRTIO_DEVICE
  virtio-input: convert VMSTATE_VIRTIO_DEVICE
  virtio-gpu: convert VMSTATE_VIRTIO_DEVICE
  virtio-serial: convert VMSTATE_VIRTIO_DEVICE
  virtio-9p: convert VMSTATE_VIRTIO_DEVICE
  virtio-net: convert VMSTATE_VIRTIO_DEVICE
  virtio-blk: convert VMSTATE_VIRTIO_DEVICE
  virtio: prepare change VMSTATE_VIRTIO_DEVICE macro
  net: don't poke at chardev internal QemuOpts
  virtio-scsi: handle virtio_scsi_set_config() error
  virtio-scsi: convert virtio_scsi_bad_req() to use virtio_error()
  virtio-net: handle virtio_net_flush_tx() errors
  virtio-net: handle virtio_net_receive() errors
  virtio-net: handle virtio_net_handle_ctrl() error
  virtio-blk: handle virtio_blk_handle_request() errors
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0f183e67 dea651a9

hmp.c

+1 −0
Original line number Diff line number Diff line
@@ -1974,6 +1974,7 @@ void hmp_chardev_add(Monitor *mon, const QDict *qdict) 
        error_setg(&err, "Parsing chardev args failed");

    } else {

        qemu_chr_new_from_opts(opts, NULL, &err);

        qemu_opts_del(opts);

    }

    hmp_handle_error(mon, &err);

}

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

+32 −13
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ static void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq) 
    V9fsState *s = &v->state;

    V9fsPDU *pdu;

    ssize_t len;

    VirtQueueElement *elem;



    while ((pdu = pdu_alloc(s))) {

        struct {
@@ -48,21 +49,28 @@ static void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq) 
            uint8_t id;

            uint16_t tag_le;

        } QEMU_PACKED out;

        VirtQueueElement *elem;



        elem = virtqueue_pop(vq, sizeof(VirtQueueElement));

        if (!elem) {

            pdu_free(pdu);

            break;

            goto out_free_pdu;

        }



        BUG_ON(elem->out_num == 0 || elem->in_num == 0);

        QEMU_BUILD_BUG_ON(sizeof out != 7);

        if (elem->in_num == 0) {

            virtio_error(vdev,

                         "The guest sent a VirtFS request without space for "

                         "the reply");

            goto out_free_req;

        }

        QEMU_BUILD_BUG_ON(sizeof(out) != 7);



        v->elems[pdu->idx] = elem;

        len = iov_to_buf(elem->out_sg, elem->out_num, 0,

                         &out, sizeof out);

        BUG_ON(len != sizeof out);

                         &out, sizeof(out));

        if (len != sizeof(out)) {

            virtio_error(vdev, "The guest sent a malformed VirtFS request: "

                         "header size is %zd, should be 7", len);

            goto out_free_req;

        }



        pdu->size = le32_to_cpu(out.size_le);
@@ -72,6 +80,14 @@ static void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq) 
        qemu_co_queue_init(&pdu->complete);

        pdu_submit(pdu);

    }



    return;



out_free_req:

    virtqueue_detach_element(vq, elem, 0);

    g_free(elem);

out_free_pdu:

    pdu_free(pdu);

}



static uint64_t virtio_9p_get_features(VirtIODevice *vdev, uint64_t features,
@@ -97,11 +113,6 @@ static void virtio_9p_get_config(VirtIODevice *vdev, uint8_t *config) 
    g_free(cfg);

}



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

{

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

}



static void virtio_9p_device_realize(DeviceState *dev, Error **errp)

{

    VirtIODevice *vdev = VIRTIO_DEVICE(dev);
@@ -168,7 +179,15 @@ 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 const VMStateDescription vmstate_virtio_9p = {

    .name = "virtio-9p",

    .minimum_version_id = 1,

    .version_id = 1,

    .fields = (VMStateField[]) {

        VMSTATE_VIRTIO_DEVICE,

        VMSTATE_END_OF_LIST()

    },

};



static Property virtio_9p_properties[] = {

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

hw/acpi/cpu.c

+12 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include "qapi/error.h"

#include "qapi-event.h"

#include "trace.h"

#include "sysemu/numa.h"



#define ACPI_CPU_HOTPLUG_REG_LEN 12

#define ACPI_CPU_SELECTOR_OFFSET_WR 0
@@ -503,6 +504,7 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, 


        /* build Processor object for each processor */

        for (i = 0; i < arch_ids->len; i++) {

            int j;

            Aml *dev;

            Aml *uid = aml_int(i);

            GArray *madt_buf = g_array_new(0, 1, 1);
@@ -546,6 +548,16 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, 
                          aml_arg(1), aml_arg(2))

            );

            aml_append(dev, method);



            /* Linux guests discard SRAT info for non-present CPUs

             * as a result _PXM is required for all CPUs which might

             * be hot-plugged. For simplicity, add it for all CPUs.

             */

            j = numa_get_node_for_cpu(i);

            if (j < nb_numa_nodes) {

                aml_append(dev, aml_name_decl("_PXM", aml_int(j)));

            }



            aml_append(cpus_dev, dev);

        }

    }

hw/arm/virt-acpi-build.c

+2 −4
Original line number Diff line number Diff line
@@ -427,11 +427,9 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info) 
    uint32_t *cpu_node = g_malloc0(guest_info->smp_cpus * sizeof(uint32_t));



    for (i = 0; i < guest_info->smp_cpus; i++) {

        for (j = 0; j < nb_numa_nodes; j++) {

            if (test_bit(i, numa_info[j].node_cpu)) {

        j = numa_get_node_for_cpu(i);

        if (j < nb_numa_nodes) {

                cpu_node[i] = j;

                break;

            }

        }

    }

hw/arm/virt.c

+3 −4
Original line number Diff line number Diff line
@@ -413,11 +413,10 @@ static void fdt_add_cpu_nodes(const VirtBoardInfo *vbi) 
                                  armcpu->mp_affinity);

        }



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

            if (test_bit(cpu, numa_info[i].node_cpu)) {

        i = numa_get_node_for_cpu(cpu);

        if (i < nb_numa_nodes) {

            qemu_fdt_setprop_cell(vbi->fdt, nodename, "numa-node-id", i);

        }

        }



        g_free(nodename);

    }