* [Qemu-devel] [PULL 1/2] Revert "docker: Enable features explicitly in test-full"
2017-12-21 1:52 [Qemu-devel] [PULL 0/2] Docker and UUID patches for 2.12 Fam Zheng
@ 2017-12-21 1:52 ` Fam Zheng
2017-12-21 1:52 ` [Qemu-devel] [PULL 2/2] util: add is_equal to UUID API Fam Zheng
2017-12-21 16:33 ` [Qemu-devel] [PULL 0/2] Docker and UUID patches for 2.12 Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Fam Zheng @ 2017-12-21 1:52 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell
This reverts commit 5e8a7fe673ca5949bd51939ee36faaf3b1320de8.
It's hard to get all images to have all these packages, the usual
"FEATURES" and "require" mechanism doesn't scale with so many features.
With that change, the test basically only works in ubuntu.
Until a better way comes up, leave the feature enabling to ./configure
detection.
But don't remove the "-e" removal.
Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20171018082002.9406-1-famz@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
tests/docker/test-full | 79 +++-----------------------------------------------
1 file changed, 4 insertions(+), 75 deletions(-)
diff --git a/tests/docker/test-full b/tests/docker/test-full
index 816d5a3eec..b4e42d25d7 100755
--- a/tests/docker/test-full
+++ b/tests/docker/test-full
@@ -1,8 +1,8 @@
#!/bin/bash
#
-# Compile all the targets with as many features enabled as possible
+# Compile all the targets.
#
-# Copyright 2016, 2017 Red Hat Inc.
+# Copyright (c) 2016 Red Hat Inc.
#
# Authors:
# Fam Zheng <famz@redhat.com>
@@ -13,77 +13,6 @@
. common.rc
-cd "$BUILD_DIR" || exit 1
+cd "$BUILD_DIR"
-build_qemu \
- --enable-attr \
- --enable-bluez \
- --enable-brlapi \
- --enable-bsd-user \
- --enable-bzip2 \
- --enable-cap-ng \
- --enable-coroutine-pool \
- --enable-crypto-afalg \
- --enable-curl \
- --enable-curses \
- --enable-debug \
- --enable-debug-info \
- --enable-debug-tcg \
- --enable-docs \
- --enable-fdt \
- --enable-gcrypt \
- --enable-glusterfs \
- --enable-gnutls \
- --enable-gprof \
- --enable-gtk \
- --enable-guest-agent \
- --enable-jemalloc \
- --enable-kvm \
- --enable-libiscsi \
- --enable-libnfs \
- --enable-libssh2 \
- --enable-libusb \
- --enable-linux-aio \
- --enable-linux-user \
- --enable-live-block-migration \
- --enable-lzo \
- --enable-modules \
- --enable-numa \
- --enable-opengl \
- --enable-pie \
- --enable-profiler \
- --enable-qom-cast-debug \
- --enable-rbd \
- --enable-rdma \
- --enable-replication \
- --enable-sdl \
- --enable-seccomp \
- --enable-smartcard \
- --enable-snappy \
- --enable-spice \
- --enable-stack-protector \
- --enable-system \
- --enable-tcg \
- --enable-tcg-interpreter \
- --enable-tools \
- --enable-tpm \
- --enable-trace-backend=ftrace \
- --enable-usb-redir \
- --enable-user \
- --enable-vde \
- --enable-vhost-net \
- --enable-vhost-scsi \
- --enable-vhost-user \
- --enable-vhost-vsock \
- --enable-virtfs \
- --enable-vnc \
- --enable-vnc-jpeg \
- --enable-vnc-png \
- --enable-vnc-sasl \
- --enable-vte \
- --enable-werror \
- --enable-xen \
- --enable-xen-pci-passthrough \
- --enable-xen-pv-domain-build \
- --enable-xfsctl \
-&& make check $MAKEFLAGS && install_qemu
+build_qemu && make check $MAKEFLAGS && install_qemu
--
2.14.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Qemu-devel] [PULL 2/2] util: add is_equal to UUID API
2017-12-21 1:52 [Qemu-devel] [PULL 0/2] Docker and UUID patches for 2.12 Fam Zheng
2017-12-21 1:52 ` [Qemu-devel] [PULL 1/2] Revert "docker: Enable features explicitly in test-full" Fam Zheng
@ 2017-12-21 1:52 ` Fam Zheng
2017-12-21 16:33 ` [Qemu-devel] [PULL 0/2] Docker and UUID patches for 2.12 Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Fam Zheng @ 2017-12-21 1:52 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell
From: Roman Kagan <rkagan@virtuozzo.com>
It's going to be useful, in particular, in VMBus code massively using
uuids aka GUIDs.
Signed-off-by: Roman Kagan <rkagan@virtuozzo.com>
Message-Id: <20171127124355.26015-1-rkagan@virtuozzo.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
include/qemu/uuid.h | 2 ++
tests/test-uuid.c | 8 +++++++-
util/uuid.c | 7 ++++++-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/include/qemu/uuid.h b/include/qemu/uuid.h
index afe4840296..09489ce5c5 100644
--- a/include/qemu/uuid.h
+++ b/include/qemu/uuid.h
@@ -48,6 +48,8 @@ void qemu_uuid_generate(QemuUUID *out);
int qemu_uuid_is_null(const QemuUUID *uu);
+int qemu_uuid_is_equal(const QemuUUID *lhv, const QemuUUID *rhv);
+
void qemu_uuid_unparse(const QemuUUID *uuid, char *out);
char *qemu_uuid_unparse_strdup(const QemuUUID *uuid);
diff --git a/tests/test-uuid.c b/tests/test-uuid.c
index d3a2791fd4..22b4b0727d 100644
--- a/tests/test-uuid.c
+++ b/tests/test-uuid.c
@@ -93,12 +93,18 @@ static inline bool uuid_is_valid(QemuUUID *uuid)
static void test_uuid_generate(void)
{
+ QemuUUID uuid_not_null = { { {
+ 0x58, 0x6e, 0xce, 0x27, 0x7f, 0x09, 0x41, 0xe0,
+ 0x9e, 0x74, 0xe9, 0x01, 0x31, 0x7e, 0x9d, 0x42
+ } } };
QemuUUID uuid;
int i;
for (i = 0; i < 100; ++i) {
qemu_uuid_generate(&uuid);
g_assert(uuid_is_valid(&uuid));
+ g_assert_false(qemu_uuid_is_null(&uuid));
+ g_assert_false(qemu_uuid_is_equal(&uuid_not_null, &uuid));
}
}
@@ -168,8 +174,8 @@ static void test_uuid_unparse_strdup(void)
int main(int argc, char **argv)
{
g_test_init(&argc, &argv, NULL);
- g_test_add_func("/uuid/generate", test_uuid_generate);
g_test_add_func("/uuid/is_null", test_uuid_is_null);
+ g_test_add_func("/uuid/generate", test_uuid_generate);
g_test_add_func("/uuid/parse", test_uuid_parse);
g_test_add_func("/uuid/unparse", test_uuid_unparse);
g_test_add_func("/uuid/unparse_strdup", test_uuid_unparse_strdup);
diff --git a/util/uuid.c b/util/uuid.c
index dd6b5fdf05..ebf06c049a 100644
--- a/util/uuid.c
+++ b/util/uuid.c
@@ -41,7 +41,12 @@ void qemu_uuid_generate(QemuUUID *uuid)
int qemu_uuid_is_null(const QemuUUID *uu)
{
static QemuUUID null_uuid;
- return memcmp(uu, &null_uuid, sizeof(QemuUUID)) == 0;
+ return qemu_uuid_is_equal(uu, &null_uuid);
+}
+
+int qemu_uuid_is_equal(const QemuUUID *lhv, const QemuUUID *rhv)
+{
+ return memcmp(lhv, rhv, sizeof(QemuUUID)) == 0;
}
void qemu_uuid_unparse(const QemuUUID *uuid, char *out)
--
2.14.3
^ permalink raw reply related [flat|nested] 4+ messages in thread