forked from QubesOS/qubes-vmm-xen
-
Notifications
You must be signed in to change notification settings - Fork 0
/
patch-libxl-Revert-libxl-Remove-redundant-setting-of-phyical-dev.patch
49 lines (43 loc) · 1.98 KB
/
patch-libxl-Revert-libxl-Remove-redundant-setting-of-phyical-dev.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
From 08872167615df0a00b76d0577b2b2c29fe1bf9de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
Date: Wed, 20 Sep 2017 02:56:19 +0200
Subject: [PATCH] Revert "libxl: Remove redundant setting of phyical-device"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Invisible Things Lab
Cc: Marek Marczykowski-Górecki <[email protected]>
Save some time by not calling the hotplug script in obvious cases.
Duplicate checking is already done elsewhere in Qubes.
This reverts commit e885362ccbec19321874abb74e2d317193f45ce5.
Signed-off-by: Marek Marczykowski-Górecki <[email protected]>
---
tools/libxl/libxl.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 5cca657..71f79f4 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -2237,6 +2237,21 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid,
libxl__xen_script_dir_path());
flexarray_append_pair(back, "script", script);
+ /* If the user did not supply a block script then we
+ * write the physical-device node ourselves.
+ *
+ * If the user did supply a script then that script is
+ * responsible for this since the block device may not
+ * exist yet.
+ */
+ if (!disk->script &&
+ disk->backend_domid == LIBXL_TOOLSTACK_DOMID) {
+ int major, minor;
+ if (!libxl__device_physdisk_major_minor(dev, &major, &minor))
+ flexarray_append_pair(back, "physical-device",
+ GCSPRINTF("%x:%x", major, minor));
+ }
+
assert(device->backend_kind == LIBXL__DEVICE_KIND_VBD);
break;
--
2.9.5