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

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



virtio, acpi: fixes

A couple of bugfixes.

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

# gpg: Signature made Wed 20 Nov 2019 09:57:44 GMT
# gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg:                issuer "mst@redhat.com"
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# 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:
  tests: acpi: always retain dumped ACPI tables in case of error
  vhost-user-input: use free(elem) instead of g_free(elem)
  libvhost-user: Zero memory allocated for VuVirtqInflightDesc

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 39e28210 6c77aa90

contrib/libvhost-user/libvhost-user.c

+1 −1
Original line number Diff line number Diff line
@@ -992,7 +992,7 @@ vu_check_queue_inflights(VuDev *dev, VuVirtq *vq) 
    vq->shadow_avail_idx = vq->last_avail_idx = vq->inuse + vq->used_idx;



    if (vq->inuse) {

        vq->resubmit_list = malloc(sizeof(VuVirtqInflightDesc) * vq->inuse);

        vq->resubmit_list = calloc(vq->inuse, sizeof(VuVirtqInflightDesc));

        if (!vq->resubmit_list) {

            return -1;

        }

contrib/vhost-user-input/main.c

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static void vi_input_send(VuInput *vi, struct virtio_input_event *event) 
        len = iov_from_buf(elem->in_sg, elem->in_num,

                           0, &vi->queue[i].event, sizeof(virtio_input_event));

        vu_queue_push(dev, vq, elem, len);

        g_free(elem);

        free(elem);

    }



    vu_queue_notify(&vi->dev.parent, vq);
@@ -153,7 +153,7 @@ static void vi_handle_sts(VuDev *dev, int qidx) 
                         0, &event, sizeof(event));

        vi_handle_status(vi, &event);

        vu_queue_push(dev, vq, elem, len);

        g_free(elem);

        free(elem);

    }



    vu_queue_notify(&vi->dev.parent, vq);

tests/bios-tables-test.c

+1 −1
Original line number Diff line number Diff line
@@ -437,11 +437,11 @@ static void test_acpi_asl(test_data *data) 
        g_assert(!err || exp_err);



        if (g_strcmp0(asl->str, exp_asl->str)) {

            sdt->tmp_files_retain = true;

            if (exp_err) {

                fprintf(stderr,

                        "Warning! iasl couldn't parse the expected aml\n");

            } else {

                sdt->tmp_files_retain = true;

                exp_sdt->tmp_files_retain = true;

                fprintf(stderr,

                        "acpi-test: Warning! %.4s mismatch. "