From patchwork Wed Jan 14 09:41:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 428888 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 16A3214012C for ; Wed, 14 Jan 2015 20:44:47 +1100 (AEDT) Received: from localhost ([::1]:45244 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBKVJ-0007xm-73 for incoming@patchwork.ozlabs.org; Wed, 14 Jan 2015 04:44:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40037) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBKSi-00031M-S9 for qemu-devel@nongnu.org; Wed, 14 Jan 2015 04:42:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YBKSh-0000DH-Ql for qemu-devel@nongnu.org; Wed, 14 Jan 2015 04:42:04 -0500 Received: from mail-we0-x232.google.com ([2a00:1450:400c:c03::232]:33967) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBKSh-0000D3-Iw for qemu-devel@nongnu.org; Wed, 14 Jan 2015 04:42:03 -0500 Received: by mail-we0-f178.google.com with SMTP id p10so7654337wes.9 for ; Wed, 14 Jan 2015 01:42:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=e85/TGNJNmRn+c2V35rEhb978EaSnmLT1x+0o2clgdM=; b=cchuvDuP7DF39aDHCxXEizyaV/5q+wM06Um8UE8omasg8dHhSgZbJC+qJbCx0D2x/x zINCmOv9kOSLeAFk0VIuagkWkNQ0vBLnpoH1fvvn7Aq+2jfGSdofI4z55vFWw01UpPT/ 8Q2MThN0dIKtz1GBB09WYvsFBsNZiMjYlT2yMyaCn5qmhqIC+CVIQqgLOe+YxK+o4hc1 oOVTPbZWQHy8bAwRJdTE9qk4d2bTEzc3Zkn8fYA5oj0WIcP1/R0ci0b4wqelBP0I0rll FL2AhmvHIMzx45QTrAjBxMPBrfh7G0oZsD+N431mwyMfjLID4h/M+VFuNEtfgMUvoI2b JvXQ== X-Received: by 10.180.74.108 with SMTP id s12mr7096418wiv.28.1421228522926; Wed, 14 Jan 2015 01:42:02 -0800 (PST) Received: from playground.station (net-37-117-129-192.cust.vodafonedsl.it. [37.117.129.192]) by mx.google.com with ESMTPSA id hn2sm29298235wjc.5.2015.01.14.01.42.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jan 2015 01:42:01 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 14 Jan 2015 10:41:31 +0100 Message-Id: <1421228492-19856-15-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1421228492-19856-1-git-send-email-pbonzini@redhat.com> References: <1421228492-19856-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c03::232 Subject: [Qemu-devel] [PULL 14/15] qemu-timer: rename timer_init to timer_init_tl X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org timer_init is not called that often. Free the name for an equivalent of timer_new. Signed-off-by: Paolo Bonzini --- include/block/aio.h | 2 +- include/qemu/timer.h | 10 +++++----- qemu-timer.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/block/aio.h b/include/block/aio.h index 6bf0e04..7d1e26b 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -314,7 +314,7 @@ static inline void aio_timer_init(AioContext *ctx, int scale, QEMUTimerCB *cb, void *opaque) { - timer_init(ts, ctx->tlg.tl[type], scale, cb, opaque); + timer_init_tl(ts, ctx->tlg.tl[type], scale, cb, opaque); } /** diff --git a/include/qemu/timer.h b/include/qemu/timer.h index d9df094..0666920 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -410,7 +410,7 @@ int64_t timerlistgroup_deadline_ns(QEMUTimerListGroup *tlg); */ /** - * timer_init: + * timer_init_tl: * @ts: the timer to be initialised * @timer_list: the timer list to attach the timer to * @scale: the scale value for the timer @@ -423,9 +423,9 @@ int64_t timerlistgroup_deadline_ns(QEMUTimerListGroup *tlg); * You need not call an explicit deinit call. Simply make * sure it is not on a list with timer_del. */ -void timer_init(QEMUTimer *ts, - QEMUTimerList *timer_list, int scale, - QEMUTimerCB *cb, void *opaque); +void timer_init_tl(QEMUTimer *ts, + QEMUTimerList *timer_list, int scale, + QEMUTimerCB *cb, void *opaque); /** * timer_new_tl: @@ -448,7 +448,7 @@ static inline QEMUTimer *timer_new_tl(QEMUTimerList *timer_list, void *opaque) { QEMUTimer *ts = g_malloc0(sizeof(QEMUTimer)); - timer_init(ts, timer_list, scale, cb, opaque); + timer_init_tl(ts, timer_list, scale, cb, opaque); return ts; } diff --git a/qemu-timer.c b/qemu-timer.c index cb7d988..98d9d1b 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -331,9 +331,9 @@ int qemu_poll_ns(GPollFD *fds, guint nfds, int64_t timeout) } -void timer_init(QEMUTimer *ts, - QEMUTimerList *timer_list, int scale, - QEMUTimerCB *cb, void *opaque) +void timer_init_tl(QEMUTimer *ts, + QEMUTimerList *timer_list, int scale, + QEMUTimerCB *cb, void *opaque) { ts->timer_list = timer_list; ts->cb = cb;