nvme: Enable NVMe support for non-qemu hardware

NVMe support was tested on purism/librem13 laptops and SeaBIOS has
no problems in detecting and booting the drives.

This is a continuation of commit 235a8190 which was incomplete.

Signed-off-by: Youness Alaoui <youness.alaoui@puri.sm>
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/src/hw/nvme.c b/src/hw/nvme.c
index 1c2bce5a089c60c31f432b8780b438765fbe4779..556a9a4227fedf3d3f3c7609b0690e87c809d6b4 100644 (file)
--- a/src/hw/nvme.c
+++ b/src/hw/nvme.c
@@ -5,7 +5,6 @@
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
 #include "blockcmd.h"
-#include "fw/paravirt.h" // runningOnQEMU
 #include "malloc.h" // malloc_high
 #include "output.h" // dprintf
 #include "pci.h"
@@ -599,7 +598,7 @@ nvme_cmd_readwrite(struct nvme_namespace *ns, struct disk_op_s *op, int write)
 int
 nvme_process_op(struct disk_op_s *op)
 {
-    if (!CONFIG_NVME || !runningOnQEMU())
+    if (!CONFIG_NVME)
         return DISK_RET_SUCCESS;
 
     struct nvme_namespace *ns = container_of(op->drive_gf, struct nvme_namespace,