Blame SOURCES/kvm-scsi-move-block-scsi.h-to-include-scsi-constants.h.patch

4a2fec
From a97cc2e8341bf5d50e9282946bcdf26b43ebc34c Mon Sep 17 00:00:00 2001
4a2fec
From: Paolo Bonzini <pbonzini@redhat.com>
4a2fec
Date: Sat, 2 Dec 2017 12:19:47 +0100
4a2fec
Subject: [PATCH 21/36] scsi: move block/scsi.h to include/scsi/constants.h
4a2fec
MIME-Version: 1.0
4a2fec
Content-Type: text/plain; charset=UTF-8
4a2fec
Content-Transfer-Encoding: 8bit
4a2fec
4a2fec
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
4a2fec
Message-id: <20171202121953.13317-12-pbonzini@redhat.com>
4a2fec
Patchwork-id: 78086
4a2fec
O-Subject: [RHEL7.4 qemu-kvm-rhev PATCH 11/17] scsi: move block/scsi.h to include/scsi/constants.h
4a2fec
Bugzilla: 1464908
4a2fec
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
4a2fec
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
4a2fec
RH-Acked-by: John Snow <jsnow@redhat.com>
4a2fec
4a2fec
Complete the transition by renaming this header, which was
4a2fec
shared by block/iscsi.c and the SCSI emulation code.
4a2fec
4a2fec
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
4a2fec
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
4a2fec
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
4a2fec
(cherry picked from commit 08e2c9f19ce791b3a0fb6adbf962ab4902ec5a7b)
4a2fec
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
4a2fec
---
4a2fec
 block/iscsi.c                   |   2 +-
4a2fec
 hw/block/virtio-blk.c           |   2 +-
4a2fec
 hw/scsi/megasas.c               |   2 +-
4a2fec
 hw/scsi/mptendian.c             |   2 +-
4a2fec
 hw/scsi/mptsas.c                |   2 +-
4a2fec
 hw/scsi/scsi-bus.c              |   2 +-
4a2fec
 hw/scsi/scsi-disk.c             |   2 +-
4a2fec
 hw/scsi/scsi-generic.c          |   2 +-
4a2fec
 hw/scsi/spapr_vscsi.c           |   2 +-
4a2fec
 hw/scsi/virtio-scsi-dataplane.c |   2 +-
4a2fec
 hw/scsi/virtio-scsi.c           |   2 +-
4a2fec
 hw/scsi/vmw_pvscsi.c            |   2 +-
4a2fec
 hw/usb/dev-uas.c                |   2 +-
4a2fec
 include/block/scsi.h            | 314 ----------------------------------------
4a2fec
 include/hw/ide/internal.h       |   2 +-
4a2fec
 include/scsi/constants.h        | 314 ++++++++++++++++++++++++++++++++++++++++
4a2fec
 scsi/utils.c                    |   2 +-
4a2fec
 tests/virtio-scsi-test.c        |   2 +-
4a2fec
 18 files changed, 330 insertions(+), 330 deletions(-)
4a2fec
 delete mode 100644 include/block/scsi.h
4a2fec
 create mode 100644 include/scsi/constants.h
4a2fec
4a2fec
diff --git a/block/iscsi.c b/block/iscsi.c
4a2fec
index 40adc3c..c4586be 100644
4a2fec
--- a/block/iscsi.c
4a2fec
+++ b/block/iscsi.c
4a2fec
@@ -34,7 +34,7 @@
4a2fec
 #include "qemu/bitops.h"
4a2fec
 #include "qemu/bitmap.h"
4a2fec
 #include "block/block_int.h"
4a2fec
-#include "block/scsi.h"
4a2fec
+#include "scsi/constants.h"
4a2fec
 #include "qemu/iov.h"
4a2fec
 #include "qemu/uuid.h"
4a2fec
 #include "qmp-commands.h"
4a2fec
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
4a2fec
index a16ac75..05d1440 100644
4a2fec
--- a/hw/block/virtio-blk.c
4a2fec
+++ b/hw/block/virtio-blk.c
4a2fec
@@ -22,7 +22,7 @@
4a2fec
 #include "sysemu/blockdev.h"
4a2fec
 #include "hw/virtio/virtio-blk.h"
4a2fec
 #include "dataplane/virtio-blk.h"
4a2fec
-#include "block/scsi.h"
4a2fec
+#include "scsi/constants.h"
4a2fec
 #ifdef __linux__
4a2fec
 # include <scsi/sg.h>
4a2fec
 #endif
4a2fec
diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
4a2fec
index 4ae10e3..d5eae62 100644
4a2fec
--- a/hw/scsi/megasas.c
4a2fec
+++ b/hw/scsi/megasas.c
4a2fec
@@ -27,7 +27,7 @@
4a2fec
 #include "hw/pci/msix.h"
4a2fec
 #include "qemu/iov.h"
4a2fec
 #include "hw/scsi/scsi.h"
4a2fec
-#include "block/scsi.h"
4a2fec
+#include "scsi/constants.h"
4a2fec
 #include "trace.h"
4a2fec
 #include "qapi/error.h"
4a2fec
 #include "mfi.h"
4a2fec
diff --git a/hw/scsi/mptendian.c b/hw/scsi/mptendian.c
4a2fec
index b7fe2a2..3415229 100644
4a2fec
--- a/hw/scsi/mptendian.c
4a2fec
+++ b/hw/scsi/mptendian.c
4a2fec
@@ -28,7 +28,7 @@
4a2fec
 #include "hw/pci/msi.h"
4a2fec
 #include "qemu/iov.h"
4a2fec
 #include "hw/scsi/scsi.h"
4a2fec
-#include "block/scsi.h"
4a2fec
+#include "scsi/constants.h"
4a2fec
 #include "trace.h"
4a2fec
 
4a2fec
 #include "mptsas.h"
4a2fec
diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c
4a2fec
index f807dc6..2f2c1b1 100644
4a2fec
--- a/hw/scsi/mptsas.c
4a2fec
+++ b/hw/scsi/mptsas.c
4a2fec
@@ -30,7 +30,7 @@
4a2fec
 #include "hw/pci/msi.h"
4a2fec
 #include "qemu/iov.h"
4a2fec
 #include "hw/scsi/scsi.h"
4a2fec
-#include "block/scsi.h"
4a2fec
+#include "scsi/constants.h"
4a2fec
 #include "trace.h"
4a2fec
 #include "qapi/error.h"
4a2fec
 #include "mptsas.h"
