aboutsummaryrefslogtreecommitdiff
path: root/hw/ide/ahci.c
diff options
context:
space:
mode:
Diffstat (limited to 'hw/ide/ahci.c')
-rw-r--r--hw/ide/ahci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 0ee713b..9f434b1 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -860,7 +860,7 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis,
ncq_tfs->tag, ncq_tfs->lba);
dma_acct_start(ncq_tfs->drive->port.ifs[0].bs, &ncq_tfs->acct,
- &ncq_tfs->sglist, BDRV_ACCT_READ);
+ &ncq_tfs->sglist, BLOCK_ACCT_READ);
ncq_tfs->aiocb = dma_bdrv_read(ncq_tfs->drive->port.ifs[0].bs,
&ncq_tfs->sglist, ncq_tfs->lba,
ncq_cb, ncq_tfs);
@@ -873,7 +873,7 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis,
ncq_tfs->tag, ncq_tfs->lba);
dma_acct_start(ncq_tfs->drive->port.ifs[0].bs, &ncq_tfs->acct,
- &ncq_tfs->sglist, BDRV_ACCT_WRITE);
+ &ncq_tfs->sglist, BLOCK_ACCT_WRITE);
ncq_tfs->aiocb = dma_bdrv_write(ncq_tfs->drive->port.ifs[0].bs,
&ncq_tfs->sglist, ncq_tfs->lba,
ncq_cb, ncq_tfs);
t/docs?h=stable-4.2&id=c1800a16276582f65807f464a6ab0b7c88a1c16e'>docs: update documentation considering PCIE-PCI bridgeAleksandr Bezzubikov2-23/+140 2017-09-08colo-compare: Update the COLO document to add the IOThread configurationWang Yong1-1/+2 2017-09-04qapi: Generate FOO_str() macro for QAPI enum FOOMarkus Armbruster1-0/+3 2017-09-04qapi: Update qapi-code-gen.txt examples to match current codeMarkus Armbruster1-9/+38 2017-08-02vhost-user: fix legacy cross-endian configurationsFelipe Franciosi1-0/+16 2017-08-01trace: add trace_event_get_state_backends()Stefan Hajnoczi1-1/+1 2017-07-31docs: fix broken paths to docs/specs/ivshmem-spec.txtPhilippe Mathieu-Daudé1-1/+1 2017-07-31docs: fix broken paths to docs/config/ich9-ehci-uhci.cfgPhilippe Mathieu-Daudé1-1/+1 2017-07-31docs: fix broken paths to docs/devel/atomics.txtPhilippe Mathieu-Daudé1-1/+1 2017-07-31docs: fix broken paths to docs/devel/qapi-code-gen.txtPhilippe Mathieu-Daudé1-1/+1 2017-07-31docs: fix broken paths to docs/interop/qcow2.txtPhilippe Mathieu-Daudé1-1/+1 2017-07-31docs: fix broken paths to docs/interop dirCleber Rosa1-1/+1 2017-07-24qapi: Introduce a first class 'null' typeMarkus Armbruster1-4/+6 2017-07-18Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into stagingPeter Maydell4-577/+1643 2017-07-18Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into st...Peter Maydell1-0/+26 2017-07-18live-block-ops.txt: Rename, rewrite, and improve itKashyap Chamarthy2-72/+1088 2017-07-18bitmaps.md: Convert to rST; move it into 'interop' dirKashyap Chamarthy2-505/+555 2017-07-17Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' int...Peter Maydell1-2/+1 2017-07-17docs/colo-proxy.txt: Update colo-proxy usage of net driver with vnet_headerZhang Chen1-0/+26 2017-07-17trace: update old trace events in docsStefan Hajnoczi1-2/+1 2017-07-14docs/devel/memory.txt: Add section about RAM migrationPeter Maydell1-0/+31 2017-07-11specs/qcow2: do not use wording 'bitmap header'Vladimir Sementsov-Ogievskiy1-3/+2 2017-07-11specs/qcow2: fix bitmap granularity qemu-specific noteVladimir Sementsov-Ogievskiy1-2/+1 2017-07-11qcow2: extend specification to cover LUKS encryptionDaniel P. Berrange1-0/+103 2017-06-15docs: create interop/ subdirectoryPaolo Bonzini9-0/+0 2017-06-07docs: create config/, devel/ and spin/ subdirectoriesPaolo Bonzini26-0/+0 2017-06-04docs/qdev-device-use.txt: update section Default DevicesMarkus Armbruster1-4/+5 2017-06-04docs qemu-doc: Avoid ide-drive, it's deprecatedMarkus Armbruster2-3/+3 2017-06-02spec/vhost-user spec: Add IOMMU supportMaxime Coquelin1-0/+84 2017-06-02vhost-user: add slave-req-fd supportMarc-André Lureau1-2/+30 2017-05-12qemu-doc: Update to use the new way of attaching USB devicesThomas Huth1-4/+2 2017-03-28trace: fix tcg tracing build breakageStefan Hajnoczi1-0/+3 2017-03-16qapi: The #optional tag is redundant, dropMarkus Armbruster2-9/+7 2017-03-16qapi: Clean up build of generated documentationMarkus Armbruster1-1/+1 2017-03-16qapi: Have each QAPI schema declare its name rule violationsMarkus Armbruster1-0/+6 2017-03-16qapi: Have each QAPI schema declare its returns white-listMarkus Armbruster1-6/+7 2017-03-16docs/qapi-code-gen.txt: Drop confusing reference to 'gen'Markus Armbruster1-10/+8 2017-03-16qapi: Make doc comments optional where we don't need themMarkus Armbruster1-13/+30 2017-03-14docs: Add a note about mixing bootindex with "-boot order"Thomas Huth1-0/+9