diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-02-23 11:17:57 -0500 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-03-10 14:02:22 +0100 |
| commit | a96cb236290ef8e54b061b30c41835e435905d7a (patch) | |
| tree | adc651b6b426c316d311b859b79eeb2ec2c73fb7 /hw/ide/pci.h | |
| parent | fe09c7c9f0e8ed8793e986cf616c8de0a9518fd7 (diff) | |
ide: replace set_unit callback with more IDEBus state
Start moving the initial state of the current request to IDEBus, so that
AHCI can use it. The set_unit callback is not used anymore once this is
done.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1424708286-16483-9-git-send-email-jsnow@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/ide/pci.h')
| -rw-r--r-- | hw/ide/pci.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/ide/pci.h b/hw/ide/pci.h index ea4e05160f..222a16316c 100644 --- a/hw/ide/pci.h +++ b/hw/ide/pci.h @@ -33,6 +33,8 @@ typedef struct BMDMAState { /* Bit 0-2 and 7: BM status register * Bit 3-6: bus->error_status */ uint8_t migration_compat_status; + uint8_t migration_retry_unit; + struct PCIIDEState *pci_dev; } BMDMAState; @@ -61,8 +63,8 @@ typedef struct PCIIDEState { static inline IDEState *bmdma_active_if(BMDMAState *bmdma) { - assert(bmdma->unit != (uint8_t)-1); - return bmdma->bus->ifs + bmdma->unit; + assert(bmdma->bus->retry_unit != (uint8_t)-1); + return bmdma->bus->ifs + bmdma->bus->retry_unit; } |