diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-02 14:49:53 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-02 14:49:53 -0500 |
| commit | 58a331bab950e9a12da8b17b57e11927893eaf5e (patch) | |
| tree | 91131b2d56bf984f5806182d9961400f5ff414e3 /hw | |
| parent | 9bf6b71a719f62af726d5a1fa4d705cfd5623f14 (diff) | |
| parent | d5b406d95b4259baf622f73e1ffad6ee144633b8 (diff) | |
| download | qemu-58a331bab950e9a12da8b17b57e11927893eaf5e.zip qemu-58a331bab950e9a12da8b17b57e11927893eaf5e.tar.gz qemu-58a331bab950e9a12da8b17b57e11927893eaf5e.tar.bz2 | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony:
ATA: Allow WIN_SECURITY_FREEZE_LOCK as nop
rbd: add discard support
qcow2: fix the return value -ENOENT -> -EEXIST
qcow2: Don't hold cache references across yield
qcow2: Remove unused parameter in do_alloc_cluster_offset
qemu-iotests: Many parallel allocating I/O requests
docs: fix one issue in qcow2 specs
block/qcow2: Add missing GCC_FMT_ATTR to function report_unsupported()
qemu-iotests: ignore fragmentation information for qed
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ide/core.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index a5216a6..9785d5f 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1035,7 +1035,7 @@ static const uint8_t ide_cmd_table[0x100] = { [WIN_IDENTIFY] = ALL_OK, [WIN_SETFEATURES] = ALL_OK, [IBM_SENSE_CONDITION] = CFA_OK, - [CFA_WEAR_LEVEL] = CFA_OK, + [CFA_WEAR_LEVEL] = HD_CFA_OK, [WIN_READ_NATIVE_MAX] = ALL_OK, }; @@ -1350,6 +1350,11 @@ void ide_exec_cmd(IDEBus *bus, uint32_t val) break; case CFA_ERASE_SECTORS: case CFA_WEAR_LEVEL: +#if 0 + /* This one has the same ID as CFA_WEAR_LEVEL and is required for + Windows 8 to work with AHCI */ + case WIN_SECURITY_FREEZE_LOCK: +#endif if (val == CFA_WEAR_LEVEL) s->nsector = 0; if (val == CFA_ERASE_SECTORS) |