From patchwork Sun Feb 7 20:34:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 580062 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 1710314030E for ; Mon, 8 Feb 2016 07:37:46 +1100 (AEDT) Received: from localhost ([::1]:37931 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSW5Y-0000cD-4q for incoming@patchwork.ozlabs.org; Sun, 07 Feb 2016 15:37:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSW2l-0003rF-4r for qemu-devel@nongnu.org; Sun, 07 Feb 2016 15:34:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aSW2h-00077Z-P5 for qemu-devel@nongnu.org; Sun, 07 Feb 2016 15:34:51 -0500 Received: from smtp2-g21.free.fr ([212.27.42.2]:38738) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSW2h-00076o-Gb; Sun, 07 Feb 2016 15:34:47 -0500 Received: from localhost.localdomain (unknown [82.227.227.196]) by smtp2-g21.free.fr (Postfix) with ESMTP id E5FBE4B0111; Sun, 7 Feb 2016 21:32:15 +0100 (CET) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Sun, 7 Feb 2016 21:34:05 +0100 Message-Id: <1454877256-22138-3-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1454877256-22138-1-git-send-email-hpoussin@reactos.org> References: <1454877256-22138-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 212.27.42.2 Cc: qemu-ppc@nongnu.org, Alyssa Milburn , Mark Cave-Ayland , Alexander Graf , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [Qemu-devel] [PATCH v2 02/13] cuda: move unknown commands reject out of switch 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 Signed-off-by: Hervé Poussineau --- hw/misc/macio/cuda.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c index 8659dc3..81e34e7 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -590,15 +590,15 @@ static void cuda_receive_packet(CUDAState *s, } } cuda_send_packet_to_host(s, obuf, 3); - break; + return; case CUDA_GET_6805_ADDR: cuda_send_packet_to_host(s, obuf, 3); - break; + return; case CUDA_SET_TIME: ti = (((uint32_t)data[1]) << 24) + (((uint32_t)data[2]) << 16) + (((uint32_t)data[3]) << 8) + data[4]; s->tick_offset = ti - (qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) / get_ticks_per_sec()); cuda_send_packet_to_host(s, obuf, 3); - break; + return; case CUDA_GET_TIME: ti = s->tick_offset + (qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) / get_ticks_per_sec()); obuf[3] = ti >> 24; @@ -606,28 +606,28 @@ static void cuda_receive_packet(CUDAState *s, obuf[5] = ti >> 8; obuf[6] = ti; cuda_send_packet_to_host(s, obuf, 7); - break; + return; case CUDA_FILE_SERVER_FLAG: case CUDA_SET_DEVICE_LIST: case CUDA_SET_AUTO_RATE: case CUDA_SET_POWER_MESSAGES: cuda_send_packet_to_host(s, obuf, 3); - break; + return; case CUDA_POWERDOWN: cuda_send_packet_to_host(s, obuf, 3); qemu_system_shutdown_request(); - break; + return; case CUDA_RESET_SYSTEM: cuda_send_packet_to_host(s, obuf, 3); qemu_system_reset_request(); - break; + return; case CUDA_COMBINED_FORMAT_IIC: obuf[0] = ERROR_PACKET; obuf[1] = 0x5; obuf[2] = CUDA_PACKET; obuf[3] = data[0]; cuda_send_packet_to_host(s, obuf, 4); - break; + return; case CUDA_GET_SET_IIC: if (len == 4) { cuda_send_packet_to_host(s, obuf, 3); @@ -638,15 +638,17 @@ static void cuda_receive_packet(CUDAState *s, obuf[3] = data[0]; cuda_send_packet_to_host(s, obuf, 4); } - break; + return; default: - obuf[0] = ERROR_PACKET; - obuf[1] = 0x2; - obuf[2] = CUDA_PACKET; - obuf[3] = data[0]; - cuda_send_packet_to_host(s, obuf, 4); break; } + + qemu_log_mask(LOG_GUEST_ERROR, "CUDA: unknown command 0x%02x\n", data[0]); + obuf[0] = ERROR_PACKET; + obuf[1] = 0x2; /* unknown command */ + obuf[2] = CUDA_PACKET; + obuf[3] = data[0]; + cuda_send_packet_to_host(s, obuf, 4); } static void cuda_receive_packet_from_host(CUDAState *s,