From patchwork Fri Jun 2 07:40:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 770125 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 3wfGTt0NsLz9sD5 for ; Fri, 2 Jun 2017 17:45:38 +1000 (AEST) Received: from localhost ([::1]:48289 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGhH5-0000tk-PP for incoming@patchwork.ozlabs.org; Fri, 02 Jun 2017 03:45:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGhCv-0005uW-Nm for qemu-devel@nongnu.org; Fri, 02 Jun 2017 03:41:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dGhCu-0004Ng-RG for qemu-devel@nongnu.org; Fri, 02 Jun 2017 03:41:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33890) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dGhCu-0004M2-Ip for qemu-devel@nongnu.org; Fri, 02 Jun 2017 03:41:16 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8C266C04B31E; Fri, 2 Jun 2017 07:41:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8C266C04B31E Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=marcandre.lureau@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8C266C04B31E Received: from localhost (ovpn-112-28.ams2.redhat.com [10.36.112.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id E41FE87947; Fri, 2 Jun 2017 07:41:12 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Fri, 2 Jun 2017 11:40:29 +0400 Message-Id: <20170602074040.7400-5-marcandre.lureau@redhat.com> In-Reply-To: <20170602074040.7400-1-marcandre.lureau@redhat.com> References: <20170602074040.7400-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 02 Jun 2017 07:41:15 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 04/15] char-win: rename win_chr_init/poll win_chr_serial_init/poll X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Those 2 functions are specific to serial chardev, make it more clear. Signed-off-by: Marc-André Lureau Reviewed-by: Philippe Mathieu-Daudé --- chardev/char-win.h | 2 +- chardev/char-serial.c | 2 +- chardev/char-win.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chardev/char-win.h b/chardev/char-win.h index 70215e04c2..e0b3839a77 100644 --- a/chardev/char-win.h +++ b/chardev/char-win.h @@ -46,7 +46,7 @@ typedef struct { #define WIN_CHARDEV(obj) OBJECT_CHECK(WinChardev, (obj), TYPE_CHARDEV_WIN) void qemu_chr_open_win_file(Chardev *chr, HANDLE fd_out); -int win_chr_init(Chardev *chr, const char *filename, Error **errp); +int win_chr_serial_init(Chardev *chr, const char *filename, Error **errp); int win_chr_pipe_poll(void *opaque); #endif /* CHAR_WIN_H */ diff --git a/chardev/char-serial.c b/chardev/char-serial.c index 094e08dca5..fef3a91c77 100644 --- a/chardev/char-serial.c +++ b/chardev/char-serial.c @@ -45,7 +45,7 @@ static void qmp_chardev_open_serial(Chardev *chr, { ChardevHostdev *serial = backend->u.serial.data; - win_chr_init(chr, serial->device, errp); + win_chr_serial_init(chr, serial->device, errp); } #elif defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \ diff --git a/chardev/char-win.c b/chardev/char-win.c index 5e7daeeae1..11abad1521 100644 --- a/chardev/char-win.c +++ b/chardev/char-win.c @@ -56,7 +56,7 @@ static void win_chr_read(Chardev *chr, DWORD len) } } -static int win_chr_poll(void *opaque) +static int win_chr_serial_poll(void *opaque) { Chardev *chr = CHARDEV(opaque); WinChardev *s = WIN_CHARDEV(opaque); @@ -71,7 +71,7 @@ static int win_chr_poll(void *opaque) return 0; } -int win_chr_init(Chardev *chr, const char *filename, Error **errp) +int win_chr_serial_init(Chardev *chr, const char *filename, Error **errp) { WinChardev *s = WIN_CHARDEV(chr); COMMCONFIG comcfg; @@ -130,7 +130,7 @@ int win_chr_init(Chardev *chr, const char *filename, Error **errp) error_setg(errp, "Failed ClearCommError"); goto fail; } - qemu_add_polling_cb(win_chr_poll, chr); + qemu_add_polling_cb(win_chr_serial_poll, chr); return 0; fail: @@ -208,7 +208,7 @@ static void char_win_finalize(Object *obj) if (s->fpipe) { qemu_del_polling_cb(win_chr_pipe_poll, chr); } else { - qemu_del_polling_cb(win_chr_poll, chr); + qemu_del_polling_cb(win_chr_serial_poll, chr); } qemu_chr_be_event(chr, CHR_EVENT_CLOSED);