OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

-----BEGIN PGP SIGNATURE----- 

iQFEBAABCAAuFiEEUAN8t5cGD3bwIa1WyjViTGqRccYFAlo7E5gQHGZhbXpAcmVk
 aGF0LmNvbQAKCRDKNWJMapFxxqbqB/9o7/Qz5pbUMKWAaRTwpgLXTKWvVRklNSLi
 zcgtArySmC+jcCoHioeruhXdWrtXVT6jRLz7EqghrBaWBIcIA+9mDGGzKs+QGkzD
 XF1KpWcatd90VFUI+iomI84lhexRtcQ0VxVwWsi7ir5EWlM6AtUUSiW23qD8EMat
 ESOc0Hgl7Ap2Z39GSwBNeF4FL+63jUrTKe2+S4xGs887l70H3+LzIXJyYnVhp7Vg
 QQz880P7cRyUnZ4ssFhtrJ2tAKp917pgjjJw0zoZLeWtktfhrxlV8grNJA+DSQoI
 X2zbeM/OdGp8OHoztwtFy3gAbSiNQh7AOTnYHyKUTHB4cjQQLrhc
 =SF/c
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/famz/tags/staging-pull-request' into staging

# gpg: Signature made Thu 21 Dec 2017 01:51:20 GMT
# gpg:                using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* remotes/famz/tags/staging-pull-request:
  util: add is_equal to UUID API
  Revert "docker: Enable features explicitly in test-full"

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-12-21 13:14:06 +00:00
parent 4da5c51cac bfab1aede0
commit c3e7267935
4 changed files with 19 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/qemu/uuid.h
View File

@ -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);

79
tests/docker/test-full
View File

@ -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

8
tests/test-uuid.c
View File

@ -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);

7
util/uuid.c
View File

@ -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)