From patchwork Mon Aug 17 23:42:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Bezzubikov X-Patchwork-Id: 508160 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9E28C140549 for ; Tue, 18 Aug 2015 13:35:19 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=XruSUhWY; dkim-atps=neutral Received: from localhost ([::1]:42748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRXgC-00062f-8P for incoming@patchwork.ozlabs.org; Mon, 17 Aug 2015 23:35:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRU3D-000686-1G for qemu-devel@nongnu.org; Mon, 17 Aug 2015 19:42:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZRU39-0000mj-Ps for qemu-devel@nongnu.org; Mon, 17 Aug 2015 19:42:46 -0400 Received: from mail-lb0-x236.google.com ([2a00:1450:4010:c04::236]:34943) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRU39-0000lJ-IA for qemu-devel@nongnu.org; Mon, 17 Aug 2015 19:42:43 -0400 Received: by lbcbn3 with SMTP id bn3so91848299lbc.2 for ; Mon, 17 Aug 2015 16:42:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Wpv4hXH/ElBfi9PaoRxFXochJtH7TSwv8R+hsKQjNQo=; b=XruSUhWY/3Oc2/7HuN+sAchfL+wfxT32ssP/N9LiqWcyeaN8WkTaWfPHakJoogBaiS HTBt4zYH6QplRT0MO0bMGvm28/7IcIPusQk2OeK10PawbQxuXvCAmRaW9zXIw7Zk1hB6 8iNCNAYY3QppJrxJbF4TwbX0knB3E5J6xVG4DI0L4tfQfGEV+ZFhn700AvPauvlXswCU 9Q3TKkSLGiOi09uPM6Dbkgv/Nsx8zBYPnlzPy7wTKX9E+dgxZ/ZFcxSlLuarltpe3N1e rGRywQdLrP9uAM1FCx5d8Vq6RLblDwjPlDp3bODghKSjOIVb4yHcQ3e5ZgsBjjcIPmrx LceQ== X-Received: by 10.152.45.69 with SMTP id k5mr3146088lam.13.1439854962778; Mon, 17 Aug 2015 16:42:42 -0700 (PDT) Received: from localhost.localdomain ([79.165.121.118]) by smtp.gmail.com with ESMTPSA id tj8sm4292320lbb.22.2015.08.17.16.42.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Aug 2015 16:42:42 -0700 (PDT) From: Alexander Bezzubikov X-Google-Original-From: Alexander Bezzubikov To: qemu-devel@nongnu.org Date: Tue, 18 Aug 2015 02:42:24 +0300 Message-Id: <1439854945-5597-11-git-send-email-abezzubikov@ispras.ru> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1439854945-5597-1-git-send-email-abezzubikov@ispras.ru> References: <1439854945-5597-1-git-send-email-abezzubikov@ispras.ru> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::236 Cc: jsnow@redhat.com, hare@suse.de, abezzubikov@ispras.ru Subject: [Qemu-devel] [PATCH RFC 10/11] ide: corrected ATAPI checks to be ignored by ATAPI-SCSI bridge 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Alexander Bezzubikov --- hw/ide/atapi.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 6e73910..896f595 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -1230,7 +1230,8 @@ void ide_atapi_cmd(IDEState *s) * states rely on this behavior. */ if (!(atapi_cmd_table[s->io_buffer[0]].flags & ALLOW_UA) && - !s->tray_open && blk_is_inserted(s->blk) && s->cdrom_changed) { + (s->drive_kind != IDE_BRIDGE && !s->tray_open && + blk_is_inserted(s->blk) && s->cdrom_changed)) { if (s->cdrom_changed == 1) { ide_atapi_cmd_error(s, NOT_READY, ASC_MEDIUM_NOT_PRESENT); @@ -1245,18 +1246,13 @@ void ide_atapi_cmd(IDEState *s) /* Report a Not Ready condition if appropriate for the command */ if ((atapi_cmd_table[s->io_buffer[0]].flags & CHECK_READY) && - (!media_present(s) || !blk_is_inserted(s->blk))) + (s->drive_kind != IDE_BRIDGE && + (!media_present(s) || !blk_is_inserted(s->blk)))) { ide_atapi_cmd_error(s, NOT_READY, ASC_MEDIUM_NOT_PRESENT); return; } - /* Execute the command */ - if (atapi_cmd_table[s->io_buffer[0]].handler) { - atapi_cmd_table[s->io_buffer[0]].handler(s, buf); - return; - } - if (s->drive_kind == IDE_BRIDGE) { IDEDevice *dev = s->bus->master; SCSIDevice *scsi_dev = scsi_device_find(&dev->scsi_bus, 0, 0, 0); @@ -1273,5 +1269,11 @@ void ide_atapi_cmd(IDEState *s) return; } + /* Execute the command */ + if (atapi_cmd_table[s->io_buffer[0]].handler) { + atapi_cmd_table[s->io_buffer[0]].handler(s, buf); + return; + } + ide_atapi_cmd_error(s, ILLEGAL_REQUEST, ASC_ILLEGAL_OPCODE); }