4a2fec
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
4a2fec
index f77e576..97c9525 100644
4a2fec
--- a/hw/scsi/scsi-bus.c
4a2fec
+++ b/hw/scsi/scsi-bus.c
4a2fec
@@ -3,7 +3,7 @@
4a2fec
 #include "qapi/error.h"
4a2fec
 #include "qemu/error-report.h"
4a2fec
 #include "hw/scsi/scsi.h"
4a2fec
-#include "block/scsi.h"
4a2fec
+#include "scsi/constants.h"
4a2fec
 #include "hw/qdev.h"
4a2fec
 #include "sysemu/block-backend.h"
4a2fec
 #include "sysemu/blockdev.h"
4a2fec
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
4a2fec
index b7714e3..8a63377 100644
4a2fec
--- a/hw/scsi/scsi-disk.c
4a2fec
+++ b/hw/scsi/scsi-disk.c
4a2fec
@@ -32,7 +32,7 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0)
4a2fec
 #include "qapi/error.h"
4a2fec
 #include "qemu/error-report.h"
4a2fec
 #include "hw/scsi/scsi.h"
4a2fec
-#include "block/scsi.h"
4a2fec
+#include "scsi/constants.h"
4a2fec
 #include "sysemu/sysemu.h"
4a2fec
 #include "sysemu/block-backend.h"
4a2fec
 #include "sysemu/blockdev.h"
