diff options
| author | Daniel Stekloff <dan@wendan.org> | 2015-04-24 11:55:42 -0700 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-04-30 15:35:26 +0200 |
| commit | 4a4d614ff56b4cf15e83629946afe51dc116053f (patch) | |
| tree | 3b46d9000db9ad68d3519ea01c45d296f4d301e9 /hw/block | |
| parent | c95e4c0e53c774dd82a78ae751ea24f537e38778 (diff) | |
| download | qemu-4a4d614ff56b4cf15e83629946afe51dc116053f.tar.gz qemu-4a4d614ff56b4cf15e83629946afe51dc116053f.tar.bz2 qemu-4a4d614ff56b4cf15e83629946afe51dc116053f.zip | |
Enable NVMe start controller for Windows guest.
Windows seems to send two separate calls to NVMe controller configuration. The
first sends configuration info and the second the enable bit. I couldn't
enable the Windows 8.1 in-box NVMe driver with base Qemu. I made the
following change to store the configuration data and then handle enable and
NVMe driver works on Windows 8.1.
I am not a Windows expert and I'm not entirely sure this is the correct
approach. I'm offering it for anyone who wishes to use NVMe on Windows 8.1
using Qemu.
I have tested this change with Linux and Windows guests with NVMe devices.
Signed-off-by: Daniel Stekloff <dan@wendan.org>
Acked-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/block')
| -rw-r--r-- | hw/block/nvme.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 1e071662d2..ad988d7c24 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -615,6 +615,13 @@ static void nvme_write_bar(NvmeCtrl *n, hwaddr offset, uint64_t data, n->bar.intmc = n->bar.intms; break; case 0x14: + /* Windows first sends data, then sends enable bit */ + if (!NVME_CC_EN(data) && !NVME_CC_EN(n->bar.cc) && + !NVME_CC_SHN(data) && !NVME_CC_SHN(n->bar.cc)) + { + n->bar.cc = data; + } + if (NVME_CC_EN(data) && !NVME_CC_EN(n->bar.cc)) { n->bar.cc = data; if (nvme_start_ctrl(n)) { |