From 34327dbdad587042a2fb84115d0080fe9b63a6d3 Mon Sep 17 00:00:00 2001 From: Si Beaumont Date: Mon, 4 Jan 2016 11:18:24 +0000 Subject: [PATCH] xenopsd: Remove upstreamed Xenstore watch patch Revert "xenopsd: Add experimental patch to watch attr Xenstore key" This reverts commit 9f80dda6307c4a787b7c917024aee137a11c70b7. --- SOURCES/xenopsd-watch-attr-xenstore-key.patch | 25 ------------------- SPECS/xenopsd.spec | 2 -- 2 files changed, 27 deletions(-) delete mode 100644 SOURCES/xenopsd-watch-attr-xenstore-key.patch diff --git a/SOURCES/xenopsd-watch-attr-xenstore-key.patch b/SOURCES/xenopsd-watch-attr-xenstore-key.patch deleted file mode 100644 index 12b5834..0000000 --- a/SOURCES/xenopsd-watch-attr-xenstore-key.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 67f6df1e74819b6583dbdf948640196ca58650a9 Mon Sep 17 00:00:00 2001 -From: Si Beaumont -Date: Fri, 18 Dec 2015 10:33:44 +0000 -Subject: [PATCH] (experimental) CA-190329: Add watch on attr Xenstore key - -Signed-off-by: Si Beaumont ---- - xc/xenops_server_xen.ml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/xc/xenops_server_xen.ml b/xc/xenops_server_xen.ml -index fca5025..bf7839a 100644 ---- a/xc/xenops_server_xen.ml -+++ b/xc/xenops_server_xen.ml -@@ -2400,6 +2400,7 @@ module Actions = struct - - let interesting_paths_for_domain domid uuid = - let open Printf in [ -+ sprintf "/local/domain/%d/attr" domid; - sprintf "/local/domain/%d/data/updated" domid; - sprintf "/local/domain/%d/data/ts" domid; - sprintf "/local/domain/%d/memory/target" domid; --- -1.9.1 - diff --git a/SPECS/xenopsd.spec b/SPECS/xenopsd.spec index 1f17d83..a2bc648 100644 --- a/SPECS/xenopsd.spec +++ b/SPECS/xenopsd.spec @@ -12,7 +12,6 @@ Source4: xenopsd-xenlight-init Source5: xenopsd-conf Source6: xenopsd-network-conf Source7: xenopsd-64-conf -Patch0: xenopsd-watch-attr-xenstore-key.patch BuildRequires: ocaml BuildRequires: optcomp BuildRequires: ocaml-findlib @@ -83,7 +82,6 @@ Simple VM manager for Xen using libxenlight %prep %setup -q -%patch0 -p1 cp %{SOURCE1} xenopsd-xc-init cp %{SOURCE2} xenopsd-simulator-init cp %{SOURCE3} xenopsd-libvirt-init