# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1301591630 -3600
# Node ID e15ca5c3effc88eda04d7b873e058046bbb4a5f3
# Parent 9f09b93530da0138ae04fbb702a1fe00ffa21f93
tools: blktap2: copy xenstore/hashtable.h into blktap2
hashtable.c has already been copied, forked and modified, there
doesn't seem much point in avoiding the same for the header until
someone feels motivated to properly refactor.
Add comments to the various duplicated files cross-referencing each
other for future reference and as a barrier to forking again...
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
diff -r 9f09b93530da -r e15ca5c3effc tools/blktap2/drivers/Makefile
--- a/tools/blktap2/drivers/Makefile Thu Mar 31 18:12:07 2011 +0100
+++ b/tools/blktap2/drivers/Makefile Thu Mar 31 18:13:50 2011 +0100
@@ -30,8 +30,6 @@
REMUS-OBJS += hashtable_itr.o
REMUS-OBJS += hashtable_utility.o
-$(REMUS-OBJS): CFLAGS += -I$(XEN_XENSTORE)
-
LIBAIO_DIR = $(XEN_ROOT)/tools/libaio/src
MEMSHR_DIR = $(XEN_ROOT)/tools/memshr
diff -r 9f09b93530da -r e15ca5c3effc tools/blktap2/drivers/hashtable.c
--- a/tools/blktap2/drivers/hashtable.c Thu Mar 31 18:12:07 2011 +0100
+++ b/tools/blktap2/drivers/hashtable.c Thu Mar 31 18:13:50 2011 +0100
@@ -1,5 +1,11 @@
/* Copyright (C) 2004 Christopher Clark <firstname.lastname@xxxxxxxxxxxx> */
+/*
+ * There are duplicates of this code in:
+ * - tools/xenstore/hashtable.c
+ * - tools/vtpm_manager/util/hashtable.c
+ */
+
#include "hashtable.h"
#include "hashtable_private.h"
#include <stdlib.h>
diff -r 9f09b93530da -r e15ca5c3effc tools/blktap2/drivers/hashtable_itr.c
--- a/tools/blktap2/drivers/hashtable_itr.c Thu Mar 31 18:12:07 2011 +0100
+++ b/tools/blktap2/drivers/hashtable_itr.c Thu Mar 31 18:13:50 2011 +0100
@@ -1,5 +1,10 @@
/* Copyright (C) 2002, 2004 Christopher Clark
<firstname.lastname@xxxxxxxxxxxx> */
+/*
+ * There are duplicates of this code in:
+ * - tools/vtpm_manager/util/hashtable_itr.c
+ */
+
#include "hashtable.h"
#include "hashtable_private.h"
#include "hashtable_itr.h"
diff -r 9f09b93530da -r e15ca5c3effc tools/blktap2/drivers/hashtable_itr.h
--- a/tools/blktap2/drivers/hashtable_itr.h Thu Mar 31 18:12:07 2011 +0100
+++ b/tools/blktap2/drivers/hashtable_itr.h Thu Mar 31 18:13:50 2011 +0100
@@ -1,5 +1,10 @@
/* Copyright (C) 2002, 2004 Christopher Clark
<firstname.lastname@xxxxxxxxxxxx> */
+/*
+ * There are duplicates of this code in:
+ * - tools/vtpm_manager/util/hashtable_itr.h
+ */
+
#ifndef __HASHTABLE_ITR_CWC22__
#define __HASHTABLE_ITR_CWC22__
#include "hashtable.h"
diff -r 9f09b93530da -r e15ca5c3effc tools/vtpm_manager/util/hashtable.c
--- a/tools/vtpm_manager/util/hashtable.c Thu Mar 31 18:12:07 2011 +0100
+++ b/tools/vtpm_manager/util/hashtable.c Thu Mar 31 18:13:50 2011 +0100
@@ -32,6 +32,12 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ * There are duplicates of this code in:
+ * - tools/xenstore/hashtable.c
+ * - tools/blktap2/drivers/hashtable.c
+ */
+
#include "hashtable.h"
#include "hashtable_private.h"
#include <stdlib.h>
diff -r 9f09b93530da -r e15ca5c3effc tools/vtpm_manager/util/hashtable.h
--- a/tools/vtpm_manager/util/hashtable.h Thu Mar 31 18:12:07 2011 +0100
+++ b/tools/vtpm_manager/util/hashtable.h Thu Mar 31 18:13:50 2011 +0100
@@ -32,6 +32,11 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ * There are duplicates of this code in:
+ * - tools/xenstore/hashtable.h
+ * - tools/blktap2/drivers/hashtable.h
+ */
#ifndef __HASHTABLE_CWC22_H__
#define __HASHTABLE_CWC22_H__
diff -r 9f09b93530da -r e15ca5c3effc tools/vtpm_manager/util/hashtable_itr.c
--- a/tools/vtpm_manager/util/hashtable_itr.c Thu Mar 31 18:12:07 2011 +0100
+++ b/tools/vtpm_manager/util/hashtable_itr.c Thu Mar 31 18:13:50 2011 +0100
@@ -32,6 +32,11 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ * There are duplicates of this code in:
+ * - tools/blktap2/drivers/hashtable_itr.c
+ */
+
#include "hashtable.h"
#include "hashtable_private.h"
#include "hashtable_itr.h"
diff -r 9f09b93530da -r e15ca5c3effc tools/vtpm_manager/util/hashtable_itr.h
--- a/tools/vtpm_manager/util/hashtable_itr.h Thu Mar 31 18:12:07 2011 +0100
+++ b/tools/vtpm_manager/util/hashtable_itr.h Thu Mar 31 18:13:50 2011 +0100
@@ -32,6 +32,11 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ * There are duplicates of this code in:
+ * - tools/blktap2/drivers/hashtable_itr.h
+ */
+
#ifndef __HASHTABLE_ITR_CWC22__
#define __HASHTABLE_ITR_CWC22__
diff -r 9f09b93530da -r e15ca5c3effc tools/vtpm_manager/util/hashtable_private.h
--- a/tools/vtpm_manager/util/hashtable_private.h Thu Mar 31 18:12:07
2011 +0100
+++ b/tools/vtpm_manager/util/hashtable_private.h Thu Mar 31 18:13:50
2011 +0100
@@ -32,6 +32,12 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ * There are duplicates of this code in:
+ * - tools/xenstore/hashtable_private.h
+ * - tools/blktap2/drivers/hashtable_private.h
+ */
+
#ifndef __HASHTABLE_PRIVATE_CWC22_H__
#define __HASHTABLE_PRIVATE_CWC22_H__
diff -r 9f09b93530da -r e15ca5c3effc tools/xenstore/hashtable.c
--- a/tools/xenstore/hashtable.c Thu Mar 31 18:12:07 2011 +0100
+++ b/tools/xenstore/hashtable.c Thu Mar 31 18:13:50 2011 +0100
@@ -1,5 +1,11 @@
/* Copyright (C) 2004 Christopher Clark <firstname.lastname@xxxxxxxxxxxx> */
+/*
+ * There are duplicates of this code in:
+ * - tools/blktap2/drivers/hashtable.c
+ * - tools/vtpm_manager/util/hashtable.c
+ */
+
#include "hashtable.h"
#include "hashtable_private.h"
#include <stdlib.h>
diff -r 9f09b93530da -r e15ca5c3effc tools/xenstore/hashtable.h
--- a/tools/xenstore/hashtable.h Thu Mar 31 18:12:07 2011 +0100
+++ b/tools/xenstore/hashtable.h Thu Mar 31 18:13:50 2011 +0100
@@ -1,5 +1,11 @@
/* Copyright (C) 2002 Christopher Clark <firstname.lastname@xxxxxxxxxxxx> */
+/*
+ * There are duplicates of this code in:
+ * - tools/blktap2/drivers/hashtable.h
+ * - tools/vtpm_manager/util/hashtable.h
+ */
+
#ifndef __HASHTABLE_CWC22_H__
#define __HASHTABLE_CWC22_H__
diff -r 9f09b93530da -r e15ca5c3effc tools/xenstore/hashtable_private.h
--- a/tools/xenstore/hashtable_private.h Thu Mar 31 18:12:07 2011 +0100
+++ b/tools/xenstore/hashtable_private.h Thu Mar 31 18:13:50 2011 +0100
@@ -1,5 +1,11 @@
/* Copyright (C) 2002, 2004 Christopher Clark
<firstname.lastname@xxxxxxxxxxxx> */
+/*
+ * There are duplicates of this code in:
+ * - tools/blktap2/drivers/hashtable_private.h
+ * - tools/vtpm_manager/util/hashtable_private.h
+ */
+
#ifndef __HASHTABLE_PRIVATE_CWC22_H__
#define __HASHTABLE_PRIVATE_CWC22_H__
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|