Browse Source

Remove xenstore-watch-qubes

Since we have Qubes DB, it needed anymore.
Marek Marczykowski-Górecki 11 years ago
parent
commit
ed13972e4e
3 changed files with 3 additions and 37 deletions
  1. 3 7
      dispvm/Makefile
  2. 0 29
      dispvm/xenstore-watch.c
  3. 0 1
      rpm_spec/core-dom0.spec

+ 3 - 7
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

+ 0 - 29
dispvm/xenstore-watch.c

@@ -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;
-}

+ 0 - 1
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