Changeset 86138 in vbox for trunk/src/VBox

Timestamp:

Sep 16, 2020 5:12:55 PM (4 years ago)

Author:

vboxsync

Message:

Main: bugref:9224: Moved definition of the NVME_IOCTL_ID into cpp file allowing build for different kernel versions

File:

• trunk/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp

@@ -40 +40 @@
 
 #include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
-# include <linux/nvme_ioctl.h>
-#else
-# include <linux/nvme.h>
-#endif
 #include <scsi/scsi.h>
 
@@ -68 +63 @@
 #include <sys/types.h>
 #include <sys/sysmacros.h>
+
+/*
+ * Define NVME constant here to allow building
+ * on several kernel versions even if the
+ * building host doesn't contain certain NVME
+ * includes
+ */
+#define NVME_IOCTL_ID _IO('N', 0x40)