4a2fec
diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
4a2fec
index 04c687e..bd0d9ff 100644
4a2fec
--- a/hw/scsi/scsi-generic.c
4a2fec
+++ b/hw/scsi/scsi-generic.c
4a2fec
@@ -34,7 +34,7 @@ do { printf("scsi-generic: " fmt , ## __VA_ARGS__); } while (0)
4a2fec
 do { fprintf(stderr, "scsi-generic: " fmt , ## __VA_ARGS__); } while (0)
4a2fec
 
4a2fec
 #include <scsi/sg.h>
4a2fec
-#include "block/scsi.h"
4a2fec
+#include "scsi/constants.h"
4a2fec
 
4a2fec
 #ifndef MAX_UINT
4a2fec
 #define MAX_UINT ((unsigned int)-1)
4a2fec
diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c
4a2fec
index 92a3de3..5a7ca06 100644
4a2fec
--- a/hw/scsi/spapr_vscsi.c
4a2fec
+++ b/hw/scsi/spapr_vscsi.c
4a2fec
@@ -36,7 +36,7 @@
4a2fec
 #include "cpu.h"
4a2fec
 #include "hw/hw.h"
4a2fec
 #include "hw/scsi/scsi.h"
4a2fec
-#include "block/scsi.h"
4a2fec
+#include "scsi/constants.h"
4a2fec
 #include "srp.h"
4a2fec
 #include "hw/qdev.h"
4a2fec
 #include "hw/ppc/spapr.h"
4a2fec
diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c
4a2fec
index 944ea4e..add4b3f 100644
4a2fec
--- a/hw/scsi/virtio-scsi-dataplane.c
4a2fec
+++ b/hw/scsi/virtio-scsi-dataplane.c
4a2fec
@@ -17,7 +17,7 @@
4a2fec
 #include "qemu/error-report.h"
4a2fec
 #include "sysemu/block-backend.h"
4a2fec
 #include "hw/scsi/scsi.h"
4a2fec
-#include "block/scsi.h"
4a2fec
+#include "scsi/constants.h"
4a2fec
 #include "hw/virtio/virtio-bus.h"
4a2fec
 #include "hw/virtio/virtio-access.h"
4a2fec
 
4a2fec
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
4a2fec
index 2635c38..1591283 100644
4a2fec
--- a/hw/scsi/virtio-scsi.c
4a2fec
+++ b/hw/scsi/virtio-scsi.c
4a2fec
@@ -21,7 +21,7 @@
4a2fec
 #include "qemu/iov.h"
4a2fec
 #include "sysemu/block-backend.h"
4a2fec
 #include "hw/scsi/scsi.h"
4a2fec
-#include "block/scsi.h"
4a2fec
+#include "scsi/constants.h"
4a2fec
 #include "hw/virtio/virtio-bus.h"
4a2fec
 #include "hw/virtio/virtio-access.h"
4a2fec
 
4a2fec
diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c
4a2fec
index d185393..d6b315f 100644
4a2fec
--- a/hw/scsi/vmw_pvscsi.c
4a2fec
+++ b/hw/scsi/vmw_pvscsi.c
4a2fec
@@ -28,7 +28,7 @@
4a2fec
 #include "qemu/osdep.h"
4a2fec
 #include "qapi/error.h"
4a2fec
 #include "hw/scsi/scsi.h"
4a2fec
-#include "block/scsi.h"
4a2fec
+#include "scsi/constants.h"
4a2fec
 #include "hw/pci/msi.h"
4a2fec
 #include "vmw_pvscsi.h"
4a2fec
 #include "trace.h"
4a2fec
diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c
4a2fec
index fffc424..c218b53 100644
4a2fec
--- a/hw/usb/dev-uas.c
4a2fec
+++ b/hw/usb/dev-uas.c
4a2fec
@@ -19,7 +19,7 @@
4a2fec
 #include "hw/usb.h"
4a2fec
 #include "hw/usb/desc.h"
4a2fec
 #include "hw/scsi/scsi.h"
4a2fec
-#include "block/scsi.h"
4a2fec
+#include "scsi/constants.h"
4a2fec
 
4a2fec
 /* --------------------------------------------------------------------- */
4a2fec
 
4a2fec
diff --git a/include/block/scsi.h b/include/block/scsi.h
4a2fec
deleted file mode 100644
4a2fec
index a141dd7..0000000
4a2fec
--- a/include/block/scsi.h
4a2fec
+++ /dev/null
4a2fec
@@ -1,314 +0,0 @@
4a2fec
-/* Copyright (C) 1998, 1999 Free Software Foundation, Inc.
4a2fec
-   This file is part of the GNU C Library.
4a2fec
-
4a2fec
-   The GNU C Library is free software; you can redistribute it and/or
4a2fec
-   modify it under the terms of the GNU Lesser General Public
4a2fec
-   License as published by the Free Software Foundation; either
4a2fec
-   version 2.1 of the License, or (at your option) any later version.
4a2fec
-
4a2fec
-   The GNU C Library is distributed in the hope that it will be useful,
4a2fec
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
4a2fec
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
4a2fec
-   Lesser General Public License for more details.
4a2fec
-
4a2fec
-   You should have received a copy of the GNU Lesser General Public
4a2fec
-   License along with this library; if not, see <http://www.gnu.org/licenses/>.
4a2fec
-*/
4a2fec
-
4a2fec
-/*
4a2fec
- * This header file contains public constants and structures used by
4a2fec
- * the scsi code for linux.
4a2fec
- */
4a2fec
-
4a2fec
-#ifndef BLOCK_SCSI_H
4a2fec
-#define BLOCK_SCSI_H
4a2fec
-
4a2fec
-/*
4a2fec
- *      SCSI opcodes
4a2fec
- */
4a2fec
-
4a2fec
-#define TEST_UNIT_READY       0x00
4a2fec
-#define REWIND                0x01
4a2fec
-#define REQUEST_SENSE         0x03
4a2fec
-#define FORMAT_UNIT           0x04
4a2fec
-#define READ_BLOCK_LIMITS     0x05
4a2fec
-#define INITIALIZE_ELEMENT_STATUS 0x07
4a2fec
-#define REASSIGN_BLOCKS       0x07
4a2fec
-#define READ_6                0x08
4a2fec
-#define WRITE_6               0x0a
4a2fec
-#define SET_CAPACITY          0x0b
4a2fec
-#define READ_REVERSE          0x0f
4a2fec
-#define WRITE_FILEMARKS       0x10
4a2fec
-#define SPACE                 0x11
4a2fec
-#define INQUIRY               0x12
4a2fec
-#define RECOVER_BUFFERED_DATA 0x14
4a2fec
-#define MODE_SELECT           0x15
4a2fec
-#define RESERVE               0x16
4a2fec
-#define RELEASE               0x17
4a2fec
-#define COPY                  0x18
4a2fec
-#define ERASE                 0x19
4a2fec
-#define MODE_SENSE            0x1a
4a2fec
-#define LOAD_UNLOAD           0x1b
4a2fec
-#define SCAN                  0x1b
4a2fec
-#define START_STOP            0x1b
4a2fec
-#define RECEIVE_DIAGNOSTIC    0x1c
4a2fec
-#define SEND_DIAGNOSTIC       0x1d
4a2fec
-#define ALLOW_MEDIUM_REMOVAL  0x1e
4a2fec
-#define SET_WINDOW            0x24
4a2fec
-#define READ_CAPACITY_10      0x25
4a2fec
-#define GET_WINDOW            0x25
4a2fec
-#define READ_10               0x28
4a2fec
-#define WRITE_10              0x2a
4a2fec
-#define SEND                  0x2a
4a2fec
-#define SEEK_10               0x2b
4a2fec
-#define LOCATE_10             0x2b
4a2fec
-#define POSITION_TO_ELEMENT   0x2b
4a2fec
-#define WRITE_VERIFY_10       0x2e
4a2fec
-#define VERIFY_10             0x2f
4a2fec
-#define SEARCH_HIGH           0x30
4a2fec
-#define SEARCH_EQUAL          0x31
4a2fec
-#define OBJECT_POSITION       0x31
4a2fec
-#define SEARCH_LOW            0x32
4a2fec
-#define SET_LIMITS            0x33
4a2fec
-#define PRE_FETCH             0x34
4a2fec
-#define READ_POSITION         0x34
4a2fec
-#define GET_DATA_BUFFER_STATUS 0x34
4a2fec
-#define SYNCHRONIZE_CACHE     0x35
4a2fec
-#define LOCK_UNLOCK_CACHE     0x36
4a2fec
-#define INITIALIZE_ELEMENT_STATUS_WITH_RANGE 0x37
4a2fec
-#define READ_DEFECT_DATA      0x37
4a2fec
-#define MEDIUM_SCAN           0x38
4a2fec
-#define COMPARE               0x39
4a2fec
-#define COPY_VERIFY           0x3a
4a2fec
-#define WRITE_BUFFER          0x3b
4a2fec
-#define READ_BUFFER           0x3c
4a2fec
-#define UPDATE_BLOCK          0x3d
4a2fec
-#define READ_LONG_10          0x3e
4a2fec
-#define WRITE_LONG_10         0x3f
4a2fec
-#define CHANGE_DEFINITION     0x40
4a2fec
-#define WRITE_SAME_10         0x41
4a2fec
-#define UNMAP                 0x42
4a2fec
-#define READ_TOC              0x43
4a2fec
-#define REPORT_DENSITY_SUPPORT 0x44
4a2fec
-#define GET_CONFIGURATION     0x46
4a2fec
-#define SANITIZE              0x48
4a2fec
-#define GET_EVENT_STATUS_NOTIFICATION 0x4a
4a2fec
-#define LOG_SELECT            0x4c
4a2fec
-#define LOG_SENSE             0x4d
4a2fec
-#define READ_DISC_INFORMATION 0x51
4a2fec
-#define RESERVE_TRACK         0x53
4a2fec
-#define MODE_SELECT_10        0x55
4a2fec
-#define RESERVE_10            0x56
4a2fec
-#define RELEASE_10            0x57
4a2fec
-#define MODE_SENSE_10         0x5a
4a2fec
-#define SEND_CUE_SHEET        0x5d
4a2fec
-#define PERSISTENT_RESERVE_IN 0x5e
4a2fec
-#define PERSISTENT_RESERVE_OUT 0x5f
4a2fec
-#define VARLENGTH_CDB         0x7f
4a2fec
-#define WRITE_FILEMARKS_16    0x80
4a2fec
-#define READ_REVERSE_16       0x81
4a2fec
-#define ALLOW_OVERWRITE       0x82
4a2fec
-#define EXTENDED_COPY         0x83
4a2fec
-#define ATA_PASSTHROUGH_16    0x85
4a2fec
-#define ACCESS_CONTROL_IN     0x86
4a2fec
-#define ACCESS_CONTROL_OUT    0x87
4a2fec
-#define READ_16               0x88
4a2fec
-#define COMPARE_AND_WRITE     0x89
4a2fec
-#define WRITE_16              0x8a
4a2fec
-#define WRITE_VERIFY_16       0x8e
4a2fec
-#define VERIFY_16             0x8f
4a2fec
-#define PRE_FETCH_16          0x90
4a2fec
-#define SPACE_16              0x91
4a2fec
-#define SYNCHRONIZE_CACHE_16  0x91
4a2fec
-#define LOCATE_16             0x92
4a2fec
-#define WRITE_SAME_16         0x93
4a2fec
-#define ERASE_16              0x93
4a2fec
-#define SERVICE_ACTION_IN_16  0x9e
4a2fec
-#define WRITE_LONG_16         0x9f
4a2fec
-#define REPORT_LUNS           0xa0
4a2fec
-#define ATA_PASSTHROUGH_12    0xa1
4a2fec
-#define MAINTENANCE_IN        0xa3
4a2fec
-#define MAINTENANCE_OUT       0xa4
4a2fec
-#define MOVE_MEDIUM           0xa5
4a2fec
-#define EXCHANGE_MEDIUM       0xa6
4a2fec
-#define SET_READ_AHEAD        0xa7
4a2fec
-#define READ_12               0xa8
4a2fec
-#define WRITE_12              0xaa
4a2fec
-#define SERVICE_ACTION_IN_12  0xab
4a2fec
-#define ERASE_12              0xac
4a2fec
-#define READ_DVD_STRUCTURE    0xad
4a2fec
-#define WRITE_VERIFY_12       0xae
4a2fec
-#define VERIFY_12             0xaf
4a2fec
-#define SEARCH_HIGH_12        0xb0
4a2fec
-#define SEARCH_EQUAL_12       0xb1
4a2fec
-#define SEARCH_LOW_12         0xb2
4a2fec
-#define READ_ELEMENT_STATUS   0xb8
4a2fec
-#define SEND_VOLUME_TAG       0xb6
4a2fec
-#define READ_DEFECT_DATA_12   0xb7
4a2fec
-#define SET_CD_SPEED          0xbb
4a2fec
-#define MECHANISM_STATUS      0xbd
4a2fec
-#define READ_CD               0xbe
4a2fec
-#define SEND_DVD_STRUCTURE    0xbf
4a2fec
-
4a2fec
-/*
4a2fec
- * SERVICE ACTION IN subcodes
4a2fec
- */
4a2fec
-#define SAI_READ_CAPACITY_16  0x10
4a2fec
-
4a2fec
-/*
4a2fec
- * READ POSITION service action codes
4a2fec
- */
4a2fec
-#define SHORT_FORM_BLOCK_ID  0x00
4a2fec
-#define SHORT_FORM_VENDOR_SPECIFIC 0x01
4a2fec
-#define LONG_FORM            0x06
4a2fec
-#define EXTENDED_FORM        0x08
4a2fec
-
4a2fec
-/*
4a2fec
- *  SAM Status codes
4a2fec
- */
4a2fec
-
4a2fec
-#define GOOD                 0x00
4a2fec
-#define CHECK_CONDITION      0x02
4a2fec
-#define CONDITION_GOOD       0x04
4a2fec
-#define BUSY                 0x08
4a2fec
-#define INTERMEDIATE_GOOD    0x10
4a2fec
-#define INTERMEDIATE_C_GOOD  0x14
4a2fec
-#define RESERVATION_CONFLICT 0x18
4a2fec
-#define COMMAND_TERMINATED   0x22
4a2fec
-#define TASK_SET_FULL        0x28
4a2fec
-#define ACA_ACTIVE           0x30
4a2fec
-#define TASK_ABORTED         0x40
4a2fec
-
4a2fec
-#define STATUS_MASK          0x3e
4a2fec
-
4a2fec
-/*
4a2fec
- *  SENSE KEYS
4a2fec
- */
4a2fec
-
4a2fec
-#define NO_SENSE            0x00
4a2fec
-#define RECOVERED_ERROR     0x01
4a2fec
-#define NOT_READY           0x02
4a2fec
-#define MEDIUM_ERROR        0x03
4a2fec
-#define HARDWARE_ERROR      0x04
4a2fec
-#define ILLEGAL_REQUEST     0x05
4a2fec
-#define UNIT_ATTENTION      0x06
4a2fec
-#define DATA_PROTECT        0x07
4a2fec
-#define BLANK_CHECK         0x08
4a2fec
-#define COPY_ABORTED        0x0a
4a2fec
-#define ABORTED_COMMAND     0x0b
4a2fec
-#define VOLUME_OVERFLOW     0x0d
4a2fec
-#define MISCOMPARE          0x0e
4a2fec
-
4a2fec
-
4a2fec
-/*
4a2fec
- *  DEVICE TYPES
4a2fec
- */
4a2fec
-
4a2fec
-#define TYPE_DISK           0x00
4a2fec
-#define TYPE_TAPE           0x01
4a2fec
-#define TYPE_PRINTER        0x02
4a2fec
-#define TYPE_PROCESSOR      0x03    /* HP scanners use this */
4a2fec
-#define TYPE_WORM           0x04    /* Treated as ROM by our system */
4a2fec
-#define TYPE_ROM            0x05
4a2fec
-#define TYPE_SCANNER        0x06
4a2fec
-#define TYPE_MOD            0x07    /* Magneto-optical disk -
4a2fec
-				     * - treated as TYPE_DISK */
4a2fec
-#define TYPE_MEDIUM_CHANGER 0x08
4a2fec
-#define TYPE_STORAGE_ARRAY  0x0c    /* Storage array device */
4a2fec
-#define TYPE_ENCLOSURE      0x0d    /* Enclosure Services Device */
4a2fec
-#define TYPE_RBC            0x0e    /* Simplified Direct-Access Device */
4a2fec
-#define TYPE_OSD            0x11    /* Object-storage Device */
4a2fec
-#define TYPE_WLUN           0x1e    /* Well known LUN */
4a2fec
-#define TYPE_NOT_PRESENT    0x1f
4a2fec
-#define TYPE_INACTIVE       0x20
4a2fec
-#define TYPE_NO_LUN         0x7f
4a2fec
-
4a2fec
-/* Mode page codes for mode sense/set */
4a2fec
-#define MODE_PAGE_R_W_ERROR                   0x01
4a2fec
-#define MODE_PAGE_HD_GEOMETRY                 0x04
4a2fec
-#define MODE_PAGE_FLEXIBLE_DISK_GEOMETRY      0x05
4a2fec
-#define MODE_PAGE_CACHING                     0x08
4a2fec
-#define MODE_PAGE_AUDIO_CTL                   0x0e
4a2fec
-#define MODE_PAGE_POWER                       0x1a
4a2fec
-#define MODE_PAGE_FAULT_FAIL                  0x1c
4a2fec
-#define MODE_PAGE_TO_PROTECT                  0x1d
4a2fec
-#define MODE_PAGE_CAPABILITIES                0x2a
4a2fec
-#define MODE_PAGE_ALLS                        0x3f
4a2fec
-/* Not in Mt. Fuji, but in ATAPI 2.6 -- deprecated now in favor
4a2fec
- * of MODE_PAGE_SENSE_POWER */
4a2fec
-#define MODE_PAGE_CDROM                       0x0d
4a2fec
-
4a2fec
-/* Event notification classes for GET EVENT STATUS NOTIFICATION */
4a2fec
-#define GESN_NO_EVENTS                0
4a2fec
-#define GESN_OPERATIONAL_CHANGE       1
4a2fec
-#define GESN_POWER_MANAGEMENT         2
4a2fec
-#define GESN_EXTERNAL_REQUEST         3
4a2fec
-#define GESN_MEDIA                    4
4a2fec
-#define GESN_MULTIPLE_HOSTS           5
4a2fec
-#define GESN_DEVICE_BUSY              6
4a2fec
-
4a2fec
-/* Event codes for MEDIA event status notification */
4a2fec
-#define MEC_NO_CHANGE                 0
4a2fec
-#define MEC_EJECT_REQUESTED           1
4a2fec
-#define MEC_NEW_MEDIA                 2
4a2fec
-#define MEC_MEDIA_REMOVAL             3 /* only for media changers */
4a2fec
-#define MEC_MEDIA_CHANGED             4 /* only for media changers */
4a2fec
-#define MEC_BG_FORMAT_COMPLETED       5 /* MRW or DVD+RW b/g format completed */
4a2fec
-#define MEC_BG_FORMAT_RESTARTED       6 /* MRW or DVD+RW b/g format restarted */
4a2fec
-
4a2fec
-#define MS_TRAY_OPEN                  1
4a2fec
-#define MS_MEDIA_PRESENT              2
4a2fec
-
4a2fec
-/*
4a2fec
- * Based on values from <linux/cdrom.h> but extending CD_MINS
4a2fec
- * to the maximum common size allowed by the Orange's Book ATIP
4a2fec
- *
4a2fec
- * 90 and 99 min CDs are also available but using them as the
4a2fec
- * upper limit reduces the effectiveness of the heuristic to
4a2fec
- * detect DVDs burned to less than 25% of their maximum capacity
4a2fec
- */
4a2fec
-
4a2fec
-/* Some generally useful CD-ROM information */
4a2fec
-#define CD_MINS                       80 /* max. minutes per CD */
4a2fec
-#define CD_SECS                       60 /* seconds per minute */
4a2fec
-#define CD_FRAMES                     75 /* frames per second */
4a2fec
-#define CD_FRAMESIZE                2048 /* bytes per frame, "cooked" mode */
4a2fec
-#define CD_MAX_BYTES       (CD_MINS * CD_SECS * CD_FRAMES * CD_FRAMESIZE)
4a2fec
-#define CD_MAX_SECTORS     (CD_MAX_BYTES / 512)
4a2fec
-
4a2fec
-/*
4a2fec
- * The MMC values are not IDE specific and might need to be moved
4a2fec
- * to a common header if they are also needed for the SCSI emulation
4a2fec
- */
4a2fec
-
4a2fec
-/* Profile list from MMC-6 revision 1 table 91 */
4a2fec
-#define MMC_PROFILE_NONE                0x0000
4a2fec
-#define MMC_PROFILE_CD_ROM              0x0008
4a2fec
-#define MMC_PROFILE_CD_R                0x0009
4a2fec
-#define MMC_PROFILE_CD_RW               0x000A
4a2fec
-#define MMC_PROFILE_DVD_ROM             0x0010
4a2fec
-#define MMC_PROFILE_DVD_R_SR            0x0011
4a2fec
-#define MMC_PROFILE_DVD_RAM             0x0012
4a2fec
-#define MMC_PROFILE_DVD_RW_RO           0x0013
4a2fec
-#define MMC_PROFILE_DVD_RW_SR           0x0014
4a2fec
-#define MMC_PROFILE_DVD_R_DL_SR         0x0015
4a2fec
-#define MMC_PROFILE_DVD_R_DL_JR         0x0016
4a2fec
-#define MMC_PROFILE_DVD_RW_DL           0x0017
4a2fec
-#define MMC_PROFILE_DVD_DDR             0x0018
4a2fec
-#define MMC_PROFILE_DVD_PLUS_RW         0x001A
4a2fec
-#define MMC_PROFILE_DVD_PLUS_R          0x001B
4a2fec
-#define MMC_PROFILE_DVD_PLUS_RW_DL      0x002A
4a2fec
-#define MMC_PROFILE_DVD_PLUS_R_DL       0x002B
4a2fec
-#define MMC_PROFILE_BD_ROM              0x0040
4a2fec
-#define MMC_PROFILE_BD_R_SRM            0x0041
4a2fec
-#define MMC_PROFILE_BD_R_RRM            0x0042
4a2fec
-#define MMC_PROFILE_BD_RE               0x0043
4a2fec
-#define MMC_PROFILE_HDDVD_ROM           0x0050
4a2fec
-#define MMC_PROFILE_HDDVD_R             0x0051
4a2fec
-#define MMC_PROFILE_HDDVD_RAM           0x0052
4a2fec
-#define MMC_PROFILE_HDDVD_RW            0x0053
4a2fec
-#define MMC_PROFILE_HDDVD_R_DL          0x0058
4a2fec
-#define MMC_PROFILE_HDDVD_RW_DL         0x005A
4a2fec
-#define MMC_PROFILE_INVALID             0xFFFF
4a2fec
-
4a2fec
-#endif
4a2fec
diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h
4a2fec
index f1aca72..41cd42d 100644
4a2fec
--- a/include/hw/ide/internal.h
4a2fec
+++ b/include/hw/ide/internal.h
4a2fec
@@ -11,7 +11,7 @@
4a2fec
 #include "sysemu/dma.h"
4a2fec
 #include "sysemu/sysemu.h"
4a2fec
 #include "hw/block/block.h"
4a2fec
-#include "block/scsi.h"
4a2fec
+#include "scsi/constants.h"
4a2fec
 
4a2fec
 /* debug IDE devices */
4a2fec
 //#define DEBUG_IDE
4a2fec
diff --git a/include/scsi/constants.h b/include/scsi/constants.h
4a2fec
new file mode 100644
4a2fec
index 0000000..a141dd7
4a2fec
--- /dev/null
4a2fec
+++ b/include/scsi/constants.h
4a2fec
@@ -0,0 +1,314 @@
4a2fec
+/* Copyright (C) 1998, 1999 Free Software Foundation, Inc.
4a2fec
+   This file is part of the GNU C Library.
4a2fec
+
4a2fec
+   The GNU C Library is free software; you can redistribute it and/or
4a2fec
+   modify it under the terms of the GNU Lesser General Public
4a2fec
+   License as published by the Free Software Foundation; either
4a2fec
+   version 2.1 of the License, or (at your option) any later version.
4a2fec
+
4a2fec
+   The GNU C Library is distributed in the hope that it will be useful,
4a2fec
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
4a2fec
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
4a2fec
+   Lesser General Public License for more details.
4a2fec
+
4a2fec
+   You should have received a copy of the GNU Lesser General Public
4a2fec
+   License along with this library; if not, see <http://www.gnu.org/licenses/>.
4a2fec
+*/
4a2fec
+
4a2fec
+/*
4a2fec
+ * This header file contains public constants and structures used by
4a2fec
+ * the scsi code for linux.
4a2fec
+ */
4a2fec
+
4a2fec
+#ifndef BLOCK_SCSI_H
4a2fec
+#define BLOCK_SCSI_H
4a2fec
+
4a2fec
+/*
4a2fec
+ *      SCSI opcodes
4a2fec
+ */
4a2fec
+
4a2fec
+#define TEST_UNIT_READY       0x00
4a2fec
+#define REWIND                0x01
4a2fec
+#define REQUEST_SENSE         0x03
4a2fec
+#define FORMAT_UNIT           0x04
4a2fec
+#define READ_BLOCK_LIMITS     0x05
4a2fec
+#define INITIALIZE_ELEMENT_STATUS 0x07
4a2fec
+#define REASSIGN_BLOCKS       0x07
4a2fec
+#define READ_6                0x08
4a2fec
+#define WRITE_6               0x0a
4a2fec
+#define SET_CAPACITY          0x0b
4a2fec
+#define READ_REVERSE          0x0f
4a2fec
+#define WRITE_FILEMARKS       0x10
4a2fec
+#define SPACE                 0x11
4a2fec
+#define INQUIRY               0x12
4a2fec
+#define RECOVER_BUFFERED_DATA 0x14
4a2fec
+#define MODE_SELECT           0x15
4a2fec
+#define RESERVE               0x16
4a2fec
+#define RELEASE               0x17
4a2fec
+#define COPY                  0x18
4a2fec
+#define ERASE                 0x19
4a2fec
+#define MODE_SENSE            0x1a
4a2fec
+#define LOAD_UNLOAD           0x1b
4a2fec
+#define SCAN                  0x1b
4a2fec
+#define START_STOP            0x1b
4a2fec
+#define RECEIVE_DIAGNOSTIC    0x1c
4a2fec
+#define SEND_DIAGNOSTIC       0x1d
4a2fec
+#define ALLOW_MEDIUM_REMOVAL  0x1e
4a2fec
+#define SET_WINDOW            0x24
4a2fec
+#define READ_CAPACITY_10      0x25
4a2fec
+#define GET_WINDOW            0x25
4a2fec
+#define READ_10               0x28
4a2fec
+#define WRITE_10              0x2a
4a2fec
+#define SEND                  0x2a
4a2fec
+#define SEEK_10               0x2b
4a2fec
+#define LOCATE_10             0x2b
4a2fec
+#define POSITION_TO_ELEMENT   0x2b
4a2fec
+#define WRITE_VERIFY_10       0x2e
4a2fec
+#define VERIFY_10             0x2f
4a2fec
+#define SEARCH_HIGH           0x30
4a2fec
+#define SEARCH_EQUAL          0x31
4a2fec
+#define OBJECT_POSITION       0x31
4a2fec
+#define SEARCH_LOW            0x32
4a2fec
+#define SET_LIMITS            0x33
4a2fec
+#define PRE_FETCH             0x34
4a2fec
+#define READ_POSITION         0x34
4a2fec
+#define GET_DATA_BUFFER_STATUS 0x34
4a2fec
+#define SYNCHRONIZE_CACHE     0x35
4a2fec
+#define LOCK_UNLOCK_CACHE     0x36
4a2fec
+#define INITIALIZE_ELEMENT_STATUS_WITH_RANGE 0x37
4a2fec
+#define READ_DEFECT_DATA      0x37
4a2fec
+#define MEDIUM_SCAN           0x38
4a2fec
+#define COMPARE               0x39
4a2fec
+#define COPY_VERIFY           0x3a
4a2fec
+#define WRITE_BUFFER          0x3b
4a2fec
+#define READ_BUFFER           0x3c
4a2fec
+#define UPDATE_BLOCK          0x3d
4a2fec
+#define READ_LONG_10          0x3e
4a2fec
+#define WRITE_LONG_10         0x3f
4a2fec
+#define CHANGE_DEFINITION     0x40
4a2fec
+#define WRITE_SAME_10         0x41
4a2fec
+#define UNMAP                 0x42
4a2fec
+#define READ_TOC              0x43
4a2fec
+#define REPORT_DENSITY_SUPPORT 0x44
4a2fec
+#define GET_CONFIGURATION     0x46
4a2fec
+#define SANITIZE              0x48
4a2fec
+#define GET_EVENT_STATUS_NOTIFICATION 0x4a
4a2fec
+#define LOG_SELECT            0x4c
4a2fec
+#define LOG_SENSE             0x4d
4a2fec
+#define READ_DISC_INFORMATION 0x51
4a2fec
+#define RESERVE_TRACK         0x53
4a2fec
+#define MODE_SELECT_10        0x55
4a2fec
+#define RESERVE_10            0x56
4a2fec
+#define RELEASE_10            0x57
4a2fec
+#define MODE_SENSE_10         0x5a
4a2fec
+#define SEND_CUE_SHEET        0x5d
4a2fec
+#define PERSISTENT_RESERVE_IN 0x5e
4a2fec
+#define PERSISTENT_RESERVE_OUT 0x5f
4a2fec
+#define VARLENGTH_CDB         0x7f
4a2fec
+#define WRITE_FILEMARKS_16    0x80
4a2fec
+#define READ_REVERSE_16       0x81
4a2fec
+#define ALLOW_OVERWRITE       0x82
4a2fec
+#define EXTENDED_COPY         0x83
4a2fec
+#define ATA_PASSTHROUGH_16    0x85
4a2fec
+#define ACCESS_CONTROL_IN     0x86
4a2fec
+#define ACCESS_CONTROL_OUT    0x87
4a2fec
+#define READ_16               0x88
4a2fec
+#define COMPARE_AND_WRITE     0x89
4a2fec
+#define WRITE_16              0x8a
4a2fec
+#define WRITE_VERIFY_16       0x8e
4a2fec
+#define VERIFY_16             0x8f
4a2fec
+#define PRE_FETCH_16          0x90
4a2fec
+#define SPACE_16              0x91
4a2fec
+#define SYNCHRONIZE_CACHE_16  0x91
4a2fec
+#define LOCATE_16             0x92
4a2fec
+#define WRITE_SAME_16         0x93
4a2fec
+#define ERASE_16              0x93
4a2fec
+#define SERVICE_ACTION_IN_16  0x9e
4a2fec
+#define WRITE_LONG_16         0x9f
4a2fec
+#define REPORT_LUNS           0xa0
4a2fec
+#define ATA_PASSTHROUGH_12    0xa1
4a2fec
+#define MAINTENANCE_IN        0xa3
4a2fec
+#define MAINTENANCE_OUT       0xa4
4a2fec
+#define MOVE_MEDIUM           0xa5
4a2fec
+#define EXCHANGE_MEDIUM       0xa6
4a2fec
+#define SET_READ_AHEAD        0xa7
4a2fec
+#define READ_12               0xa8
4a2fec
+#define WRITE_12              0xaa
4a2fec
+#define SERVICE_ACTION_IN_12  0xab
4a2fec
+#define ERASE_12              0xac
4a2fec
+#define READ_DVD_STRUCTURE    0xad
4a2fec
+#define WRITE_VERIFY_12       0xae
4a2fec
+#define VERIFY_12             0xaf
4a2fec
+#define SEARCH_HIGH_12        0xb0
4a2fec
+#define SEARCH_EQUAL_12       0xb1
4a2fec
+#define SEARCH_LOW_12         0xb2
4a2fec
+#define READ_ELEMENT_STATUS   0xb8
4a2fec
+#define SEND_VOLUME_TAG       0xb6
4a2fec
+#define READ_DEFECT_DATA_12   0xb7
4a2fec
+#define SET_CD_SPEED          0xbb
4a2fec
+#define MECHANISM_STATUS      0xbd
4a2fec
+#define READ_CD               0xbe
4a2fec
+#define SEND_DVD_STRUCTURE    0xbf
4a2fec
+
4a2fec
+/*
4a2fec
+ * SERVICE ACTION IN subcodes
4a2fec
+ */
4a2fec
+#define SAI_READ_CAPACITY_16  0x10
4a2fec
+
4a2fec
+/*
4a2fec
+ * READ POSITION service action codes
4a2fec
+ */
4a2fec
+#define SHORT_FORM_BLOCK_ID  0x00
4a2fec
+#define SHORT_FORM_VENDOR_SPECIFIC 0x01
4a2fec
+#define LONG_FORM            0x06
4a2fec
+#define EXTENDED_FORM        0x08
4a2fec
+
4a2fec
+/*
4a2fec
+ *  SAM Status codes
4a2fec
+ */
4a2fec
+
4a2fec
+#define GOOD                 0x00
4a2fec
+#define CHECK_CONDITION      0x02
4a2fec
+#define CONDITION_GOOD       0x04
4a2fec
+#define BUSY                 0x08
4a2fec
+#define INTERMEDIATE_GOOD    0x10
4a2fec
+#define INTERMEDIATE_C_GOOD  0x14
4a2fec
+#define RESERVATION_CONFLICT 0x18
4a2fec
+#define COMMAND_TERMINATED   0x22
4a2fec
+#define TASK_SET_FULL        0x28
4a2fec
+#define ACA_ACTIVE           0x30
4a2fec
+#define TASK_ABORTED         0x40
4a2fec
+
4a2fec
+#define STATUS_MASK          0x3e
4a2fec
+
4a2fec
+/*
4a2fec
+ *  SENSE KEYS
4a2fec
+ */
4a2fec
+
4a2fec
+#define NO_SENSE            0x00
4a2fec
+#define RECOVERED_ERROR     0x01
4a2fec
+#define NOT_READY           0x02
4a2fec
+#define MEDIUM_ERROR        0x03
4a2fec
+#define HARDWARE_ERROR      0x04
4a2fec
+#define ILLEGAL_REQUEST     0x05
4a2fec
+#define UNIT_ATTENTION      0x06
4a2fec
+#define DATA_PROTECT        0x07
4a2fec
+#define BLANK_CHECK         0x08
4a2fec
+#define COPY_ABORTED        0x0a
4a2fec
+#define ABORTED_COMMAND     0x0b
4a2fec
+#define VOLUME_OVERFLOW     0x0d
4a2fec
+#define MISCOMPARE          0x0e
4a2fec
+
4a2fec
+
4a2fec
+/*
4a2fec
+ *  DEVICE TYPES
4a2fec
+ */
4a2fec
+
4a2fec
+#define TYPE_DISK           0x00
4a2fec
+#define TYPE_TAPE           0x01
4a2fec
+#define TYPE_PRINTER        0x02
4a2fec
+#define TYPE_PROCESSOR      0x03    /* HP scanners use this */
4a2fec
+#define TYPE_WORM           0x04    /* Treated as ROM by our system */
4a2fec
+#define TYPE_ROM            0x05
4a2fec
+#define TYPE_SCANNER        0x06
4a2fec
+#define TYPE_MOD            0x07    /* Magneto-optical disk -
4a2fec
+				     * - treated as TYPE_DISK */
4a2fec
+#define TYPE_MEDIUM_CHANGER 0x08
4a2fec
+#define TYPE_STORAGE_ARRAY  0x0c    /* Storage array device */
4a2fec
+#define TYPE_ENCLOSURE      0x0d    /* Enclosure Services Device */
4a2fec
+#define TYPE_RBC            0x0e    /* Simplified Direct-Access Device */
4a2fec
+#define TYPE_OSD            0x11    /* Object-storage Device */
4a2fec
+#define TYPE_WLUN           0x1e    /* Well known LUN */
4a2fec
+#define TYPE_NOT_PRESENT    0x1f
4a2fec
+#define TYPE_INACTIVE       0x20
4a2fec
+#define TYPE_NO_LUN         0x7f
4a2fec
+
4a2fec
+/* Mode page codes for mode sense/set */
4a2fec
+#define MODE_PAGE_R_W_ERROR                   0x01
4a2fec
+#define MODE_PAGE_HD_GEOMETRY                 0x04
4a2fec
+#define MODE_PAGE_FLEXIBLE_DISK_GEOMETRY      0x05
4a2fec
+#define MODE_PAGE_CACHING                     0x08
4a2fec
+#define MODE_PAGE_AUDIO_CTL                   0x0e
4a2fec
+#define MODE_PAGE_POWER                       0x1a
4a2fec
+#define MODE_PAGE_FAULT_FAIL                  0x1c
4a2fec
+#define MODE_PAGE_TO_PROTECT                  0x1d
4a2fec
+#define MODE_PAGE_CAPABILITIES                0x2a
4a2fec
+#define MODE_PAGE_ALLS                        0x3f
4a2fec
+/* Not in Mt. Fuji, but in ATAPI 2.6 -- deprecated now in favor
4a2fec
+ * of MODE_PAGE_SENSE_POWER */
4a2fec
+#define MODE_PAGE_CDROM                       0x0d
4a2fec
+
4a2fec
+/* Event notification classes for GET EVENT STATUS NOTIFICATION */
4a2fec
+#define GESN_NO_EVENTS                0
4a2fec
+#define GESN_OPERATIONAL_CHANGE       1
4a2fec
+#define GESN_POWER_MANAGEMENT         2
4a2fec
+#define GESN_EXTERNAL_REQUEST         3
4a2fec
+#define GESN_MEDIA                    4
4a2fec
+#define GESN_MULTIPLE_HOSTS           5
4a2fec
+#define GESN_DEVICE_BUSY              6
4a2fec
+
4a2fec
+/* Event codes for MEDIA event status notification */
4a2fec
+#define MEC_NO_CHANGE                 0
4a2fec
+#define MEC_EJECT_REQUESTED           1
4a2fec
+#define MEC_NEW_MEDIA                 2
4a2fec
+#define MEC_MEDIA_REMOVAL             3 /* only for media changers */
4a2fec
+#define MEC_MEDIA_CHANGED             4 /* only for media changers */
4a2fec
+#define MEC_BG_FORMAT_COMPLETED       5 /* MRW or DVD+RW b/g format completed */
4a2fec
+#define MEC_BG_FORMAT_RESTARTED       6 /* MRW or DVD+RW b/g format restarted */
4a2fec
+
4a2fec
+#define MS_TRAY_OPEN                  1
4a2fec
+#define MS_MEDIA_PRESENT              2
4a2fec
+
4a2fec
+/*
4a2fec
+ * Based on values from <linux/cdrom.h> but extending CD_MINS
4a2fec
+ * to the maximum common size allowed by the Orange's Book ATIP
4a2fec
+ *
4a2fec
+ * 90 and 99 min CDs are also available but using them as the
4a2fec
+ * upper limit reduces the effectiveness of the heuristic to
4a2fec
+ * detect DVDs burned to less than 25% of their maximum capacity
4a2fec
+ */
4a2fec
+
4a2fec
+/* Some generally useful CD-ROM information */
4a2fec
+#define CD_MINS                       80 /* max. minutes per CD */
4a2fec
+#define CD_SECS                       60 /* seconds per minute */
4a2fec
+#define CD_FRAMES                     75 /* frames per second */
4a2fec
+#define CD_FRAMESIZE                2048 /* bytes per frame, "cooked" mode */
4a2fec
+#define CD_MAX_BYTES       (CD_MINS * CD_SECS * CD_FRAMES * CD_FRAMESIZE)
4a2fec
+#define CD_MAX_SECTORS     (CD_MAX_BYTES / 512)
4a2fec
+
4a2fec
+/*
4a2fec
+ * The MMC values are not IDE specific and might need to be moved
4a2fec
+ * to a common header if they are also needed for the SCSI emulation
4a2fec
+ */
4a2fec
+
4a2fec
+/* Profile list from MMC-6 revision 1 table 91 */
4a2fec
+#define MMC_PROFILE_NONE                0x0000
4a2fec
+#define MMC_PROFILE_CD_ROM              0x0008
4a2fec
+#define MMC_PROFILE_CD_R                0x0009
4a2fec
+#define MMC_PROFILE_CD_RW               0x000A
4a2fec
+#define MMC_PROFILE_DVD_ROM             0x0010
4a2fec
+#define MMC_PROFILE_DVD_R_SR            0x0011
4a2fec
+#define MMC_PROFILE_DVD_RAM             0x0012
4a2fec
+#define MMC_PROFILE_DVD_RW_RO           0x0013
4a2fec
+#define MMC_PROFILE_DVD_RW_SR           0x0014
4a2fec
+#define MMC_PROFILE_DVD_R_DL_SR         0x0015
4a2fec
+#define MMC_PROFILE_DVD_R_DL_JR         0x0016
4a2fec
+#define MMC_PROFILE_DVD_RW_DL           0x0017
4a2fec
+#define MMC_PROFILE_DVD_DDR             0x0018
4a2fec
+#define MMC_PROFILE_DVD_PLUS_RW         0x001A
4a2fec
+#define MMC_PROFILE_DVD_PLUS_R          0x001B
4a2fec
+#define MMC_PROFILE_DVD_PLUS_RW_DL      0x002A
4a2fec
+#define MMC_PROFILE_DVD_PLUS_R_DL       0x002B
4a2fec
+#define MMC_PROFILE_BD_ROM              0x0040
4a2fec
+#define MMC_PROFILE_BD_R_SRM            0x0041
4a2fec
+#define MMC_PROFILE_BD_R_RRM            0x0042
4a2fec
+#define MMC_PROFILE_BD_RE               0x0043
4a2fec
+#define MMC_PROFILE_HDDVD_ROM           0x0050
4a2fec
+#define MMC_PROFILE_HDDVD_R             0x0051
4a2fec
+#define MMC_PROFILE_HDDVD_RAM           0x0052
4a2fec
+#define MMC_PROFILE_HDDVD_RW            0x0053
4a2fec
+#define MMC_PROFILE_HDDVD_R_DL          0x0058
4a2fec
+#define MMC_PROFILE_HDDVD_RW_DL         0x005A
4a2fec
+#define MMC_PROFILE_INVALID             0xFFFF
4a2fec
+
4a2fec
+#endif
4a2fec
diff --git a/scsi/utils.c b/scsi/utils.c
4a2fec
index 6ee9f40..fab60bd 100644
4a2fec
--- a/scsi/utils.c
4a2fec
+++ b/scsi/utils.c
4a2fec
@@ -14,7 +14,7 @@
4a2fec
  */
4a2fec
 
4a2fec
 #include "qemu/osdep.h"
4a2fec
-#include "block/scsi.h"
4a2fec
+#include "scsi/constants.h"
4a2fec
 #include "scsi/utils.h"
4a2fec
 #include "qemu/bswap.h"
4a2fec
 
4a2fec
diff --git a/tests/virtio-scsi-test.c b/tests/virtio-scsi-test.c
4a2fec
index 87a3b6e..082d323 100644
4a2fec
--- a/tests/virtio-scsi-test.c
4a2fec
+++ b/tests/virtio-scsi-test.c
4a2fec
@@ -10,7 +10,7 @@
4a2fec
 
4a2fec
 #include "qemu/osdep.h"
4a2fec
 #include "libqtest.h"
4a2fec
-#include "block/scsi.h"
4a2fec
+#include "scsi/constants.h"
4a2fec
 #include "libqos/libqos-pc.h"
4a2fec
 #include "libqos/libqos-spapr.h"
4a2fec
 #include "libqos/virtio.h"
4a2fec
-- 
4a2fec
1.8.3.1
4a2fec