From ed13972e4e822bfd76e4f6316bb5b237164047c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Sat, 15 Jun 2013 23:17:19 +0200
Subject: [PATCH] Remove xenstore-watch-qubes

Since we have Qubes DB, it needed anymore.
---
 dispvm/Makefile         | 10 +++-------
 dispvm/xenstore-watch.c | 29 -----------------------------
 rpm_spec/core-dom0.spec |  1 -
 3 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 dispvm/xenstore-watch.c

diff --git a/dispvm/Makefile b/dispvm/Makefile
index 7db7fe77..b7011986 100644
--- a/dispvm/Makefile
+++ b/dispvm/Makefile
@@ -1,17 +1,13 @@
-CC=gcc
-CFLAGS=-Wall -Wextra -Werror
-all: xenstore-watch
-xenstore-watch: xenstore-watch.o
-	$(CC) -o xenstore-watch xenstore-watch.o -lxenstore
+all:
+	true
 
 clean:
-	rm -f *.o *~ qubes-restore xenstore-watch xenfreepages
+	true
 
 install:
 	mkdir -p $(DESTDIR)/etc/xen/scripts
 	cp block.qubes $(DESTDIR)/etc/xen/scripts
 	mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/lib/qubes
-	cp xenstore-watch $(DESTDIR)/usr/bin/xenstore-watch-qubes
 	cp qubes-prepare-saved-domain.sh  $(DESTDIR)/usr/lib/qubes
 	cp qubes-update-dispvm-savefile-with-progress.sh  $(DESTDIR)/usr/lib/qubes
 	cp qfile-daemon-dvm $(DESTDIR)/usr/lib/qubes
diff --git a/dispvm/xenstore-watch.c b/dispvm/xenstore-watch.c
deleted file mode 100644
index 666a31f8..00000000
--- a/dispvm/xenstore-watch.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <sys/types.h>
-#include <xs.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv)
-{
-	struct xs_handle *xs;
-	unsigned int count;
-	char **vec;
-	char dummy = 0;
-	if (argc != 2) {
-		fprintf(stderr, "usage: %s xenstore_path\n", argv[0]);
-		exit(1);
-	}
-	xs = xs_daemon_open();
-	if (!xs) {
-		perror("xs_daemon_open");
-		exit(1);
-	}
-	if (!xs_watch(xs, argv[1], &dummy)) {
-		perror("xs_watch");
-		exit(1);
-	}
-	vec = xs_read_watch(xs, &count);
-	free(vec);
-	vec = xs_read_watch(xs, &count);
-	free(vec);
-	return 0;
-}
diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec
index 6a3658bd..f0785b95 100644
--- a/rpm_spec/core-dom0.spec
+++ b/rpm_spec/core-dom0.spec
@@ -232,7 +232,6 @@ fi
 %attr(2770,root,qubes) %dir /var/lib/qubes/vm-kernels
 /usr/share/qubes/xen-vm-template.xml
 /usr/share/qubes/vm-template-hvm.xml
-/usr/bin/xenstore-watch-qubes
 /usr/lib/qubes/qubes-prepare-saved-domain.sh
 /usr/lib/qubes/qubes-update-dispvm-savefile-with-progress.sh
 /etc/xen/scripts/block.qubes