]> git.proxmox.com Git - qemu.git/commit - hw/ide/core.c
atapi/scsi: unify definitions for MMC
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 13 Sep 2011 12:41:56 +0000 (14:41 +0200)
committerKevin Wolf <kwolf@redhat.com>
Fri, 28 Oct 2011 17:25:50 +0000 (19:25 +0200)
commit67cc61e43077eeffc7c95a1bb25d05a12d051c67
treea803822fb32290d330eb37df6f7972d2fcdbc876
parent7e218df5181f1c26d52ef525b30a416c60a2160b
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>
hw/ide/atapi.c
hw/ide/core.c
hw/ide/internal.h
hw/ide/macio.c
hw/scsi-bus.c
hw/scsi-defs.h
hw/scsi-disk.c