From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNUM2-0006NQ-BS for qemu-devel@nongnu.org; Sun, 24 Jan 2016 18:46:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aNUM1-0000q4-9A for qemu-devel@nongnu.org; Sun, 24 Jan 2016 18:45:58 -0500 Date: Mon, 25 Jan 2016 10:12:03 +1100 From: David Gibson Message-ID: <20160124231203.GO27454@voom.redhat.com> References: <1453581610-23179-1-git-send-email-hpoussin@reactos.org> <1453581610-23179-3-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="31zvzas5NXT9fief" Content-Disposition: inline In-Reply-To: <1453581610-23179-3-git-send-email-hpoussin@reactos.org> Subject: Re: [Qemu-devel] [PATCH 02/13] cuda: reject unknown commands List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?iso-8859-1?Q?Herv=E9?= Poussineau Cc: qemu-ppc@nongnu.org, Alyssa Milburn , Mark Cave-Ayland , qemu-devel@nongnu.org, Alexander Graf --31zvzas5NXT9fief Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Jan 23, 2016 at 09:39:59PM +0100, Herv=E9 Poussineau wrote: > Signed-off-by: Herv=E9 Poussineau > --- > hw/misc/macio/cuda.c | 25 ++++++++++++++++--------- > 1 file changed, 16 insertions(+), 9 deletions(-) >=20 > diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c > index 69f69c2..f27dd19 100644 > --- a/hw/misc/macio/cuda.c > +++ b/hw/misc/macio/cuda.c > @@ -589,15 +589,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 =3D (((uint32_t)data[1]) << 24) + (((uint32_t)data[2]) << 16)= + (((uint32_t)data[3]) << 8) + data[4]; > s->tick_offset =3D 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 =3D s->tick_offset + (qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) /= get_ticks_per_sec()); > obuf[3] =3D ti >> 24; > @@ -605,28 +605,28 @@ static void cuda_receive_packet(CUDAState *s, > obuf[5] =3D ti >> 8; > obuf[6] =3D 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] =3D ERROR_PACKET; > obuf[1] =3D 0x5; > obuf[2] =3D CUDA_PACKET; > obuf[3] =3D data[0]; > cuda_send_packet_to_host(s, obuf, 4); > - break; > + return; > case CUDA_GET_SET_IIC: > if (len =3D=3D 4) { > cuda_send_packet_to_host(s, obuf, 3); > @@ -637,10 +637,17 @@ static void cuda_receive_packet(CUDAState *s, > obuf[3] =3D data[0]; > cuda_send_packet_to_host(s, obuf, 4); > } > - break; > + return; > default: > break; > } > + > + qemu_log_mask(LOG_GUEST_ERROR, "CUDA: unknown command 0x%02x\n", dat= a[0]); AFAICT qemu_log isn't much used these days, and it's not already used in this file. I think you'd be better off with either CUDA_DPRINTF() or a tracepoint. > + obuf[0] =3D ERROR_PACKET; > + obuf[1] =3D 0x2; /* unknown command */ > + obuf[2] =3D CUDA_PACKET; > + obuf[3] =3D data[0]; > + cuda_send_packet_to_host(s, obuf, 4); > } > =20 > static void cuda_receive_packet_from_host(CUDAState *s, --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --31zvzas5NXT9fief Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWpVpDAAoJEGw4ysog2bOSylkQAORrQhNS41lH6qCZuHOwCOi8 FlauNX/m3hfmI3JOJ+kMTXQ/dwccVfBJV6Lt/Kj0wyrCbd0HUEnT6YPVz/LDpcRB 6SkZP3++jLEuPXzUIjAQub98s8AcPioyUJkppdd68O8TkU1Ci3Gko5H29FkYSh7j F3uftaV7OBEjSQIsia6J4+oJ7F2obxn4YR95XQvMNCYCAzyKvWEBS/OqiNxTugh3 sB8Tk6U0YZOP2jANDuaExXrMbYMZ7vhvsiSVXNedAewQw6XQPm95oIwoPiryTYTt xXny07RlnHGS43j5IUh6dXelDcPBblfaYgspmy3tj6FbF6uSFxnIeI0PVbBmVCY1 Sfn+DPg4Dc3y2mUN5QrAk73Xzm22v/HUzHyK7Wq7bHMgATSkE37rF3Uob+AfrfTK TJP16MHaJkJJTKlak23Z4JoPEYi35RFBMcp0TQwDVO0EcCdGnQ2vrMCZAFbRZC1I YN0Kq3LnnLBkqe/NwcpS0CfQ1ZTJwVmMaAjBeW+HE7J8JnHfedHxBS14eYptcSxL 7Pw1EHfgaXMTje8gLoF6MllHDr0dirm3b1c3LBt7IReQYfezxCW7r8bCnAmxsaA5 5Yyw4HHQS93P3bDxrlEiEQIo0ZfmzIKmgGIiBwdDMw/NSNTByORMQ6CuYrVwRSLn LsJofJ/YO1Iz5DUKj9pz =HfMy -----END PGP SIGNATURE----- --31zvzas5NXT9fief--