From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:34382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R62Dx-0005O3-VP for qemu-devel@nongnu.org; Tue, 20 Sep 2011 11:27:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R62Dv-0005RY-6H for qemu-devel@nongnu.org; Tue, 20 Sep 2011 11:27:05 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:37270) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R62Dv-0005Pb-1Q for qemu-devel@nongnu.org; Tue, 20 Sep 2011 11:27:03 -0400 Received: by mail-wy0-f173.google.com with SMTP id 22so679909wyh.4 for ; Tue, 20 Sep 2011 08:27:02 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 20 Sep 2011 17:26:42 +0200 Message-Id: <1316532406-25340-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1316532406-25340-1-git-send-email-pbonzini@redhat.com> References: <1316532406-25340-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 08/12] scsi-disk: store valid mode pages in a table List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org A small refactoring of the MODE SENSE implementation in scsi-disk. Signed-off-by: Paolo Bonzini --- hw/scsi-disk.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 624996b..0c47a39 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -602,10 +602,23 @@ static int scsi_emulate_mechanism_status(SCSIDiskState *s, uint8_t *outbuf) static int mode_sense_page(SCSIDiskState *s, int page, uint8_t **p_outbuf, int page_control) { + static const int mode_sense_valid[0x3f] = { + [MODE_PAGE_HD_GEOMETRY] = (1 << TYPE_DISK), + [MODE_PAGE_FLEXIBLE_DISK_GEOMETRY] = (1 << TYPE_DISK), + [MODE_PAGE_CACHING] = (1 << TYPE_DISK) | (1 << TYPE_ROM), + [MODE_PAGE_CAPABILITIES] = (1 << TYPE_ROM), + }; + BlockDriverState *bdrv = s->bs; int cylinders, heads, secs; uint8_t *p = *p_outbuf; + if ((mode_sense_valid[page] & (1 << s->qdev.type)) == 0) { + return -1; + } + + p[0] = page; + /* * If Changeable Values are requested, a mask denoting those mode parameters * that are changeable shall be returned. As we currently don't support @@ -614,10 +627,6 @@ static int mode_sense_page(SCSIDiskState *s, int page, uint8_t **p_outbuf, */ switch (page) { case MODE_PAGE_HD_GEOMETRY: - if (s->qdev.type == TYPE_ROM) { - return -1; - } - p[0] = 4; p[1] = 0x16; if (page_control == 1) { /* Changeable Values */ break; @@ -649,10 +658,6 @@ static int mode_sense_page(SCSIDiskState *s, int page, uint8_t **p_outbuf, break; case MODE_PAGE_FLEXIBLE_DISK_GEOMETRY: - if (s->qdev.type == TYPE_ROM) { - return -1; - } - p[0] = 5; p[1] = 0x1e; if (page_control == 1) { /* Changeable Values */ break; @@ -702,10 +707,6 @@ static int mode_sense_page(SCSIDiskState *s, int page, uint8_t **p_outbuf, break; case MODE_PAGE_CAPABILITIES: - if (s->qdev.type != TYPE_ROM) { - return -1; - } - p[0] = 0x2a; p[1] = 0x14; if (page_control == 1) { /* Changeable Values */ break; -- 1.7.6