diff options
| author | Eduardo Habkost | 2020-08-25 21:20:36 +0200 |
|---|---|---|
| committer | Eduardo Habkost | 2020-08-27 20:04:55 +0200 |
| commit | 040c1fd35c7c352759e710a4caa01a633049ade6 (patch) | |
| tree | 834af9c455b0b880539fa3d6f5cbc060ba658b24 | |
| parent | pxa2xx: Move QOM macros to header (diff) | |
| download | qemu-040c1fd35c7c352759e710a4caa01a633049ade6.tar.gz qemu-040c1fd35c7c352759e710a4caa01a633049ade6.tar.xz qemu-040c1fd35c7c352759e710a4caa01a633049ade6.zip | |
mptsas: Move QOM macros to header
This will make future conversion to OBJECT_DECLARE* easier.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-By: Roman Bolshakov <r.bolshakov@yadro.com>
Message-Id: <20200825192110.3528606-41-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | hw/scsi/mptsas.c | 5 | ||||
| -rw-r--r-- | hw/scsi/mptsas.h | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index 14cbed84d0..135e7d96e4 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -42,11 +42,6 @@ #define NAA_LOCALLY_ASSIGNED_ID 0x3ULL #define IEEE_COMPANY_LOCALLY_ASSIGNED 0x525400 -#define TYPE_MPTSAS1068 "mptsas1068" - -#define MPT_SAS(obj) \ - OBJECT_CHECK(MPTSASState, (obj), TYPE_MPTSAS1068) - #define MPTSAS1068_PRODUCT_ID \ (MPI_FW_HEADER_PID_FAMILY_1068_SAS | \ MPI_FW_HEADER_PID_PROD_INITIATOR_SCSI | \ diff --git a/hw/scsi/mptsas.h b/hw/scsi/mptsas.h index 0436a33911..9ac98fc20e 100644 --- a/hw/scsi/mptsas.h +++ b/hw/scsi/mptsas.h @@ -11,9 +11,13 @@ #define MPTSAS_MAXIMUM_CHAIN_DEPTH 0x22 -typedef struct MPTSASState MPTSASState; typedef struct MPTSASRequest MPTSASRequest; +#define TYPE_MPTSAS1068 "mptsas1068" +typedef struct MPTSASState MPTSASState; +#define MPT_SAS(obj) \ + OBJECT_CHECK(MPTSASState, (obj), TYPE_MPTSAS1068) + enum { DOORBELL_NONE, DOORBELL_WRITE, |