forked from QubesOS/qubes-core-libvirt
-
Notifications
You must be signed in to change notification settings - Fork 0
/
0015-libxl-set-net-disk-trusted-parameter-based-on-backen.patch
348 lines (340 loc) · 11.5 KB
/
0015-libxl-set-net-disk-trusted-parameter-based-on-backen.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
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
From 52d7efc085374cf207acc407aa9e0d8ec5c7bcfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Thu, 5 Jan 2023 17:53:53 +0100
Subject: [PATCH] libxl: set net/disk trusted parameter based on backend domain
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
If backend lives in dom0, set trusted=true, otherwise - false.
Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
---
src/libxl/libxl_conf.c | 6 ++++++
tests/libxlxml2domconfigdata/basic-hvm.json | 6 ++++--
tests/libxlxml2domconfigdata/basic-pv.json | 6 ++++--
tests/libxlxml2domconfigdata/basic-pvh.json | 6 ++++--
tests/libxlxml2domconfigdata/cpu-shares-hvm.json | 6 ++++--
tests/libxlxml2domconfigdata/efi-hvm.json | 6 ++++--
tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json | 3 ++-
tests/libxlxml2domconfigdata/fullvirt-cpuid.json | 3 ++-
tests/libxlxml2domconfigdata/max-eventchannels-hvm.json | 6 ++++--
tests/libxlxml2domconfigdata/max-gntframes-hvm.json | 6 ++++--
tests/libxlxml2domconfigdata/moredevs-hvm.json | 9 ++++++---
tests/libxlxml2domconfigdata/multiple-ip.json | 3 ++-
tests/libxlxml2domconfigdata/variable-clock-hvm.json | 6 ++++--
tests/libxlxml2domconfigdata/vnuma-hvm.json | 6 ++++--
14 files changed, 54 insertions(+), 24 deletions(-)
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 444e76d117..fa1701d505 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -1254,6 +1254,9 @@ libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_disk *x_disk)
}
x_disk->backend_domname = g_strdup(l_disk->domain_name);
+#ifdef LIBXL_HAVE_DISK_TRUSTED
+ libxl_defbool_set(&x_disk->trusted, l_disk->domain_name == NULL);
+#endif
return 0;
}
@@ -1467,6 +1470,9 @@ libxlMakeNic(virDomainDef *def,
if (l_nic->domain_name)
x_nic->backend_domname = g_strdup(l_nic->domain_name);
+#ifdef LIBXL_HAVE_NIC_TRUSTED
+ libxl_defbool_set(&x_nic->trusted, l_nic->domain_name == NULL);
+#endif
/*
* Set bandwidth.
diff --git a/tests/libxlxml2domconfigdata/basic-hvm.json b/tests/libxlxml2domconfigdata/basic-hvm.json
index d30875420d..eed2d3a66a 100644
--- a/tests/libxlxml2domconfigdata/basic-hvm.json
+++ b/tests/libxlxml2domconfigdata/basic-hvm.json
@@ -55,7 +55,8 @@
"backend": "qdisk",
"format": "raw",
"removable": 1,
- "readwrite": 1
+ "readwrite": 1,
+ "trusted": "True"
}
],
"nics": [
@@ -64,7 +65,8 @@
"mac": "00:16:3e:66:12:b4",
"bridge": "br0",
"script": "/etc/xen/scripts/vif-bridge",
- "nictype": "vif_ioemu"
+ "nictype": "vif_ioemu",
+ "trusted": "True"
}
],
"vfbs": [
diff --git a/tests/libxlxml2domconfigdata/basic-pv.json b/tests/libxlxml2domconfigdata/basic-pv.json
index 32d188fabd..ab163a8300 100644
--- a/tests/libxlxml2domconfigdata/basic-pv.json
+++ b/tests/libxlxml2domconfigdata/basic-pv.json
@@ -32,7 +32,8 @@
"backend": "qdisk",
"format": "raw",
"removable": 1,
- "readwrite": 1
+ "readwrite": 1,
+ "trusted": "True"
}
],
"nics": [
@@ -41,7 +42,8 @@
"mac": "00:16:3e:3e:86:60",
"bridge": "br0",
"script": "/etc/xen/scripts/vif-bridge",
- "nictype": "vif"
+ "nictype": "vif",
+ "trusted": "True"
}
],
"vfbs": [
diff --git a/tests/libxlxml2domconfigdata/basic-pvh.json b/tests/libxlxml2domconfigdata/basic-pvh.json
index f51957aa85..19ac7d69eb 100644
--- a/tests/libxlxml2domconfigdata/basic-pvh.json
+++ b/tests/libxlxml2domconfigdata/basic-pvh.json
@@ -33,7 +33,8 @@
"backend": "qdisk",
"format": "raw",
"removable": 1,
- "readwrite": 1
+ "readwrite": 1,
+ "trusted": "True"
}
],
"nics": [
@@ -42,7 +43,8 @@
"mac": "00:16:3e:3e:86:60",
"bridge": "br0",
"script": "/etc/xen/scripts/vif-bridge",
- "nictype": "vif"
+ "nictype": "vif",
+ "trusted": "True"
}
],
"on_reboot": "restart"
diff --git a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json
index 15105c83ad..298acbc2db 100644
--- a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json
+++ b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json
@@ -55,7 +55,8 @@
"backend": "qdisk",
"format": "raw",
"removable": 1,
- "readwrite": 1
+ "readwrite": 1,
+ "trusted": "True"
}
],
"nics": [
@@ -64,7 +65,8 @@
"mac": "00:16:3e:66:12:b4",
"bridge": "br0",
"script": "/etc/xen/scripts/vif-bridge",
- "nictype": "vif_ioemu"
+ "nictype": "vif_ioemu",
+ "trusted": "True"
}
],
"vfbs": [
diff --git a/tests/libxlxml2domconfigdata/efi-hvm.json b/tests/libxlxml2domconfigdata/efi-hvm.json
index 32b5a49c3f..f2128b1a9c 100644
--- a/tests/libxlxml2domconfigdata/efi-hvm.json
+++ b/tests/libxlxml2domconfigdata/efi-hvm.json
@@ -57,7 +57,8 @@
"backend": "qdisk",
"format": "raw",
"removable": 1,
- "readwrite": 1
+ "readwrite": 1,
+ "trusted": "True"
}
],
"nics": [
@@ -66,7 +67,8 @@
"mac": "00:16:3e:66:12:b4",
"bridge": "br0",
"script": "/etc/xen/scripts/vif-bridge",
- "nictype": "vif_ioemu"
+ "nictype": "vif_ioemu",
+ "trusted": "True"
}
],
"vfbs": [
diff --git a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json
index 26f5abefee..0df15776ef 100644
--- a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json
+++ b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json
@@ -48,7 +48,8 @@
"backend": "phy",
"format": "raw",
"removable": 1,
- "readwrite": 1
+ "readwrite": 1,
+ "trusted": "True"
}
],
"on_reboot": "restart",
diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json
index 8bf41894a5..9093b09d88 100644
--- a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json
+++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json
@@ -55,7 +55,8 @@
"backend": "phy",
"format": "raw",
"removable": 1,
- "readwrite": 1
+ "readwrite": 1,
+ "trusted": "True"
}
],
"on_reboot": "restart",
diff --git a/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json b/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json
index 6f0daa065f..a9cf305410 100644
--- a/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json
+++ b/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json
@@ -56,7 +56,8 @@
"backend": "qdisk",
"format": "raw",
"removable": 1,
- "readwrite": 1
+ "readwrite": 1,
+ "trusted": "True"
}
],
"nics": [
@@ -65,7 +66,8 @@
"mac": "00:16:3e:66:12:b4",
"bridge": "br0",
"script": "/etc/xen/scripts/vif-bridge",
- "nictype": "vif_ioemu"
+ "nictype": "vif_ioemu",
+ "trusted": "True"
}
],
"vfbs": [
diff --git a/tests/libxlxml2domconfigdata/max-gntframes-hvm.json b/tests/libxlxml2domconfigdata/max-gntframes-hvm.json
index 35de588abc..ea45f16be8 100644
--- a/tests/libxlxml2domconfigdata/max-gntframes-hvm.json
+++ b/tests/libxlxml2domconfigdata/max-gntframes-hvm.json
@@ -56,7 +56,8 @@
"backend": "qdisk",
"format": "raw",
"removable": 1,
- "readwrite": 1
+ "readwrite": 1,
+ "trusted": "True"
}
],
"nics": [
@@ -65,7 +66,8 @@
"mac": "00:16:3e:66:12:b4",
"bridge": "br0",
"script": "/etc/xen/scripts/vif-bridge",
- "nictype": "vif_ioemu"
+ "nictype": "vif_ioemu",
+ "trusted": "True"
}
],
"vfbs": [
diff --git a/tests/libxlxml2domconfigdata/moredevs-hvm.json b/tests/libxlxml2domconfigdata/moredevs-hvm.json
index bdc9afc29b..8b3cbe786c 100644
--- a/tests/libxlxml2domconfigdata/moredevs-hvm.json
+++ b/tests/libxlxml2domconfigdata/moredevs-hvm.json
@@ -62,7 +62,8 @@
"backend": "qdisk",
"format": "raw",
"removable": 1,
- "readwrite": 1
+ "readwrite": 1,
+ "trusted": "True"
},
{
"pdev_path": "/root/boot.iso",
@@ -70,7 +71,8 @@
"backend": "qdisk",
"format": "raw",
"removable": 1,
- "is_cdrom": 1
+ "is_cdrom": 1,
+ "trusted": "True"
}
],
"nics": [
@@ -80,7 +82,8 @@
"mac": "00:16:3e:7a:35:ce",
"bridge": "br0",
"script": "/etc/xen/scripts/vif-bridge",
- "nictype": "vif"
+ "nictype": "vif",
+ "trusted": "True"
}
],
"pcidevs": [
diff --git a/tests/libxlxml2domconfigdata/multiple-ip.json b/tests/libxlxml2domconfigdata/multiple-ip.json
index e0b37aa795..1bbb209a16 100644
--- a/tests/libxlxml2domconfigdata/multiple-ip.json
+++ b/tests/libxlxml2domconfigdata/multiple-ip.json
@@ -31,7 +31,8 @@
"mac": "00:16:3e:3e:86:60",
"ip": "10.0.0.1 2000:abcd::1",
"script": "/etc/xen/scripts/vif-bridge",
- "nictype": "vif"
+ "nictype": "vif",
+ "trusted": "True"
}
],
"on_reboot": "restart"
diff --git a/tests/libxlxml2domconfigdata/variable-clock-hvm.json b/tests/libxlxml2domconfigdata/variable-clock-hvm.json
index 3c131c603c..5328c5daab 100644
--- a/tests/libxlxml2domconfigdata/variable-clock-hvm.json
+++ b/tests/libxlxml2domconfigdata/variable-clock-hvm.json
@@ -57,7 +57,8 @@
"backend": "qdisk",
"format": "raw",
"removable": 1,
- "readwrite": 1
+ "readwrite": 1,
+ "trusted": "True"
}
],
"nics": [
@@ -66,7 +67,8 @@
"mac": "00:16:3e:66:12:b4",
"bridge": "br0",
"script": "/etc/xen/scripts/vif-bridge",
- "nictype": "vif_ioemu"
+ "nictype": "vif_ioemu",
+ "trusted": "True"
}
],
"vfbs": [
diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm.json b/tests/libxlxml2domconfigdata/vnuma-hvm.json
index 68c1c2501d..4d3507e7da 100644
--- a/tests/libxlxml2domconfigdata/vnuma-hvm.json
+++ b/tests/libxlxml2domconfigdata/vnuma-hvm.json
@@ -149,7 +149,8 @@
"backend": "qdisk",
"format": "raw",
"removable": 1,
- "readwrite": 1
+ "readwrite": 1,
+ "trusted": "True"
}
],
"nics": [
@@ -158,7 +159,8 @@
"mac": "00:16:3e:66:12:b4",
"bridge": "br0",
"script": "/etc/xen/scripts/vif-bridge",
- "nictype": "vif_ioemu"
+ "nictype": "vif_ioemu",
+ "trusted": "True"
}
],
"vfbs": [
--
2.45.2