From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCSFj-0001IL-4p for qemu-devel@nongnu.org; Fri, 14 Sep 2012 05:32:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TCSFe-0007ZR-4G for qemu-devel@nongnu.org; Fri, 14 Sep 2012 05:31:59 -0400 Received: from afflict.kos.to ([92.243.29.197]:43202) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCSFd-0007Z2-UD for qemu-devel@nongnu.org; Fri, 14 Sep 2012 05:31:54 -0400 Date: Fri, 14 Sep 2012 12:31:51 +0300 From: Riku Voipio Message-ID: <20120914093151.GA9047@afflict.kos.to> References: <1347612146-5407-1-git-send-email-stefanha@gmail.com> <1347612146-5407-7-git-send-email-stefanha@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1347612146-5407-7-git-send-email-stefanha@gmail.com> Subject: Re: [Qemu-devel] [PATCH 06/12] linux-user: Remove #if 0'd cpu_get_real_ticks() definition List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: Peter Maydell , Anthony Liguori , qemu-devel@nongnu.org, Stefan Hajnoczi On Fri, Sep 14, 2012 at 09:42:20AM +0100, Stefan Hajnoczi wrote: > From: Peter Maydell > > Remove the cpu_get_real_ticks() definition from linux-user/main.c. > This has been disabled via #if 0 and unused since commit 1dce7c3c22 > in 2006; the definitions we actually use are in qemu-timer.h. > > Signed-off-by: Peter Maydell > Signed-off-by: Stefan Hajnoczi Acked-by: Riku Voipio > --- > linux-user/main.c | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/linux-user/main.c b/linux-user/main.c > index 1a1c661..e84a18c 100644 > --- a/linux-user/main.c > +++ b/linux-user/main.c > @@ -89,19 +89,6 @@ int cpu_get_pic_interrupt(CPUX86State *env) > } > #endif > > -/* timers for rdtsc */ > - > -#if 0 > - > -static uint64_t emu_time; > - > -int64_t cpu_get_real_ticks(void) > -{ > - return emu_time++; > -} > - > -#endif > - > #if defined(CONFIG_USE_NPTL) > /***********************************************************/ > /* Helper routines for implementing atomic operations. */ > -- > 1.7.10.4 >