From b18b0ce6099d2d6ba1b19de842629d38631a8f79 Mon Sep 17 00:00:00 2001
From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 24 Jun 2019 14:46:53 +0200
Subject: [PATCH] vircgroup: introduce virCgroupV2DevicesGetKey
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Device rules are stored in BPF map that is a hash type, this function
will create a key based on major and minor id of device.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/libvirt_private.syms      | 1 +
 src/util/vircgroupv2devices.c | 8 ++++++++
 src/util/vircgroupv2devices.h | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 88b0a38696..76de9e8d3e 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1721,6 +1721,7 @@ virCgroupV2DevicesAttachProg;
 virCgroupV2DevicesAvailable;
 virCgroupV2DevicesCreateProg;
 virCgroupV2DevicesDetectProg;
+virCgroupV2DevicesGetKey;
 virCgroupV2DevicesGetPerms;
 virCgroupV2DevicesPrepareProg;
 virCgroupV2DevicesRemoveProg;
diff --git a/src/util/vircgroupv2devices.c b/src/util/vircgroupv2devices.c
index 43ae14d2a5..6b4ea3142f 100644
--- a/src/util/vircgroupv2devices.c
+++ b/src/util/vircgroupv2devices.c
@@ -647,3 +647,11 @@ virCgroupV2DevicesGetPerms(int perms G_GNUC_UNUSED,
     return 0;
 }
 #endif /* !HAVE_DECL_BPF_CGROUP_DEVICE */
+
+
+uint64_t
+virCgroupV2DevicesGetKey(int major,
+                         int minor)
+{
+    return (uint64_t)major << 32 | ((uint64_t)minor & 0x00000000ffffffff);
+}
diff --git a/src/util/vircgroupv2devices.h b/src/util/vircgroupv2devices.h
index e00da25c1e..593ed35203 100644
--- a/src/util/vircgroupv2devices.h
+++ b/src/util/vircgroupv2devices.h
@@ -45,3 +45,7 @@ virCgroupV2DevicesRemoveProg(virCgroupPtr group);
 uint32_t
 virCgroupV2DevicesGetPerms(int perms,
                            char type);
+
+uint64_t
+virCgroupV2DevicesGetKey(int major,
+                         int minor);