From patchwork Fri Oct 12 00:22:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 10637689 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 67EA013AD for ; Fri, 12 Oct 2018 00:33:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 547922C3A8 for ; Fri, 12 Oct 2018 00:33:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 488022C3AF; Fri, 12 Oct 2018 00:33:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A4D5E2C3A8 for ; Fri, 12 Oct 2018 00:33:09 +0000 (UTC) Received: from localhost ([::1]:37745 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAlO8-0005HK-Sq for patchwork-qemu-devel@patchwork.kernel.org; Thu, 11 Oct 2018 20:33:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33640) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAlFJ-0006a0-Lv for qemu-devel@nongnu.org; Thu, 11 Oct 2018 20:24:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAlFI-0006ja-Ls for qemu-devel@nongnu.org; Thu, 11 Oct 2018 20:24:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37860) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gAlFI-0006jD-DO for qemu-devel@nongnu.org; Thu, 11 Oct 2018 20:24:00 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C040510F05; Fri, 12 Oct 2018 00:23:59 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-29.brq.redhat.com [10.40.204.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 78C7460501; Fri, 12 Oct 2018 00:23:57 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Prasad J Pandit Date: Fri, 12 Oct 2018 02:22:16 +0200 Message-Id: <20181012002217.2864-11-philmd@redhat.com> In-Reply-To: <20181012002217.2864-1-philmd@redhat.com> References: <20181012002217.2864-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 12 Oct 2018 00:23:59 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 10/11] chardev: Let qemu_chr_be_* use unsigned type 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: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Pavel Dovgalyuk Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Since IOCanReadHandler now returns an unsigned value, the assertion does not make sense anymore. We choose however to keep a "fail-safe" assertion to catch undesired overflows. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- chardev/char.c | 17 +++++++++-------- include/chardev/char.h | 9 +++++---- include/sysemu/replay.h | 8 ++++---- replay/replay-char.c | 8 ++++---- stubs/replay.c | 8 ++++---- 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/chardev/char.c b/chardev/char.c index 608c2569f4..ef6d07e132 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -100,7 +100,7 @@ static void qemu_chr_write_log(Chardev *s, const uint8_t *buf, size_t len) static int qemu_chr_write_buffer(Chardev *s, const uint8_t *buf, int len, - int *offset, bool write_all) + size_t *offset, bool write_all) { ChardevClass *cc = CHARDEV_GET_CLASS(s); int res = 0; @@ -132,9 +132,10 @@ static int qemu_chr_write_buffer(Chardev *s, return res; } -int qemu_chr_write(Chardev *s, const uint8_t *buf, int len, bool write_all) +size_t qemu_chr_write(Chardev *s, const uint8_t *buf, size_t len, + bool write_all) { - int offset = 0; + size_t offset = 0; int res; if (qemu_chr_replay(s) && replay_mode == REPLAY_MODE_PLAY) { @@ -156,21 +157,21 @@ int qemu_chr_write(Chardev *s, const uint8_t *buf, int len, bool write_all) return offset; } -int qemu_chr_be_can_write(Chardev *s) +size_t qemu_chr_be_can_write(Chardev *s) { CharBackend *be = s->be; - int res; + size_t res; if (!be || !be->chr_can_read) { return 0; } res = be->chr_can_read(be->opaque); - assert(res >= 0); + assert((ssize_t)res >= 0); /* "fail-safe" assertion */ return res; } -void qemu_chr_be_write_impl(Chardev *s, uint8_t *buf, int len) +void qemu_chr_be_write_impl(Chardev *s, uint8_t *buf, size_t len) { CharBackend *be = s->be; @@ -179,7 +180,7 @@ void qemu_chr_be_write_impl(Chardev *s, uint8_t *buf, int len) } } -void qemu_chr_be_write(Chardev *s, uint8_t *buf, int len) +void qemu_chr_be_write(Chardev *s, uint8_t *buf, size_t len) { if (qemu_chr_replay(s)) { if (replay_mode == REPLAY_MODE_PLAY) { diff --git a/include/chardev/char.h b/include/chardev/char.h index 091a514022..65f93adbd6 100644 --- a/include/chardev/char.h +++ b/include/chardev/char.h @@ -163,7 +163,7 @@ Chardev *qemu_chr_new_noreplay(const char *label, const char *filename, * * Returns: the number of bytes the front end can receive via @qemu_chr_be_write */ -int qemu_chr_be_can_write(Chardev *s); +size_t qemu_chr_be_can_write(Chardev *s); /** * qemu_chr_be_write: @@ -174,7 +174,7 @@ int qemu_chr_be_can_write(Chardev *s); * the caller should call @qemu_chr_be_can_write to determine how much data * the front end can currently accept. */ -void qemu_chr_be_write(Chardev *s, uint8_t *buf, int len); +void qemu_chr_be_write(Chardev *s, uint8_t *buf, size_t len); /** * qemu_chr_be_write_impl: @@ -183,7 +183,7 @@ void qemu_chr_be_write(Chardev *s, uint8_t *buf, int len); * * Implementation of back end writing. Used by replay module. */ -void qemu_chr_be_write_impl(Chardev *s, uint8_t *buf, int len); +void qemu_chr_be_write_impl(Chardev *s, uint8_t *buf, size_t len); /** * qemu_chr_be_update_read_handlers: @@ -211,7 +211,8 @@ void qemu_chr_set_feature(Chardev *chr, ChardevFeature feature); QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename, bool permit_mux_mon); -int qemu_chr_write(Chardev *s, const uint8_t *buf, int len, bool write_all); +size_t qemu_chr_write(Chardev *s, const uint8_t *buf, size_t len, + bool write_all); #define qemu_chr_write_all(s, buf, len) qemu_chr_write(s, buf, len, true) int qemu_chr_wait_connected(Chardev *chr, Error **errp); diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h index 7f7a594eca..0856b66888 100644 --- a/include/sysemu/replay.h +++ b/include/sysemu/replay.h @@ -148,17 +148,17 @@ uint64_t blkreplay_next_id(void); /*! Registers char driver to save it's events */ void replay_register_char_driver(struct Chardev *chr); /*! Saves write to char device event to the log */ -void replay_chr_be_write(struct Chardev *s, uint8_t *buf, int len); +void replay_chr_be_write(struct Chardev *s, uint8_t *buf, size_t len); /*! Writes char write return value to the replay log. */ -void replay_char_write_event_save(int res, int offset); +void replay_char_write_event_save(int res, size_t offset); /*! Reads char write return value from the replay log. */ -void replay_char_write_event_load(int *res, int *offset); +void replay_char_write_event_load(int *res, size_t *offset); /*! Reads information about read_all character event. */ int replay_char_read_all_load(uint8_t *buf); /*! Writes character read_all error code into the replay log. */ void replay_char_read_all_save_error(int res); /*! Writes character read_all execution result into the replay log. */ -void replay_char_read_all_save_buf(uint8_t *buf, int offset); +void replay_char_read_all_save_buf(uint8_t *buf, size_t offset); /* Network */ diff --git a/replay/replay-char.c b/replay/replay-char.c index 736cc8c2e6..9c4ec3c794 100644 --- a/replay/replay-char.c +++ b/replay/replay-char.c @@ -49,7 +49,7 @@ void replay_register_char_driver(Chardev *chr) char_drivers[drivers_count++] = chr; } -void replay_chr_be_write(Chardev *s, uint8_t *buf, int len) +void replay_chr_be_write(Chardev *s, uint8_t *buf, size_t len) { CharEvent *event = g_malloc0(sizeof(CharEvent)); @@ -94,7 +94,7 @@ void *replay_event_char_read_load(void) return event; } -void replay_char_write_event_save(int res, int offset) +void replay_char_write_event_save(int res, size_t offset) { g_assert(replay_mutex_locked()); @@ -104,7 +104,7 @@ void replay_char_write_event_save(int res, int offset) replay_put_dword(offset); } -void replay_char_write_event_load(int *res, int *offset) +void replay_char_write_event_load(int *res, size_t *offset) { g_assert(replay_mutex_locked()); @@ -150,7 +150,7 @@ void replay_char_read_all_save_error(int res) replay_put_dword(res); } -void replay_char_read_all_save_buf(uint8_t *buf, int offset) +void replay_char_read_all_save_buf(uint8_t *buf, size_t offset) { g_assert(replay_mutex_locked()); replay_save_instructions(); diff --git a/stubs/replay.c b/stubs/replay.c index 04279abb2c..030f508aef 100644 --- a/stubs/replay.c +++ b/stubs/replay.c @@ -34,17 +34,17 @@ void replay_register_char_driver(Chardev *chr) { } -void replay_chr_be_write(Chardev *s, uint8_t *buf, int len) +void replay_chr_be_write(Chardev *s, uint8_t *buf, size_t len) { abort(); } -void replay_char_write_event_save(int res, int offset) +void replay_char_write_event_save(int res, size_t offset) { abort(); } -void replay_char_write_event_load(int *res, int *offset) +void replay_char_write_event_load(int *res, size_t *offset) { abort(); } @@ -59,7 +59,7 @@ void replay_char_read_all_save_error(int res) abort(); } -void replay_char_read_all_save_buf(uint8_t *buf, int offset) +void replay_char_read_all_save_buf(uint8_t *buf, size_t offset) { abort(); }