31 files changed, 15 insertions, 13 deletions
diff --git a/Makefile.objs b/Makefile.objs
index 1c88fc1451..3b777c822e 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -29,16 +29,7 @@ universal-obj-y += $(hw-core-obj-y)
 
 #######################################################################
 # util-obj-y is code depending on the OS (win32 vs posix)
-util-obj-y = osdep.o cutils.o qemu-timer-common.o
-util-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o event_notifier-win32.o
-util-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o event_notifier-posix.o
-util-obj-y += envlist.o path.o host-utils.o cache-utils.o module.o
-util-obj-y += bitmap.o bitops.o
-util-obj-y += acl.o
-util-obj-y += error.o qemu-error.o
-util-obj-$(CONFIG_POSIX) += compatfd.o
-util-obj-y += iov.o aes.o qemu-config.o qemu-sockets.o uri.o notify.o
-util-obj-y += qemu-option.o qemu-progress.o
+util-obj-y += util/
 
 #######################################################################
 # coroutines
@@ -177,6 +168,7 @@ QEMU_CFLAGS+=$(GLIB_CFLAGS)
 
 nested-vars += \
 	stub-obj-y \
+	util-obj-y \
 	qga-obj-y \
 	qom-obj-y \
 	qapi-obj-y \
diff --git a/libcacard/Makefile b/libcacard/Makefile
index 63295f5ae6..c658d3a9b7 100644
--- a/libcacard/Makefile
+++ b/libcacard/Makefile
@@ -4,9 +4,9 @@ TOOLS += vscclient$(EXESUF)
 
 # objects linked into a shared library, built with libtool with -fPIC if required
 libcacard-obj-y = $(trace-obj-y) $(stub-obj-y) $(libcacard-y)
-libcacard-obj-y += osdep.o cutils.o qemu-timer-common.o error.o
-libcacard-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o
-libcacard-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o
+libcacard-obj-y += util/osdep.o util/cutils.o util/qemu-timer-common.o util/error.o
+libcacard-obj-$(CONFIG_WIN32) += util/oslib-win32.o util/qemu-thread-win32.o
+libcacard-obj-$(CONFIG_POSIX) += util/oslib-posix.o util/qemu-thread-posix.o
 
 libcacard-lobj-y=$(patsubst %.o,%.lo,$(libcacard-obj-y))
 
