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

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



pc and misc cleanups and fixes, virtio optimizations

Included here:
Refactoring and bugfix patches in PC/ACPI.
New commands for ipmi.
Virtio optimizations.

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

# gpg: Signature made Sat 06 Feb 2016 18:44:26 GMT 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: (45 commits)
  net: set endianness on all backend devices
  fix MSI injection on Xen
  intel_iommu: large page support
  dimm: Correct type of MemoryHotplugState->base
  pc: set the OEM fields in the RSDT and the FADT from the SLIC
  acpi: add function to extract oem_id and oem_table_id from the user's SLIC
  acpi: expose oem_id and oem_table_id in build_rsdt()
  acpi: take oem_id in build_header(), optionally
  pc: Eliminate PcGuestInfo struct
  pc: Move APIC and NUMA data from PcGuestInfo to PCMachineState
  pc: Move PcGuestInfo.fw_cfg to PCMachineState
  pc: Remove PcGuestInfo.isapc_ram_fw field
  pc: Remove RAM size fields from PcGuestInfo
  pc: Remove compat fields from PcGuestInfo
  acpi: Don't save PcGuestInfo on AcpiBuildState
  acpi: Remove guest_info parameters from functions
  pc: Simplify xen_load_linux() signature
  pc: Simplify pc_memory_init() signature
  pc: Eliminate struct PcGuestInfoState
  pc: Move PcGuestInfo declaration to top of file
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ee8e8f92 a4076440

hw/9pfs/9p.c

+1 −1
Original line number Diff line number Diff line
@@ -1587,7 +1587,7 @@ static int v9fs_xattr_read(V9fsState *s, V9fsPDU *pdu, V9fsFidState *fidp, 
    int read_count;

    int64_t xattr_len;

    V9fsVirtioState *v = container_of(s, V9fsVirtioState, state);

    VirtQueueElement *elem = &v->elems[pdu->idx];

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



    xattr_len = fidp->fs.xattr.len;

    read_count = xattr_len - off;

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

+10 −7
Original line number Diff line number Diff line
@@ -26,10 +26,12 @@ void virtio_9p_push_and_notify(V9fsPDU *pdu) 
{

    V9fsState *s = pdu->s;

    V9fsVirtioState *v = container_of(s, V9fsVirtioState, state);

    VirtQueueElement *elem = &v->elems[pdu->idx];

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



    /* push onto queue and notify */

    virtqueue_push(v->vq, elem, pdu->size);

    g_free(elem);

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



    /* FIXME: we should batch these completions */

    virtio_notify(VIRTIO_DEVICE(v), v->vq);
@@ -48,10 +50,10 @@ static void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq) 
            uint8_t id;

            uint16_t tag_le;

        } QEMU_PACKED out;

        VirtQueueElement *elem = &v->elems[pdu->idx];

        VirtQueueElement *elem;



        len = virtqueue_pop(vq, elem);

        if (!len) {

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

        if (!elem) {

            pdu_free(pdu);

            break;

        }
@@ -59,6 +61,7 @@ static void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq) 
        BUG_ON(elem->out_num == 0 || elem->in_num == 0);

        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);
@@ -141,7 +144,7 @@ ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset, 
{

    V9fsState *s = pdu->s;

    V9fsVirtioState *v = container_of(s, V9fsVirtioState, state);

    VirtQueueElement *elem = &v->elems[pdu->idx];

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



    return v9fs_iov_vmarshal(elem->in_sg, elem->in_num, offset, 1, fmt, ap);

}
@@ -151,7 +154,7 @@ ssize_t virtio_pdu_vunmarshal(V9fsPDU *pdu, size_t offset, 
{

    V9fsState *s = pdu->s;

    V9fsVirtioState *v = container_of(s, V9fsVirtioState, state);

    VirtQueueElement *elem = &v->elems[pdu->idx];

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



    return v9fs_iov_vunmarshal(elem->out_sg, elem->out_num, offset, 1, fmt, ap);

}
@@ -161,7 +164,7 @@ void virtio_init_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov, 
{

    V9fsState *s = pdu->s;

    V9fsVirtioState *v = container_of(s, V9fsVirtioState, state);

    VirtQueueElement *elem = &v->elems[pdu->idx];

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



    if (is_write) {

        *piov = elem->out_sg;

hw/9pfs/virtio-9p.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ typedef struct V9fsVirtioState 
    VirtQueue *vq;

    size_t config_size;

    V9fsPDU pdus[MAX_REQ];

    VirtQueueElement elems[MAX_REQ];

    VirtQueueElement *elems[MAX_REQ];

    V9fsState state;

} V9fsVirtioState;

hw/acpi/aml-build.c

+10 −4
Original line number Diff line number Diff line
@@ -1426,12 +1426,17 @@ Aml *aml_alias(const char *source_object, const char *alias_object) 
void

build_header(GArray *linker, GArray *table_data,

             AcpiTableHeader *h, const char *sig, int len, uint8_t rev,

             const char *oem_table_id)

             const char *oem_id, const char *oem_table_id)

{

    memcpy(&h->signature, sig, 4);

    h->length = cpu_to_le32(len);

    h->revision = rev;



    if (oem_id) {

        strncpy((char *)h->oem_id, oem_id, sizeof h->oem_id);

    } else {

        memcpy(h->oem_id, ACPI_BUILD_APPNAME6, 6);

    }



    if (oem_table_id) {

        strncpy((char *)h->oem_table_id, oem_table_id, sizeof(h->oem_table_id));
@@ -1487,7 +1492,8 @@ void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre) 


/* Build rsdt table */

void

build_rsdt(GArray *table_data, GArray *linker, GArray *table_offsets)

build_rsdt(GArray *table_data, GArray *linker, GArray *table_offsets,

           const char *oem_id, const char *oem_table_id)

{

    AcpiRsdtDescriptorRev1 *rsdt;

    size_t rsdt_len;
@@ -1506,5 +1512,5 @@ build_rsdt(GArray *table_data, GArray *linker, GArray *table_offsets) 
                                       sizeof(uint32_t));

    }

    build_header(linker, table_data,

                 (void *)rsdt, "RSDT", rsdt_len, 1, NULL);

                 (void *)rsdt, "RSDT", rsdt_len, 1, oem_id, oem_table_id);

}

hw/acpi/core.c

+16 −0
Original line number Diff line number Diff line
@@ -350,6 +350,22 @@ uint8_t *acpi_table_next(uint8_t *current) 
    }

}



int acpi_get_slic_oem(AcpiSlicOem *oem)

{

    uint8_t *u;



    for (u = acpi_table_first(); u; u = acpi_table_next(u)) {

        struct acpi_table_header *hdr = (void *)(u - sizeof(hdr->_length));



        if (memcmp(hdr->sig, "SLIC", 4) == 0) {

            oem->id = hdr->oem_id;

            oem->table_id = hdr->oem_table_id;

            return 0;

        }

    }

    return -1;

}



static void acpi_notify_wakeup(Notifier *notifier, void *data)

{

    ACPIREGS *ar = container_of(notifier, ACPIREGS, wakeup);