Failed in applying to current master (
apply log)
configure | 6 +-
crypto/hash-glib.c | 4 -
crypto/hmac-glib.c | 36 ---
include/glib-compat.h | 373 ++++-------------------
include/qemu/iova-tree.h | 1 -
qga/commands.c | 11 +-
tests/docker/dockerfiles/centos6.docker | 30 --
tests/docker/dockerfiles/min-glib.docker | 8 -
tests/ivshmem-test.c | 6 -
tests/test-qga.c | 2 -
tests/test-qmp-event.c | 8 +-
tests/tpm-emu.h | 4 +-
tests/vhost-user-test.c | 26 +-
trace/simple.c | 6 +-
util/iova-tree.c | 2 +-
util/osdep.c | 14 -
16 files changed, 73 insertions(+), 464 deletions(-)
delete mode 100644 tests/docker/dockerfiles/centos6.docker
delete mode 100644 tests/docker/dockerfiles/min-glib.docker