From patchwork Mon Aug 17 23:42:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Bezzubikov X-Patchwork-Id: 508141 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 EA89514032C for ; Tue, 18 Aug 2015 09:43: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=mZumjea2; dkim-atps=neutral Received: from localhost ([::1]:51272 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRU3h-0006Oq-W3 for incoming@patchwork.ozlabs.org; Mon, 17 Aug 2015 19:43:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRU36-00061E-TC for qemu-devel@nongnu.org; Mon, 17 Aug 2015 19:42:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZRU36-0000gT-4X for qemu-devel@nongnu.org; Mon, 17 Aug 2015 19:42:40 -0400 Received: from mail-la0-x229.google.com ([2a00:1450:4010:c03::229]:33987) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRU35-0000gN-S2 for qemu-devel@nongnu.org; Mon, 17 Aug 2015 19:42:40 -0400 Received: by labd1 with SMTP id d1so89398417lab.1 for ; Mon, 17 Aug 2015 16:42:39 -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=QZNht6nm03kwfcdGMr2Q+rRFROgy22uKga8rbvpj3Yw=; b=mZumjea2bfD0oIIlKK3Sp7MZnWUeNTZQCGbxz8c091oKDYkGgIUSK6wR9URAgaSwnX 8HkQL+tpnZhSnHlWl3hEPkGL7I+6NAvp/IXr/iWpNG5lmRr7MEypY+8+IXIlt2wL8kE9 pSZb17SVybbV2tD5lI0nMU2pJGbaiGm3www1evy9jse1z8+JgAFjE1j2ETspB6ZN6b73 OYaImnNdX2S8kdDWmJghAbz6IcY9Y8Y9feEeb0Q2az+Wbrft4c9oh/mcLQRO8Me+X/k7 AZHQJ7ZYn/zC33gzkHraUysgnROoJiU+K7cTcEoz1xzh123eB2IYo2VHTM5R/1Npj5H5 mi6g== X-Received: by 10.152.7.37 with SMTP id g5mr3163370laa.101.1439854959027; Mon, 17 Aug 2015 16:42:39 -0700 (PDT) Received: from localhost.localdomain ([79.165.121.118]) by smtp.gmail.com with ESMTPSA id tj8sm4292320lbb.22.2015.08.17.16.42.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Aug 2015 16:42:38 -0700 (PDT) From: Alexander Bezzubikov X-Google-Original-From: Alexander Bezzubikov To: qemu-devel@nongnu.org Date: Tue, 18 Aug 2015 02:42:20 +0300 Message-Id: <1439854945-5597-7-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:c03::229 Cc: jsnow@redhat.com, hare@suse.de, abezzubikov@ispras.ru Subject: [Qemu-devel] [PATCH RFC 06/11] ide: ATAPI-SCSI bridge can now forward requests to SCSI 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 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 79dd167..6e73910 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -1257,5 +1257,21 @@ void ide_atapi_cmd(IDEState *s) return; } + if (s->drive_kind == IDE_BRIDGE) { + IDEDevice *dev = s->bus->master; + SCSIDevice *scsi_dev = scsi_device_find(&dev->scsi_bus, 0, 0, 0); + s->cur_req = scsi_new_request_from_bridge(scsi_dev, 0, 0, buf, NULL); + + /* Looks like a hack, but it's better than placing it at scsi_do_read */ + if (buf[0] == READ_10) { + s->status |= BUSY_STAT; + } + + if (scsi_req_enqueue(s->cur_req)) { + scsi_req_continue(s->cur_req); + } + return; + } + ide_atapi_cmd_error(s, ILLEGAL_REQUEST, ASC_ILLEGAL_OPCODE); }