diff --git a/util/Makefile.objs b/util/Makefile.objs
new file mode 100644
index 0000000000..5baeb53af6
--- /dev/null
+++ b/util/Makefile.objs
@@ -0,0 +1,10 @@
+util-obj-y = osdep.o cutils.o qemu-timer-common.o
+util-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o event_notifier-win32.o
+util-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o event_notifier-posix.o
+util-obj-y += envlist.o path.o host-utils.o cache-utils.o module.o
+util-obj-y += bitmap.o bitops.o
+util-obj-y += acl.o
+util-obj-y += error.o qemu-error.o
+util-obj-$(CONFIG_POSIX) += compatfd.o
+util-obj-y += iov.o aes.o qemu-config.o qemu-sockets.o uri.o notify.o
+util-obj-y += qemu-option.o qemu-progress.o
diff --git a/acl.c b/util/acl.c
index 81ac25599b..81ac25599b 100644
--- a/acl.c
+++ b/util/acl.c
diff --git a/aes.c b/util/aes.c
index 1da7bff1c9..1da7bff1c9 100644
--- a/aes.c
+++ b/util/aes.c
diff --git a/bitmap.c b/util/bitmap.c
index 687841dcec..687841dcec 100644
--- a/bitmap.c
+++ b/util/bitmap.c
diff --git a/bitops.c b/util/bitops.c
index 4c3a836a01..4c3a836a01 100644
--- a/bitops.c
+++ b/util/bitops.c
diff --git a/cache-utils.c b/util/cache-utils.c
index b94013a8cb..b94013a8cb 100644
--- a/cache-utils.c
+++ b/util/cache-utils.c
diff --git a/compatfd.c b/util/compatfd.c
index 9cf3f2834d..9cf3f2834d 100644
--- a/compatfd.c
+++ b/util/compatfd.c
diff --git a/cutils.c b/util/cutils.c
index 80bb1dcbf7..80bb1dcbf7 100644
--- a/cutils.c
+++ b/util/cutils.c
diff --git a/envlist.c b/util/envlist.c
index ff99fc44e9..ff99fc44e9 100644
--- a/envlist.c
+++ b/util/envlist.c
diff --git a/error.c b/util/error.c
index 519f6b6ce0..519f6b6ce0 100644
--- a/error.c
+++ b/util/error.c
diff --git a/event_notifier-posix.c b/util/event_notifier-posix.c
index 713d7560d0..713d7560d0 100644
--- a/event_notifier-posix.c
+++ b/util/event_notifier-posix.c
diff --git a/event_notifier-win32.c b/util/event_notifier-win32.c
index 6dbb530cfa..6dbb530cfa 100644
--- a/event_notifier-win32.c
+++ b/util/event_notifier-win32.c
diff --git a/host-utils.c b/util/host-utils.c
index 5e3915abba..5e3915abba 100644
--- a/host-utils.c
+++ b/util/host-utils.c
diff --git a/iov.c b/util/iov.c
index c0f5c56618..c0f5c56618 100644
--- a/iov.c
+++ b/util/iov.c
diff --git a/module.c b/util/module.c
index 7acc33d076..7acc33d076 100644
--- a/module.c
+++ b/util/module.c
diff --git a/notify.c b/util/notify.c
index 7b7692acb2..7b7692acb2 100644
--- a/notify.c
+++ b/util/notify.c
diff --git a/osdep.c b/util/osdep.c
index 5b51a0322e..5b51a0322e 100644
--- a/osdep.c
+++ b/util/osdep.c
diff --git a/oslib-posix.c b/util/oslib-posix.c
index 4f5ec6788b..4f5ec6788b 100644
--- a/oslib-posix.c
+++ b/util/oslib-posix.c
diff --git a/oslib-win32.c b/util/oslib-win32.c
index e7e283e875..e7e283e875 100644
--- a/oslib-win32.c
+++ b/util/oslib-win32.c
diff --git a/path.c b/util/path.c
index 4c5b0f6296..4c5b0f6296 100644
--- a/path.c
+++ b/util/path.c
diff --git a/qemu-config.c b/util/qemu-config.c
index 47c81f72d3..47c81f72d3 100644
--- a/qemu-config.c
+++ b/util/qemu-config.c
diff --git a/qemu-error.c b/util/qemu-error.c
index 08a36f480c..08a36f480c 100644
--- a/qemu-error.c
+++ b/util/qemu-error.c
diff --git a/qemu-option.c b/util/qemu-option.c
index f532b765a0..f532b765a0 100644
--- a/qemu-option.c
+++ b/util/qemu-option.c
diff --git a/qemu-progress.c b/util/qemu-progress.c
index 9a3f96cd47..9a3f96cd47 100644
--- a/qemu-progress.c
+++ b/util/qemu-progress.c
diff --git a/qemu-sockets.c b/util/qemu-sockets.c
index 3537bf3d45..3537bf3d45 100644
--- a/qemu-sockets.c
+++ b/util/qemu-sockets.c
diff --git a/qemu-thread-posix.c b/util/qemu-thread-posix.c
index 4489abf1d8..4489abf1d8 100644
--- a/qemu-thread-posix.c
+++ b/util/qemu-thread-posix.c
diff --git a/qemu-thread-win32.c b/util/qemu-thread-win32.c
index 517878dcc1..517878dcc1 100644
--- a/qemu-thread-win32.c
+++ b/util/qemu-thread-win32.c
diff --git a/qemu-timer-common.c b/util/qemu-timer-common.c
index 16f5e758b2..16f5e758b2 100644
--- a/qemu-timer-common.c
+++ b/util/qemu-timer-common.c
diff --git a/uri.c b/util/uri.c
index 4238729b83..4238729b83 100644
--- a/uri.c
+++ b/util/uri.c