forked from QubesOS/qubes-vmm-xen
-
Notifications
You must be signed in to change notification settings - Fork 0
/
patch-libxl-do-not-for-backend-on-PCI-remove-when-backend-.patch
61 lines (53 loc) · 2.54 KB
/
patch-libxl-do-not-for-backend-on-PCI-remove-when-backend-.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
From 6cbd5f03cb1a537d67f948215524cb468f36ad18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
Date: Wed, 5 Mar 2014 02:18:52 +0100
Subject: [PATCH 1/2] libxl: do not wait for backend on PCI remove when backend
already closed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Invisible Things Lab
Cc: Marek Marczykowski <[email protected]>
Especially this is the case during domain destroy - backend and frontend
are already closed so just remove the devices, without waiting for
(timeout on) backend state.
Signed-off-by: Marek Marczykowski-Górecki <[email protected]>
---
tools/libxl/libxl_pci.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c
index 61bef12..395ed6b 100644
--- a/tools/libxl/libxl_pci.c
+++ b/tools/libxl/libxl_pci.c
@@ -330,7 +330,7 @@ retry_transaction:
static int libxl__device_pci_remove_xenstore(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
- char *be_path, *num_devs_path, *num_devs, *xsdev, *tmp, *tmppath;
+ char *be_path, *num_devs_path, *num_devs, *xsdev, *tmp, *tmppath, *state_before;
int num, i, j;
xs_transaction_t t;
@@ -341,12 +341,13 @@ static int libxl_device_pci_remove_xenstore(libxl__gc *gc, uint32_t domid, libxl
if (!num_devs)
return ERROR_INVAL;
num = atoi(num_devs);
+ state_before = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/state", be_path));
libxl_domain_type domtype = libxl__domain_type(gc, domid);
if (domtype == LIBXL_DOMAIN_TYPE_INVALID)
return ERROR_FAIL;
- if (domtype == LIBXL_DOMAIN_TYPE_PV) {
+ if (domtype == LIBXL_DOMAIN_TYPE_PV && state_before && atoi(state_before) != 6) {
if (libxl__wait_for_backend(gc, be_path, GCSPRINTF("%d", XenbusStateConnected)) < 0) {
LOGD(DEBUG, domid, "pci backend at %s is not ready", be_path);
return ERROR_FAIL;
@@ -363,6 +364,8 @@ static int libxl_device_pci_remove_xenstore(libxl__gc *gc, uint32_t domid, libxl
}
retry_transaction:
+ if (state_before && atoi(state_before) == XenbusStateClosed)
+ goto retry_transaction2;
t = xs_transaction_start(ctx->xsh);
xs_write(ctx->xsh, t, GCSPRINTF("%s/state-%d", be_path, i), GCSPRINTF("%d", XenbusStateClosing), 1);
xs_write(ctx->xsh, t, GCSPRINTF("%s/state", be_path), GCSPRINTF("%d", XenbusStateReconfiguring), 1);
--
1.8.1.4