From a85ce74061350bdb6f62170af3254b29cf1fc32c Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Thu, 12 Jul 2012 12:11:23 +0200 Subject: [PATCH] scsi: remove useless debug messages RH-Author: Miroslav Rezanina Message-id: Patchwork-id: 40285 O-Subject: [RHEL6 qemu-kvm PATCH 5/5] scsi: remove useless debug messages Bugzilla: 825188 RH-Acked-by: Paolo Bonzini RH-Acked-by: Laszlo Ersek RH-Acked-by: Markus Armbruster From: Paolo Bonzini Upstream relationship: 2a92fbf Optional inquiry information is declared obsolete in the latest versions of the standard; invalid CDBs or unsupported VPD pages are supported can be diagnosed with trace_scsi_inquiry. Signed-off-by: Miroslav Rezanina Signed-off-by: Paolo Bonzini --- hw/scsi-disk.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) Signed-off-by: Michal Novotny --- hw/scsi-disk.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 55c5614..0324fcc 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -28,9 +28,6 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0) #define DPRINTF(fmt, ...) do {} while(0) #endif -#define BADF(fmt, ...) \ -do { fprintf(stderr, "scsi-disk: " fmt , ## __VA_ARGS__); } while (0) - #include "qemu-common.h" #include "qemu-error.h" #include "scsi.h" @@ -415,12 +412,6 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev); int buflen = 0; - if (req->cmd.buf[1] & 0x2) { - /* Command support data - optional, not implemented */ - BADF("optional INQUIRY command support request not implemented\n"); - return -1; - } - if (req->cmd.buf[1] & 0x1) { /* Vital product data */ uint8_t page_code = req->cmd.buf[2]; @@ -538,8 +529,6 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) break; } default: - BADF("Error: unsupported Inquiry (EVPD[%02X]) " - "buffer size %zd\n", page_code, req->cmd.xfer); return -1; } /* done with EVPD */ @@ -548,8 +537,6 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) /* Standard INQUIRY data */ if (req->cmd.buf[2] != 0) { - BADF("Error: Inquiry (STANDARD) page or code " - "is non-zero [%02X]\n", req->cmd.buf[2]); return -1; } -- 1.7.11.4