From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKmUJ-0004s1-W8 for qemu-devel@nongnu.org; Fri, 22 Aug 2014 06:54:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XKmUD-0004c8-Rb for qemu-devel@nongnu.org; Fri, 22 Aug 2014 06:54:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56686) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKmUD-0004by-KX for qemu-devel@nongnu.org; Fri, 22 Aug 2014 06:54:25 -0400 From: Fam Zheng Date: Fri, 22 Aug 2014 18:54:21 +0800 Message-Id: <1408704863-12343-6-git-send-email-famz@redhat.com> In-Reply-To: <1408704863-12343-1-git-send-email-famz@redhat.com> References: <1408704863-12343-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v2 5/7] util: Move throttle.c out to top level List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, peter.crosthwaite@xilinx.com, mjt@tls.msk.ru, stefanha@redhat.com 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 --- 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 -- 2.0.3