From patchwork Wed Aug 19 10:57: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: 508698 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 246D114075E for ; Wed, 19 Aug 2015 20:58:11 +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=p+s/N8Ak; dkim-atps=neutral Received: from localhost ([::1]:33220 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZS14L-0000W9-BS for incoming@patchwork.ozlabs.org; Wed, 19 Aug 2015 06:58:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZS13m-00081U-U3 for qemu-devel@nongnu.org; Wed, 19 Aug 2015 06:57:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZS13j-0003lp-FT for qemu-devel@nongnu.org; Wed, 19 Aug 2015 06:57:34 -0400 Received: from mail-lb0-x22a.google.com ([2a00:1450:4010:c04::22a]:34296) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZS13j-0003lj-7K for qemu-devel@nongnu.org; Wed, 19 Aug 2015 06:57:31 -0400 Received: by lbbtg9 with SMTP id tg9so597602lbb.1 for ; Wed, 19 Aug 2015 03:57:30 -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=9+2+AhBLYtiEZFx17KUMR2F2Up5pC333VES27D1IOAc=; b=p+s/N8AkPVIOe+mIkyF969i7rAs26nYrzLMrPLBfZTEjqIVGPJHLVNJIgfoTVCkNmH V4m4Yx96pZDceujuabJD0gj9u2cNNj0svl70E4QQTGdspJgKTPvbjK5d6MUik+gfnLVo eHA7RyCB6HP02oOQ9SSq/YIDOBpb3nOiWSTHCOQOHW6HpmfNkCWaA6em9ZbJlXpCt0mY 2P1etmOWBpa0oKKLtvkBcy9bi9c2NpAzxa9nB46+hUUyM2ib4b7G5tlphg6zwEh9UQK1 jn3Shv2VNovRN7iPEfyG73nSm0Wtc3kbqkVW7rgpD/zu4frOUZC2CP1fP3Y45R7nAuRF 4oNw== X-Received: by 10.112.170.103 with SMTP id al7mr10835509lbc.66.1439981850321; Wed, 19 Aug 2015 03:57:30 -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.29 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 19 Aug 2015 03:57:29 -0700 (PDT) From: Alexander Bezzubikov X-Google-Original-From: Alexander Bezzubikov To: qemu-devel@nongnu.org Date: Wed, 19 Aug 2015 13:57:20 +0300 Message-Id: <1439981843-2860-3-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:c04::22a Cc: jsnow@redhat.com, hare@suse.de, abezzubikov@ispras.ru Subject: [Qemu-devel] [PATCH RFC v3 2/5] scsi: SCSIDiskReq declaration moved to header 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/scsi/scsi-disk.c | 12 ------------ include/hw/scsi/scsi.h | 13 +++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 64f0694..8626eba 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -53,18 +53,6 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0) typedef struct SCSIDiskState SCSIDiskState; -typedef struct SCSIDiskReq { - SCSIRequest req; - /* Both sector and sector_count are in terms of qemu 512 byte blocks. */ - uint64_t sector; - uint32_t sector_count; - uint32_t buflen; - bool started; - struct iovec iov; - QEMUIOVector qiov; - BlockAcctCookie acct; -} SCSIDiskReq; - #define SCSI_DISK_F_REMOVABLE 0 #define SCSI_DISK_F_DPOFUA 1 #define SCSI_DISK_F_NO_REMOVABLE_DEVOPS 2 diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index cdaf0f8..e25fd70 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -6,6 +6,7 @@ #include "hw/block/block.h" #include "sysemu/sysemu.h" #include "qemu/notify.h" +#include "block/accounting.h" #define MAX_SCSI_DEVS 255 @@ -120,6 +121,18 @@ extern const VMStateDescription vmstate_scsi_device; .offset = vmstate_offset_value(_state, _field, SCSIDevice), \ } +typedef struct SCSIDiskReq { + SCSIRequest req; + /* Both sector and sector_count are in terms of qemu 512 byte blocks. */ + uint64_t sector; + uint32_t sector_count; + uint32_t buflen; + bool started; + struct iovec iov; + QEMUIOVector qiov; + BlockAcctCookie acct; +} SCSIDiskReq; + /* cdrom.c */ int cdrom_read_toc(int nb_sectors, uint8_t *buf, int msf, int start_track); int cdrom_read_toc_raw(int nb_sectors, uint8_t *buf, int msf, int session_num);