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

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