diff options
| -rw-r--r-- | hw/xen/xen_pt.c | 2 | ||||
| -rw-r--r-- | tests/docker/Makefile.include | 5 | ||||
| -rwxr-xr-x | tests/docker/common.rc | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index f593b046e5..b6d71bb52a 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -842,7 +842,7 @@ static void xen_pt_realize(PCIDevice *d, Error **errp) goto err_out; } if (!scratch) { - error_setg(errp, "no pin interrupt"); + XEN_PT_LOG(d, "no pin interrupt\n"); goto out; } diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 78af46837b..4f4707dae0 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -107,9 +107,8 @@ docker-run-%: docker-qemu-src fi $(if $(filter $(TESTS),$(CMD)),$(if $(filter $(IMAGES),$(IMAGE)), \ $(call quiet-command,\ - if $(SRC_PATH)/tests/docker/docker.py images \ - --format={{.Repository}}:{{.Tag}} | \ - grep -qx qemu:$(IMAGE); then \ + if $(SRC_PATH)/tests/docker/docker.py images | \ + awk '$$1=="qemu" && $$2=="$(IMAGE)"{found=1} END{exit(!found)}'; then \ $(SRC_PATH)/tests/docker/docker.py run $(if $V,,--rm) \ -t \ $(if $(DEBUG),-i,--net=none) \ diff --git a/tests/docker/common.rc b/tests/docker/common.rc index 77069e1285..0c6d8d5ece 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -24,6 +24,7 @@ requires() build_qemu() { $QEMU_SRC/configure \ + --enable-werror \ ${TARGET_LIST:+"--target-list=${TARGET_LIST}"} \ --prefix="$PWD/install" \ $EXTRA_CONFIGURE_OPTS \ |