From patchwork Wed Aug 19 10:57:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Bezzubikov X-Patchwork-Id: 508699 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 CF27614075E for ; Wed, 19 Aug 2015 20:59:37 +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=WxIjeoTs; dkim-atps=neutral Received: from localhost ([::1]:33230 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZS15j-0002wH-Ts for incoming@patchwork.ozlabs.org; Wed, 19 Aug 2015 06:59:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZS13m-00081V-UL for qemu-devel@nongnu.org; Wed, 19 Aug 2015 06:57:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZS13i-0003lc-AA for qemu-devel@nongnu.org; Wed, 19 Aug 2015 06:57:34 -0400 Received: from mail-la0-x232.google.com ([2a00:1450:4010:c03::232]:36839) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZS13h-0003lJ-UD for qemu-devel@nongnu.org; Wed, 19 Aug 2015 06:57:30 -0400 Received: by lagz9 with SMTP id z9so498661lag.3 for ; Wed, 19 Aug 2015 03:57:29 -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=Z4G0v8v5/e0GnjE2ztHmCV1lUmGSmMR1stMsqCSBahY=; b=WxIjeoTsyXtYGFWxrc3Igc7S839L4K/qfHiOSy0bztpvJcjWexLIRismm56lg4cAhw VwEM2Z2FIwoSdKrRuOhdnAwPBmniCLCxDY/YK62zFvm8u3b2F8s8iaMf7NfxDQeL9YTS 311Z7nyt/96/rs0P7DficXv5DOPJJAaWgGKhlhjHK+o1AnK7mh62gyFKQRev/h/6bOrq 0wmMwEjJ4FV0IQpJhA7u4p+q8EVK8k+1bLMf/1YuloMljNsaC8MURScuf3M70L7PG1OU aBY1xW/Jq8rLd9U1+J6T+t9JYM4CK5euqx8yYC+gPu1j3hWKYxg7Uqye5clC0A0M8el4 pbXw== X-Received: by 10.152.19.138 with SMTP id f10mr10711230lae.68.1439981849094; Wed, 19 Aug 2015 03:57:29 -0700 (PDT) Received: from zuban32-MS-7673.intra.ispras.ru (bran.ispras.ru. [83.149.199.196]) by smtp.gmail.com with ESMTPSA id aw4sm109079lbc.10.2015.08.19.03.57.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 19 Aug 2015 03:57:28 -0700 (PDT) From: Alexander Bezzubikov X-Google-Original-From: Alexander Bezzubikov To: qemu-devel@nongnu.org Date: Wed, 19 Aug 2015 13:57:19 +0300 Message-Id: <1439981843-2860-2-git-send-email-abezzubikov@ispras.ru> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1439981843-2860-1-git-send-email-abezzubikov@ispras.ru> References: <1439981843-2860-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::232 Cc: jsnow@redhat.com, hare@suse.de, abezzubikov@ispras.ru Subject: [Qemu-devel] [PATCH RFC v3 1/5] ide: ATAPI-SCSI bridge TypeInfo and init function created 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/bridge.h | 9 +++++++++ hw/ide/internal.h | 4 +++- hw/ide/qdev.c | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 hw/ide/bridge.h diff --git a/hw/ide/bridge.h b/hw/ide/bridge.h new file mode 100644 index 0000000..dca5d73 --- /dev/null +++ b/hw/ide/bridge.h @@ -0,0 +1,9 @@ +#ifndef HW_IDE_BRIDGE_H +#define HW_IDE_BRIDGE_H + +#include "hw/ide/internal.h" + +void ide_bridge_start_transfer(SCSIRequest *req, uint32_t len); +void ide_bridge_complete(SCSIRequest *req, uint32_t status, size_t resid); + +#endif diff --git a/hw/ide/internal.h b/hw/ide/internal.h index 30fdcbc..79c85be 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -12,6 +12,7 @@ #include "sysemu/sysemu.h" #include "hw/block/block.h" #include "block/scsi.h" +#include "hw/scsi/scsi.h" /* debug IDE devices */ //#define DEBUG_IDE @@ -317,7 +318,7 @@ typedef struct IDEDMAOps IDEDMAOps; #define SMART_DISABLE 0xd9 #define SMART_STATUS 0xda -typedef enum { IDE_HD, IDE_CD, IDE_CFATA } IDEDriveKind; +typedef enum { IDE_HD, IDE_CD, IDE_CFATA, IDE_BRIDGE } IDEDriveKind; typedef void EndTransferFunc(IDEState *); @@ -492,6 +493,7 @@ struct IDEDevice { char *serial; char *model; uint64_t wwn; + SCSIBus scsi_bus; }; /* These are used for the error_status field of IDEBus */ diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 788b361..3bf3401 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -25,6 +25,7 @@ #include "hw/block/block.h" #include "sysemu/sysemu.h" #include "qapi/visitor.h" +#include "hw/ide/bridge.h" /* --------------------------------- */ @@ -143,6 +144,17 @@ int ide_get_bios_chs_trans(BusState *bus, int unit) return DO_UPCAST(IDEBus, qbus, bus)->ifs[unit].chs_trans; } +/* BusInfo structure for ATAPI-SCSI bridge */ +static const struct SCSIBusInfo atapi_scsi_info = { + .tcq = true, + .max_target = 0, + .max_lun = 0, + + .transfer_data = NULL, + .complete = NULL, + .cancel = NULL +}; + /* --------------------------------- */ typedef struct IDEDrive { @@ -185,6 +197,12 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind) return -1; } + if (kind == IDE_BRIDGE) { + scsi_bus_new(&dev->scsi_bus, sizeof(dev->scsi_bus), &dev->qdev, + &atapi_scsi_info, NULL); + scsi_bus_legacy_handle_cmdline(&dev->scsi_bus, NULL); + } + if (!dev->version) { dev->version = g_strdup(s->version); } @@ -253,6 +271,11 @@ static int ide_cd_initfn(IDEDevice *dev) return ide_dev_initfn(dev, IDE_CD); } +static int ide_bridge_initfn(IDEDevice *dev) +{ + return ide_dev_initfn(dev, IDE_BRIDGE); +} + static int ide_drive_initfn(IDEDevice *dev) { DriveInfo *dinfo = blk_legacy_dinfo(dev->conf.blk); @@ -314,6 +337,23 @@ static const TypeInfo ide_cd_info = { .class_init = ide_cd_class_init, }; +static void ide_bridge_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + IDEDeviceClass *k = IDE_DEVICE_CLASS(klass); + k->init = ide_bridge_initfn; + dc->fw_name = "drive"; + dc->desc = "virtual ATAPI-SCSI bridge"; + dc->props = ide_cd_properties; +} + +static const TypeInfo ide_bridge_info = { + .name = "ide-bridge", + .parent = TYPE_IDE_DEVICE, + .instance_size = sizeof(IDEDrive), + .class_init = ide_bridge_class_init, +}; + static Property ide_drive_properties[] = { DEFINE_IDE_DEV_PROPERTIES(), DEFINE_PROP_END_OF_LIST(), @@ -360,6 +400,7 @@ static void ide_register_types(void) type_register_static(&ide_bus_info); type_register_static(&ide_hd_info); type_register_static(&ide_cd_info); + type_register_static(&ide_bridge_info); type_register_static(&ide_drive_info); type_register_static(&ide_device_type_info); }