diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2011-09-13 14:41:56 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-10-28 19:25:50 +0200 |
| commit | 67cc61e43077eeffc7c95a1bb25d05a12d051c67 (patch) | |
| tree | a803822fb32290d330eb37df6f7972d2fcdbc876 /hw/ide/macio.c | |
| parent | 7e218df5181f1c26d52ef525b30a416c60a2160b (diff) | |
| download | qemu-67cc61e43077eeffc7c95a1bb25d05a12d051c67.zip qemu-67cc61e43077eeffc7c95a1bb25d05a12d051c67.tar.gz qemu-67cc61e43077eeffc7c95a1bb25d05a12d051c67.tar.bz2 | |
atapi/scsi: unify definitions for MMC
The definitions in ide/internal.h are duplicates, since ATAPI commands
actually come from SCSI. Use the ones in scsi-defs.h and move the
missing ones there. Two exceptions:
- MODE_PAGE_WRITE_PARMS conflicts with the "flexible disk geometry"
page in scsi-disk.c. It is unused, so pick the latter.
- GPCMD_* is left in ide/internal.h, at least for now.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/ide/macio.c')
| -rw-r--r-- | hw/ide/macio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 37b8239..70b3342 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -87,7 +87,7 @@ static void pmac_ide_atapi_transfer_cb(void *opaque, int ret) if (!m->aiocb) { qemu_sglist_destroy(&s->sg); /* Note: media not present is the most likely case */ - ide_atapi_cmd_error(s, SENSE_NOT_READY, + ide_atapi_cmd_error(s, NOT_READY, ASC_MEDIUM_NOT_PRESENT); goto done; } |