[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/6] Get rid of the libqemustub.a remainders
From: |
Thomas Huth |
Subject: |
[PULL 6/6] Get rid of the libqemustub.a remainders |
Date: |
Wed, 5 Aug 2020 11:57:55 +0200 |
libqemustub.a has been removed in commit ebedb37c8d ("Makefile: Remove
libqemustub.a"). Some remainders have been missed. Remove them now.
Message-Id: <20200804170055.2851-8-thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
Makefile | 2 +-
scripts/coverity-scan/run-coverity-scan | 3 ---
tests/test-util-sockets.c | 3 ++-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index c2120d8d48..13dd708c4a 100644
--- a/Makefile
+++ b/Makefile
@@ -726,7 +726,7 @@ virtiofsd$(EXESUF): $(virtiofsd-obj-y) libvhost-user.a
$(COMMON_LDADDS)
$(call LINK, $^)
endif
-vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) $(libvhost-user-obj-y)
libqemuutil.a libqemustub.a
+vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) $(libvhost-user-obj-y)
libqemuutil.a
$(call LINK, $^)
ifdef CONFIG_VHOST_USER_INPUT
diff --git a/scripts/coverity-scan/run-coverity-scan
b/scripts/coverity-scan/run-coverity-scan
index 03a791dec9..6eefb4b558 100755
--- a/scripts/coverity-scan/run-coverity-scan
+++ b/scripts/coverity-scan/run-coverity-scan
@@ -403,9 +403,6 @@ echo "Configuring..."
--enable-mpath --enable-libxml2 --enable-glusterfs \
--enable-virtfs --enable-zstd
-echo "Making libqemustub.a..."
-make libqemustub.a
-
echo "Running cov-build..."
rm -rf cov-int
mkdir cov-int
diff --git a/tests/test-util-sockets.c b/tests/test-util-sockets.c
index 2ca1e99f17..261dc48c03 100644
--- a/tests/test-util-sockets.c
+++ b/tests/test-util-sockets.c
@@ -64,7 +64,8 @@ int monitor_get_fd(Monitor *mon, const char *fdname, Error
**errp)
return dup(mon_fd);
}
-/* Syms in libqemustub.a are discarded at .o file granularity.
+/*
+ * Syms of stubs in libqemuutil.a are discarded at .o file granularity.
* To replace monitor_get_fd() we must ensure everything in
* stubs/monitor.c is defined, to make sure monitor.o is discarded
* otherwise we get duplicate syms at link time.
--
2.18.1
- [PULL 0/6] Improve gitlab-CI and fix a compiler warning, Thomas Huth, 2020/08/05
- [PULL 1/6] tests/docker: Add python3-venv and netcat to the debian-amd64 container, Thomas Huth, 2020/08/05
- [PULL 2/6] tests/acceptance: Disable the rx sash and arm cubieboard replay test on Gitlab, Thomas Huth, 2020/08/05
- [PULL 3/6] gitlab-ci.yml: Add build-system-debian and build-system-centos jobs, Thomas Huth, 2020/08/05
- [PULL 4/6] gitlab-ci: Fix Avocado cache usage, Thomas Huth, 2020/08/05
- [PULL 5/6] target/riscv/vector_helper: Fix build on 32-bit big endian hosts, Thomas Huth, 2020/08/05
- [PULL 6/6] Get rid of the libqemustub.a remainders,
Thomas Huth <=
- Re: [PULL 0/6] Improve gitlab-CI and fix a compiler warning, Peter Maydell, 2020/08/05
- Re: [PULL 0/6] Improve gitlab-CI and fix a compiler warning, Alistair Francis, 2020/08/06