Il 22/08/2014 12:54, Fam Zheng ha scritto: > It is only used by block code and has dependency on timers, so move it > out to allow util to be linked unconditionally. > > Signed-off-by: Fam Zheng <f...@redhat.com> > --- > Makefile.objs | 2 +- > util/throttle.c => throttle.c | 0 > util/Makefile.objs | 1 - > 3 files changed, 1 insertion(+), 2 deletions(-) > rename util/throttle.c => throttle.c (100%) > > diff --git a/Makefile.objs b/Makefile.objs > index 97db978..6445ce9 100644 > --- a/Makefile.objs > +++ b/Makefile.objs > @@ -7,7 +7,7 @@ util-obj-y = util/ qobject/ qapi/ qapi-types.o qapi-visit.o > qapi-event.o > # block-obj-y is code used by both qemu system emulation and qemu-img > > block-obj-y = async.o thread-pool.o > -block-obj-y += nbd.o block.o blockjob.o > +block-obj-y += nbd.o block.o blockjob.o throttle.o > block-obj-y += main-loop.o iohandler.o qemu-timer.o > block-obj-$(CONFIG_POSIX) += aio-posix.o > block-obj-$(CONFIG_WIN32) += aio-win32.o > diff --git a/util/throttle.c b/throttle.c > similarity index 100% > rename from util/throttle.c > rename to throttle.c > diff --git a/util/Makefile.objs b/util/Makefile.objs > index 65a36f6..5940acc 100644 > --- a/util/Makefile.objs > +++ b/util/Makefile.objs > @@ -10,7 +10,6 @@ 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 += hexdump.o > util-obj-y += crc32c.o > -util-obj-y += throttle.o > util-obj-y += getauxval.o > util-obj-y += readline.o > util-obj-y += rfifolock.o >
Reviewed-by: Paolo Bonzini <pbonz...@redhat.com> Stefan, would you pick this up in the block branch already? Paolo