From patchwork Thu Feb 18 04:18:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 8345401 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A1E969F727 for ; Thu, 18 Feb 2016 04:21:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E02D520254 for ; Thu, 18 Feb 2016 04:21:57 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 1DE7F20204 for ; Thu, 18 Feb 2016 04:21:57 +0000 (UTC) Received: from localhost ([::1]:36542 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWG6G-0007Xv-CB for patchwork-qemu-devel@patchwork.kernel.org; Wed, 17 Feb 2016 23:21:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWG2J-00007y-Nf for qemu-devel@nongnu.org; Wed, 17 Feb 2016 23:17:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWG2H-0008Kg-H8 for qemu-devel@nongnu.org; Wed, 17 Feb 2016 23:17:51 -0500 Received: from ozlabs.org ([103.22.144.67]:59523) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWG2H-0008IJ-5s; Wed, 17 Feb 2016 23:17:49 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 59EF6140784; Thu, 18 Feb 2016 15:17:46 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1455769067; bh=5KF224L29cF1OidBSdOwdQn3thOr5h4jjikVeF1dBUc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PcrO7eYhhnZmUjc1Ha7X1avPDhJRKDzn7bKQujdTCX4ABQSDByUn0LOVk7RpHkuMy eAuvwwwIdNmDBaSZxN+75HpopXUU7lWcPYZQCO/0hlE4PJWzGh3RlBA0lnCpjnPwAZ g6DV7SfdwPtQHWBzXgfq9WX+hBl+EgLN35+I3rI8= From: David Gibson To: peter.maydell@linaro.org Date: Thu, 18 Feb 2016 15:18:34 +1100 Message-Id: <1455769127-26005-14-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455769127-26005-1-git-send-email-david@gibson.dropbear.id.au> References: <1455769127-26005-1-git-send-email-david@gibson.dropbear.id.au> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 103.22.144.67 Cc: aik@ozlabs.ru, mark.cave-ayland@ilande.co.uk, agraf@suse.de, qemu-devel@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-ppc@nongnu.org, David Gibson Subject: [Qemu-devel] [PULL 13/26] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Hervé Poussineau Signed-off-by: Hervé Poussineau Reviewed-by: Mark Cave-Ayland Signed-off-by: David Gibson --- 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,