diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-05-26 11:31:03 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-05-26 11:31:03 +0100 |
| commit | 0915aed5842bd4dbe396b92d4f3b846ae29ad663 (patch) | |
| tree | 1468824a966176762562275a550ffb12ba0427e5 /include/hw/ppc/mac_dbdma.h | |
| parent | 0d2ed6039cf86fe3a78671e32b5e3eb17d725762 (diff) | |
| parent | cd6cb73beb63e5fa62ca8ed540b9d54063b15c44 (diff) | |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Fri May 22 20:58:44 2015 BST using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB
# Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E
* remotes/jnsnow/tags/ide-pull-request:
ahci: do not remap clb/fis unconditionally
macio: move unaligned DMA write code into separate pmac_dma_write() function
macio: move unaligned DMA read code into separate pmac_dma_read() function
qtest: pre-buffer hex nibs
libqos/ahci: Swap memread/write with bufread/write
qtest: add memset to qtest protocol
qtest: Add base64 encoded read/write
qtest: allow arbitrarily long sends
qtest/ahci: add migrate halted dma test
qtest/ahci: add halted dma test
qtest/ahci: add flush migrate test
qtest/ahci: add migrate dma test
qtest/ahci: Add migration test
ich9/ahci: Enable Migration
libqos: Add migration helpers
libqos/ahci: Fix sector set method
libqos/ahci: Add halted command helpers
glib: remove stale compat functions
configure: require glib 2.22
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/ppc/mac_dbdma.h')
| -rw-r--r-- | include/hw/ppc/mac_dbdma.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/hw/ppc/mac_dbdma.h b/include/hw/ppc/mac_dbdma.h index d7db06c031..c5803279da 100644 --- a/include/hw/ppc/mac_dbdma.h +++ b/include/hw/ppc/mac_dbdma.h @@ -43,10 +43,6 @@ struct DBDMA_io { uint8_t remainder[0x200]; int remainder_len; QEMUIOVector iov; - bool finish_remain_read; - hwaddr finish_addr; - hwaddr finish_len; - int requests; }; /* |