From patchwork Tue Nov 17 10:17:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 38607 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F04A9B7B61 for ; Tue, 17 Nov 2009 21:22:33 +1100 (EST) Received: from localhost ([127.0.0.1]:49315 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NALCf-0001Jm-5D for incoming@patchwork.ozlabs.org; Tue, 17 Nov 2009 05:22:29 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NAL8R-0000EC-6D for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:07 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NAL8K-00008u-72 for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:05 -0500 Received: from [199.232.76.173] (port=58240 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAL8J-00008d-JU for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:17:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1555) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NAL8J-0006tp-09 for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:17:59 -0500 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAHAHvEC023522 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 17 Nov 2009 05:17:57 -0500 Received: from zweiblum.home.kraxel.org (vpn1-7-195.ams2.redhat.com [10.36.7.195]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id nAHAHrHN025171; Tue, 17 Nov 2009 05:17:54 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 0A82F70029; Tue, 17 Nov 2009 11:17:52 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 17 Nov 2009 11:17:37 +0100 Message-Id: <1258453071-3496-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1258453071-3496-1-git-send-email-kraxel@redhat.com> References: <1258453071-3496-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 01/15] scsi: add/fix header protection. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Also delete the leftover and unused scsi-disk.h file. Signed-off-by: Gerd Hoffmann Reviewed-by: Christoph Hellwig --- hw/esp.h | 5 ++++ hw/scsi-disk.h | 67 -------------------------------------------------------- hw/scsi.h | 4 +- 3 files changed, 7 insertions(+), 69 deletions(-) delete mode 100644 hw/scsi-disk.h diff --git a/hw/esp.h b/hw/esp.h index 369998f..190bc2e 100644 --- a/hw/esp.h +++ b/hw/esp.h @@ -1,3 +1,6 @@ +#ifndef QEMU_HW_ESP_H +#define QEMU_HW_ESP_H + /* esp.c */ #define ESP_MAX_DEVS 7 typedef void (*espdma_memory_read_write)(void *opaque, uint8_t *buf, int len); @@ -5,3 +8,5 @@ void esp_init(target_phys_addr_t espaddr, int it_shift, espdma_memory_read_write dma_memory_read, espdma_memory_read_write dma_memory_write, void *dma_opaque, qemu_irq irq, qemu_irq *reset); + +#endif diff --git a/hw/scsi-disk.h b/hw/scsi-disk.h deleted file mode 100644 index b6b6c12..0000000 --- a/hw/scsi-disk.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef SCSI_DISK_H -#define SCSI_DISK_H - -#include "qdev.h" - -/* scsi-disk.c */ -enum scsi_reason { - SCSI_REASON_DONE, /* Command complete. */ - SCSI_REASON_DATA /* Transfer complete, more data required. */ -}; - -typedef struct SCSIBus SCSIBus; -typedef struct SCSIDevice SCSIDevice; -typedef struct SCSIDeviceInfo SCSIDeviceInfo; -typedef void (*scsi_completionfn)(SCSIBus *bus, int reason, uint32_t tag, - uint32_t arg); - -struct SCSIDevice -{ - DeviceState qdev; - uint32_t id; - SCSIDeviceInfo *info; -}; - -/* 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); - -/* scsi-bus.c */ -typedef int (*scsi_qdev_initfn)(SCSIDevice *dev); -struct SCSIDeviceInfo { - DeviceInfo qdev; - scsi_qdev_initfn init; - void (*destroy)(SCSIDevice *s); - int32_t (*send_command)(SCSIDevice *s, uint32_t tag, uint8_t *buf, - int lun); - void (*read_data)(SCSIDevice *s, uint32_t tag); - int (*write_data)(SCSIDevice *s, uint32_t tag); - void (*cancel_io)(SCSIDevice *s, uint32_t tag); - uint8_t *(*get_buf)(SCSIDevice *s, uint32_t tag); -}; - -typedef void (*SCSIAttachFn)(DeviceState *host, BlockDriverState *bdrv, - int unit); -struct SCSIBus { - BusState qbus; - int busnr; - - int tcq, ndev; - scsi_completionfn complete; - - SCSIDevice *devs[8]; -}; - -void scsi_bus_new(SCSIBus *bus, DeviceState *host, int tcq, int ndev, - scsi_completionfn complete); -void scsi_qdev_register(SCSIDeviceInfo *info); - -static inline SCSIBus *scsi_bus_from_device(SCSIDevice *d) -{ - return DO_UPCAST(SCSIBus, qbus, d->qdev.parent_bus); -} - -SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, DriveInfo *dinfo, int unit); -void scsi_bus_legacy_handle_cmdline(SCSIBus *bus); - -#endif diff --git a/hw/scsi.h b/hw/scsi.h index b6b6c12..d2b274c 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -1,5 +1,5 @@ -#ifndef SCSI_DISK_H -#define SCSI_DISK_H +#ifndef QEMU_HW_SCSI_H +#define QEMU_HW_SCSI_H #include "qdev.h"