From nobody Tue Feb 10 09:01:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494329769865776.7682575316279; Tue, 9 May 2017 04:36:09 -0700 (PDT) Received: from localhost ([::1]:36566 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d83R2-0006IR-FI for importer@patchew.org; Tue, 09 May 2017 07:36:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d83PG-00050U-5H for qemu-devel@nongnu.org; Tue, 09 May 2017 07:34:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d83PC-0002LP-53 for qemu-devel@nongnu.org; Tue, 09 May 2017 07:34:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47092) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d83PB-0002LH-SR for qemu-devel@nongnu.org; Tue, 09 May 2017 07:34:14 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D1D0D5BECB for ; Tue, 9 May 2017 11:34:12 +0000 (UTC) Received: from localhost (ovpn-112-26.ams2.redhat.com [10.36.112.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27AC891037; Tue, 9 May 2017 11:34:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D1D0D5BECB Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=marcandre.lureau@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com D1D0D5BECB From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 9 May 2017 15:33:22 +0400 Message-Id: <20170509113332.4987-4-marcandre.lureau@redhat.com> In-Reply-To: <20170509113332.4987-1-marcandre.lureau@redhat.com> References: <20170509113332.4987-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 09 May 2017 11:34:13 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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] [PATCH 03/13] 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: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Those 2 functions are specific to serial chardev, make it more clear. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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) =20 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); =20 #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 =3D backend->u.serial.data; =20 - win_chr_init(chr, serial->device, errp); + win_chr_serial_init(chr, serial->device, errp); } =20 #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) } } =20 -static int win_chr_poll(void *opaque) +static int win_chr_serial_poll(void *opaque) { Chardev *chr =3D CHARDEV(opaque); WinChardev *s =3D WIN_CHARDEV(opaque); @@ -71,7 +71,7 @@ static int win_chr_poll(void *opaque) return 0; } =20 -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 =3D WIN_CHARDEV(chr); COMMCONFIG comcfg; @@ -130,7 +130,7 @@ int win_chr_init(Chardev *chr, const char *filename, Er= ror **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; =20 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); } =20 qemu_chr_be_event(chr, CHR_EVENT_CLOSED); --=20 2.13.0.rc1.16.gd80b50c3f