From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 23 Sep 2016 12:10:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/famz/tags/various-pull-request' into staging
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~10^2~14^2~5^2~170
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c892756fd133b77a5aca4745a15528a6bf5bc94;p=sdk%2Femulator%2Fqemu.git

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

# gpg: Signature made Fri 23 Sep 2016 05:58:28 BST
# gpg:                using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* remotes/famz/tags/various-pull-request: (23 commits)
  docker: exec $CMD
  docker: Terminate instances at SIGTERM and SIGHUP
  docker: Support showing environment information
  docker: Print used options before doing configure
  docker: Flatten default target list in test-quick
  docker: Update fedora image to latest
  docker: Generate /packages.txt in ubuntu image
  docker: Generate /packages.txt in fedora image
  docker: Generate /packages.txt in centos6 image
  tests: Ignore test-uuid
  Add UUID files to MAINTAINERS
  tests: Add uuid tests
  uuid: Tighten uuid parse
  vl: Switch qemu_uuid to QemuUUID
  configure: Remove detection code for UUID
  tests: No longer dependent on CONFIG_UUID
  crypto: Switch to QEMU UUID API
  vpc: Use QEMU UUID API
  vdi: Use QEMU UUID API
  vhdx: Use QEMU UUID API
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

# Conflicts:
#	tests/Makefile.include
---

4c892756fd133b77a5aca4745a15528a6bf5bc94
diff --cc tests/Makefile.include
index 1fb3866a99,7dcd5d25a1..54424a818c
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@@ -659,7 -659,7 +660,8 @@@ tests/test-filter-mirror$(EXESUF): test
  tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o $(qtest-obj-y)
  tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y)
  tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o
 +tests/ptimer-test$(EXESUF): tests/ptimer-test.o tests/ptimer-test-stubs.o hw/core/ptimer.o
+ tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y)
  
  tests/migration/stress$(EXESUF): tests/migration/stress.o
  	$(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< ,"  LINK  $(TARGET_DIR)$@")