From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VapvS-0007jf-5E for qemu-devel@nongnu.org; Mon, 28 Oct 2013 12:44:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VapvJ-0000Rd-Hp for qemu-devel@nongnu.org; Mon, 28 Oct 2013 12:44:22 -0400 Received: from mail-qc0-x233.google.com ([2607:f8b0:400d:c01::233]:50095) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VapvJ-0000RV-EB for qemu-devel@nongnu.org; Mon, 28 Oct 2013 12:44:13 -0400 Received: by mail-qc0-f179.google.com with SMTP id k18so3901018qcv.24 for ; Mon, 28 Oct 2013 09:44:13 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 28 Oct 2013 17:43:28 +0100 Message-Id: <1382978620-16641-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1382978620-16641-1-git-send-email-pbonzini@redhat.com> References: <1382978620-16641-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 12/24] ide: move BM_STATUS bits to pci.[ch] List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com They are not used by AHCI, and should not be even available there. Signed-off-by: Paolo Bonzini --- hw/ide/internal.h | 11 ----------- hw/ide/pci.c | 4 ++++ hw/ide/pci.h | 7 +++++++ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/ide/internal.h b/hw/ide/internal.h index cd5e77c..f2d8ccc 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -485,10 +485,6 @@ struct IDEDevice { uint64_t wwn; }; -#define BM_STATUS_DMAING 0x01 -#define BM_STATUS_ERROR 0x02 -#define BM_STATUS_INT 0x04 - /* FIXME These are not status register bits */ #define BM_STATUS_DMA_RETRY 0x08 #define BM_STATUS_PIO_RETRY 0x10 @@ -496,13 +492,6 @@ struct IDEDevice { #define BM_STATUS_RETRY_FLUSH 0x40 #define BM_STATUS_RETRY_TRIM 0x80 -#define BM_MIGRATION_COMPAT_STATUS_BITS \ - (BM_STATUS_DMA_RETRY | BM_STATUS_PIO_RETRY | \ - BM_STATUS_RETRY_READ | BM_STATUS_RETRY_FLUSH) - -#define BM_CMD_START 0x01 -#define BM_CMD_READ 0x08 - static inline IDEState *idebus_active_if(IDEBus *bus) { return bus->ifs + bus->unit; diff --git a/hw/ide/pci.c b/hw/ide/pci.c index e4fcf5a..e61a82f 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -33,6 +33,10 @@ #define BMDMA_PAGE_SIZE 4096 +#define BM_MIGRATION_COMPAT_STATUS_BITS \ + (BM_STATUS_DMA_RETRY | BM_STATUS_PIO_RETRY | \ + BM_STATUS_RETRY_READ | BM_STATUS_RETRY_FLUSH) + static void bmdma_start_dma(IDEDMA *dma, IDEState *s, BlockDriverCompletionFunc *dma_cb) { diff --git a/hw/ide/pci.h b/hw/ide/pci.h index 2428275..517711f 100644 --- a/hw/ide/pci.h +++ b/hw/ide/pci.h @@ -3,6 +3,13 @@ #include +#define BM_STATUS_DMAING 0x01 +#define BM_STATUS_ERROR 0x02 +#define BM_STATUS_INT 0x04 + +#define BM_CMD_START 0x01 +#define BM_CMD_READ 0x08 + typedef struct BMDMAState { IDEDMA dma; uint8_t cmd; -- 1.8.3.1