Commit 75e50c80 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-10-10' into staging 



Miscellaneous patches for 2018-10-10

# gpg: Signature made Wed 10 Oct 2018 07:03:10 BST
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-misc-2018-10-10:
  ivshmem: Fix unplug of device "ivshmem-plain"
  libqtest: Inline g_assert_no_errno()
  tests: Restore check-qdict unit test
  qapi/misc.json: Remove superfluous words in CpuModelExpansionType
  tests/check-qjson: fix a leak

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 53a19a9a b266f1d1

hw/misc/ivshmem.c

+5 −9
Original line number Diff line number Diff line
@@ -911,6 +911,7 @@ static void ivshmem_common_realize(PCIDevice *dev, Error **errp) 
        IVSHMEM_DPRINTF("using hostmem\n");



        s->ivshmem_bar2 = host_memory_backend_get_memory(s->hostmem);

        host_memory_backend_set_mapped(s->hostmem, true);

    } else {

        Chardev *chr = qemu_chr_fe_get_driver(&s->server_chr);

        assert(chr);
@@ -993,6 +994,10 @@ static void ivshmem_exit(PCIDevice *dev) 
        vmstate_unregister_ram(s->ivshmem_bar2, DEVICE(dev));

    }



    if (s->hostmem) {

        host_memory_backend_set_mapped(s->hostmem, false);

    }



    if (s->peers) {

        for (i = 0; i < s->nb_peers; i++) {

            close_peer_eventfds(s, i);
@@ -1101,14 +1106,6 @@ static void ivshmem_plain_realize(PCIDevice *dev, Error **errp) 
    }



    ivshmem_common_realize(dev, errp);

    host_memory_backend_set_mapped(s->hostmem, true);

}



static void ivshmem_plain_exit(PCIDevice *pci_dev)

{

    IVShmemState *s = IVSHMEM_COMMON(pci_dev);



    host_memory_backend_set_mapped(s->hostmem, false);

}



static void ivshmem_plain_class_init(ObjectClass *klass, void *data)
@@ -1117,7 +1114,6 @@ static void ivshmem_plain_class_init(ObjectClass *klass, void *data) 
    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    k->realize = ivshmem_plain_realize;

    k->exit = ivshmem_plain_exit;

    dc->props = ivshmem_plain_properties;

    dc->vmsd = &ivshmem_plain_vmsd;

}

qapi/misc.json

+6 −6
Original line number Diff line number Diff line
@@ -2017,7 +2017,7 @@ 
#

# @migration-safe: whether a CPU definition can be safely used for

#                  migration in combination with a QEMU compatibility machine

#                  when migrating between different QMU versions and between

#                  when migrating between different QEMU versions and between

#                  hosts with different sets of (hardware or software)

#                  capabilities. If not provided, information is not available

#                  and callers should not assume the CPU definition to be
@@ -2126,11 +2126,11 @@ 
# @static: Expand to a static CPU model, a combination of a static base

#          model name and property delta changes. As the static base model will

#          never change, the expanded CPU model will be the same, independent of

#          independent of QEMU version, machine type, machine options, and

#          accelerator options. Therefore, the resulting model can be used by

#          tooling without having to specify a compatibility machine - e.g. when

#          displaying the "host" model. static CPU models are migration-safe.

#

#          QEMU version, machine type, machine options, and accelerator options.

#          Therefore, the resulting model can be used by tooling without having

#          to specify a compatibility machine - e.g. when displaying the "host"

#          model. The @static CPU models are migration-safe.



# @full: Expand all properties. The produced model is not guaranteed to be

#        migration-safe, but allows tooling to get an insight and work with

#        model details.

tests/Makefile.include

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \ 


check-unit-y = tests/check-qdict$(EXESUF)

gcov-files-check-qdict-y = qobject/qdict.c

check-unit-y = tests/check-block-qdict$(EXESUF)

check-unit-y += tests/check-block-qdict$(EXESUF)

gcov-files-check-block-qdict-y = qobject/block-qdict.c

check-unit-y += tests/test-char$(EXESUF)

gcov-files-check-qdict-y = chardev/char.c

tests/check-qdict.c

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 


#include "qemu/osdep.h"

#include "qapi/qmp/qdict.h"

#include "qapi/qmp/qnum.h"

#include "qapi/qmp/qstring.h"



/*

 * Public Interface test-cases

tests/check-qjson.c

+1 −0
Original line number Diff line number Diff line
@@ -780,6 +780,7 @@ static void utf8_string(void) 
            if (!strstr(json_out, "\\uFFFD")) {

                str = from_json_str(json_out, j, &error_abort);

                g_assert_cmpstr(qstring_get_try_str(str), ==, utf8_in);

                qobject_unref(str);

            }

        }

    }