uapi: headers update

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index f3956fc11de68cf20e535449cb7200ce20207c8b..35687dcb1a42952ab6ecebee1f1b620f21dd510e 100644 (file)
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -97,5 +97,6 @@
 #define DEVMEM_MAGIC           0x454d444d      /* "DMEM" */
 #define Z3FOLD_MAGIC           0x33
 #define PPC_CMM_MAGIC          0xc7571590
+#define SECRETMEM_MAGIC                0x5345434d      /* "SECM" */
 
 #endif /* __LINUX_MAGIC_H__ */

diff --git a/include/uapi/linux/virtio_ids.h b/include/uapi/linux/virtio_ids.h
index 4fe842c3a3a9847ab102dd73f4b0d1134cc2abdf..70a8057ad4bbe195c3a565e2f87c6839c8b8c832 100644 (file)
--- a/include/uapi/linux/virtio_ids.h
+++ b/include/uapi/linux/virtio_ids.h
@@ -57,4 +57,16 @@
 #define VIRTIO_ID_MAC80211_HWSIM       29 /* virtio mac80211-hwsim */
 #define VIRTIO_ID_BT                   40 /* virtio bluetooth */
 
+/*
+ * Virtio Transitional IDs
+ */
+
+#define VIRTIO_TRANS_ID_NET            1000 /* transitional virtio net */
+#define VIRTIO_TRANS_ID_BLOCK          1001 /* transitional virtio block */
+#define VIRTIO_TRANS_ID_BALLOON                1002 /* transitional virtio balloon */
+#define VIRTIO_TRANS_ID_CONSOLE                1003 /* transitional virtio console */
+#define VIRTIO_TRANS_ID_SCSI           1004 /* transitional virtio SCSI */
+#define VIRTIO_TRANS_ID_RNG            1005 /* transitional virtio rng */
+#define VIRTIO_TRANS_ID_9P             1009 /* transitional virtio 9p console */
+
 #endif /* _LINUX_VIRTIO_IDS_H */