From: "Hervé Poussineau" <hpoussin@reactos.org>
To: qemu-devel@nongnu.org
Cc: "Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Alexander Graf" <agraf@suse.de>,
"Alyssa Milburn" <fuzzie@fuzzie.org>,
"Hervé Poussineau" <hpoussin@reactos.org>,
qemu-ppc@nongnu.org, "David Gibson" <david@gibson.dropbear.id.au>
Subject: [Qemu-devel] [PATCH 02/13] cuda: reject unknown commands
Date: Sat, 23 Jan 2016 21:39:59 +0100 [thread overview]
Message-ID: <1453581610-23179-3-git-send-email-hpoussin@reactos.org> (raw)
In-Reply-To: <1453581610-23179-1-git-send-email-hpoussin@reactos.org>
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/misc/macio/cuda.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
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 = (((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;
@@ -605,28 +605,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);
@@ -637,10 +637,17 @@ static void cuda_receive_packet(CUDAState *s,
obuf[3] = 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", 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,
--
2.1.4
next prev parent reply other threads:[~2016-01-23 20:41 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-23 20:39 [Qemu-devel] [PATCH 00/13] cuda: misc fixes and cleanups Hervé Poussineau
2016-01-23 20:39 ` [Qemu-devel] [PATCH 01/13] cuda: add a framework to handle commands Hervé Poussineau
2016-01-24 23:10 ` David Gibson
2016-01-23 20:39 ` Hervé Poussineau [this message]
2016-01-24 23:12 ` [Qemu-devel] [PATCH 02/13] cuda: reject unknown commands David Gibson
2016-01-23 20:40 ` [Qemu-devel] [PATCH 03/13] cuda: port AUTOPOLL command to new framework Hervé Poussineau
2016-01-24 23:13 ` David Gibson
2016-01-23 20:40 ` [Qemu-devel] [PATCH 04/13] cuda: port SET_AUTO_RATE " Hervé Poussineau
2016-01-24 18:33 ` Hervé Poussineau
2016-01-24 23:21 ` David Gibson
2016-02-07 19:27 ` Mark Cave-Ayland
2016-01-23 20:40 ` [Qemu-devel] [PATCH 05/13] cuda: port SET_DEVICE_LIST " Hervé Poussineau
2016-01-24 23:23 ` David Gibson
2016-02-07 19:35 ` Mark Cave-Ayland
2016-01-23 20:40 ` [Qemu-devel] [PATCH 06/13] cuda: port POWERDOWN " Hervé Poussineau
2016-01-24 23:24 ` David Gibson
2016-01-23 20:40 ` [Qemu-devel] [PATCH 07/13] cuda: port RESET_SYSTEM " Hervé Poussineau
2016-01-24 23:24 ` David Gibson
2016-01-23 20:40 ` [Qemu-devel] [PATCH 08/13] cuda: port FILE_SERVER_FLAG " Hervé Poussineau
2016-01-24 23:25 ` David Gibson
2016-01-23 20:40 ` [Qemu-devel] [PATCH 09/13] cuda: port SET_POWER_MESSAGES " Hervé Poussineau
2016-01-24 23:26 ` David Gibson
2016-01-23 20:40 ` [Qemu-devel] [PATCH 10/13] cuda: port GET_TIME " Hervé Poussineau
2016-01-24 23:27 ` David Gibson
2016-01-23 20:40 ` [Qemu-devel] [PATCH 11/13] cuda: port SET_TIME " Hervé Poussineau
2016-01-24 23:27 ` David Gibson
2016-01-23 20:40 ` [Qemu-devel] [PATCH 12/13] cuda: remove GET_6805_ADDR command Hervé Poussineau
2016-01-25 8:35 ` Alyssa Milburn
2016-01-25 8:48 ` Mark Cave-Ayland
2016-01-25 9:51 ` Alyssa Milburn
2016-01-23 20:40 ` [Qemu-devel] [PATCH 13/13] cuda: remove CUDA_GET_SET_IIC/CUDA_COMBINED_FORMAT_IIC commands Hervé Poussineau
2016-01-25 10:00 ` Alyssa Milburn
2016-01-24 23:29 ` [Qemu-devel] [PATCH 00/13] cuda: misc fixes and cleanups David Gibson
2016-01-25 9:58 ` Alyssa Milburn
2016-01-25 13:08 ` Mark Cave-Ayland
2016-01-25 22:08 ` Hervé Poussineau
2016-01-26 11:32 ` [Qemu-devel] [Qemu-ppc] " BALATON Zoltan
2016-01-27 22:35 ` Hervé Poussineau
2016-01-28 1:45 ` BALATON Zoltan
2016-01-28 13:43 ` Hervé Poussineau
2016-02-04 20:15 ` [Qemu-devel] " Alyssa Milburn
2016-02-06 13:32 ` Mark Cave-Ayland
2016-02-06 14:30 ` Hervé Poussineau
2016-02-07 19:50 ` Mark Cave-Ayland
2016-02-07 20:38 ` Hervé Poussineau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453581610-23179-3-git-send-email-hpoussin@reactos.org \
--to=hpoussin@reactos.org \
--cc=agraf@suse.de \
--cc=david@gibson.dropbear.id.au \
--cc=fuzzie@fuzzie.org \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).