Commit 2a7e7c3e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-and-tcg-121119-1' into staging 



Testing and plugins for rc1

  - add plugin API versioning
  - tests/vm add netbsd autoinstall
  - disable ipmi-bt-test for non-Linux
  - single-thread make check

# gpg: Signature made Tue 12 Nov 2019 14:34:30 GMT
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-testing-and-tcg-121119-1:
  tcg plugins: expose an API version concept
  .travis.yml: don't run make check with multiple jobs
  tests/vm: support sites with sha512 checksums
  tests: only run ipmi-bt-test if CONFIG_LINUX
  tests/vm: update netbsd to version 8.1
  tests/vm: use console_consume for netbsd
  tests/vm: add console_consume helper
  tests/vm: netbsd autoinstall, using serial console

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 039e285e 3fb356cc

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ env: 
    - SRC_DIR="."

    - BUILD_DIR="."

    - BASE_CONFIG="--disable-docs --disable-tools"

    - TEST_CMD="make check -j3 V=1"

    - TEST_CMD="make check V=1"

    # This is broadly a list of "mainline" softmmu targets which have support across the major distros

    - MAIN_SOFTMMU_TARGETS="aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"

    - CCACHE_SLOPPINESS="include_file_ctime,include_file_mtime"

include/qemu/qemu-plugin.h

+19 −0
Original line number Diff line number Diff line
@@ -38,9 +38,28 @@ 


typedef uint64_t qemu_plugin_id_t;



/*

 * Versioning plugins:

 *

 * The plugin API will pass a minimum and current API version that

 * QEMU currently supports. The minimum API will be incremented if an

 * API needs to be deprecated.

 *

 * The plugins export the API they were built against by exposing the

 * symbol qemu_plugin_version which can be checked.

 */



extern QEMU_PLUGIN_EXPORT int qemu_plugin_version;



#define QEMU_PLUGIN_VERSION 0



typedef struct {

    /* string describing architecture */

    const char *target_name;

    struct {

        int min;

        int cur;

    } version;

    /* is this a full system emulation? */

    bool system_emulation;

    union {

plugins/loader.c

+21 −0
Original line number Diff line number Diff line
@@ -178,6 +178,25 @@ static int plugin_load(struct qemu_plugin_desc *desc, const qemu_info_t *info) 
        goto err_symbol;

    }



    if (!g_module_symbol(ctx->handle, "qemu_plugin_version", &sym)) {

        error_report("TCG plugin %s does not declare API version %s",

                     desc->path, g_module_error());

        goto err_symbol;

    } else {

        int version = *(int *)sym;

        if (version < QEMU_PLUGIN_MIN_VERSION) {

            error_report("TCG plugin %s requires API version %d, but "

                         "this QEMU supports only a minimum version of %d",

                         desc->path, version, QEMU_PLUGIN_MIN_VERSION);

            goto err_symbol;

        } else if (version > QEMU_PLUGIN_VERSION) {

            error_report("TCG plugin %s requires API version %d, but "

                         "this QEMU supports only up to version %d",

                         desc->path, version, QEMU_PLUGIN_VERSION);

            goto err_symbol;

        }

    }



    qemu_rec_mutex_lock(&plugin.lock);



    /* find an unused random id with &ctx as the seed */
@@ -248,6 +267,8 @@ int qemu_plugin_load_list(QemuPluginList *head) 
    g_autofree qemu_info_t *info = g_new0(qemu_info_t, 1);



    info->target_name = TARGET_NAME;

    info->version.min = QEMU_PLUGIN_MIN_VERSION;

    info->version.cur = QEMU_PLUGIN_VERSION;

#ifndef CONFIG_USER_ONLY

    MachineState *ms = MACHINE(qdev_get_machine());

    info->system_emulation = true;

plugins/plugin.h

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


#include <gmodule.h>



#define QEMU_PLUGIN_MIN_VERSION 0



/* global state */

struct qemu_plugin_state {

    QTAILQ_HEAD(, qemu_plugin_ctx) ctxs;

tests/Makefile.include

+2 −0
Original line number Diff line number Diff line
@@ -177,7 +177,9 @@ check-qtest-i386-$(CONFIG_SGA) += tests/boot-serial-test$(EXESUF) 
check-qtest-i386-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)

check-qtest-i386-y += tests/rtc-test$(EXESUF)

check-qtest-i386-$(CONFIG_ISA_IPMI_KCS) += tests/ipmi-kcs-test$(EXESUF)

ifdef CONFIG_LINUX

check-qtest-i386-$(CONFIG_ISA_IPMI_BT) += tests/ipmi-bt-test$(EXESUF)

endif

check-qtest-i386-y += tests/i440fx-test$(EXESUF)

check-qtest-i386-y += tests/fw_cfg-test$(EXESUF)

check-qtest-i386-y += tests/device-plug-test$(EXESUF)