[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/24] ide: move BM_STATUS bits to pci.[ch]
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 12/24] ide: move BM_STATUS bits to pci.[ch] |
Date: |
Mon, 28 Oct 2013 17:43:28 +0100 |
They are not used by AHCI, and should not be even available there.
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 <hw/ide/internal.h>
+#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
- Re: [Qemu-devel] [PATCH 06/24] ide: simplify set_inactive callbacks, (continued)
- [Qemu-devel] [PATCH 07/24] ide: simplify async_cmd_done callbacks, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 08/24] ide: simplify start_transfer callbacks, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 09/24] ide: wrap start_dma callback, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 10/24] ide: add trigger_irq callback, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 11/24] ide: fold add_status callback into set_inactive, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 12/24] ide: move BM_STATUS bits to pci.[ch],
Paolo Bonzini <=
- [Qemu-devel] [PATCH 13/24] ide: move retry constants out of BM_STATUS_* namespace, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 14/24] ide: start extracting ide_restart_dma out of bmdma_restart_dma, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 15/24] ide: prepare to move restart to common code, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 16/24] ide: introduce ide_register_restart_cb, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 17/24] ide: do not use BMDMA in restart callback, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 18/24] ide: pass IDEBus to the restart_cb, Paolo Bonzini, 2013/10/28