diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-10-31 17:02:26 +0100 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-10-31 17:02:26 +0100 |
| commit | a126050a103c924b03388a9a64ce9af8c96b0969 (patch) | |
| tree | c93b9c5cdb8b2a0256845e596e198f1c65c4fcde /hw | |
| parent | ef5cfe5bbd8bb05a51afaf7ab313769eb9ef44b6 (diff) | |
| parent | f4c129a38a5430b7342a7a23f53a22831154612f (diff) | |
| download | qemu-a126050a103c924b03388a9a64ce9af8c96b0969.zip | |
Merge remote-tracking branch 'kwolf/tags/for-anthony' into staging
Block patches for 1.7.0-rc0 (v2)
# gpg: Signature made Thu 31 Oct 2013 04:44:39 PM CET using RSA key ID C88F2FD6
# gpg: Can't check signature: public key not found
* kwolf/tags/for-anthony: (30 commits)
vmdk: Implment bdrv_get_specific_info
qapi: Add optional field 'compressed' to ImageInfo
qemu-iotests: prefill some data to test image
sheepdog: check simultaneous create in resend_aioreq
sheepdog: cancel aio requests if possible
sheepdog: make add_aio_request and send_aioreq void functions
sheepdog: try to reconnect to sheepdog after network error
coroutine: add co_aio_sleep_ns() to allow sleep in block drivers
sheepdog: reload inode outside of resend_aioreq
sheepdog: handle vdi objects in resend_aio_req
sheepdog: check return values of qemu_co_recv/send correctly
qemu-iotests: Test case for backing file deletion
qemu-iotests: drop duplicated "create_image"
qemu-iotests: Fix 051 reference output
block: Avoid unecessary drv->bdrv_getlength() calls
block: Disable BDRV_O_COPY_ON_READ for the backing file
ahci: fix win7 hang on boot
sheepdog: pass copy_policy in the request
sheepdog: explicitly set copies as type uint8_t
block: Don't copy backing file name on error
...
Message-id: 1383064269-27720-1-git-send-email-kwolf@redhat.com
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ide/ahci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index a8be62cf99..fbea9e8886 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -961,7 +961,8 @@ static int handle_cmd(AHCIState *s, int port, int slot) /* We're ready to process the command in FIS byte 2. */ ide_exec_cmd(&s->dev[port].port, cmd_fis[2]); - if (s->dev[port].port.ifs[0].status & READY_STAT) { + if ((s->dev[port].port.ifs[0].status & (READY_STAT|DRQ_STAT|BUSY_STAT)) == + READY_STAT) { ahci_write_fis_d2h(&s->dev[port], cmd_fis); } } |