diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-03-31 18:13:50 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2011-03-31 18:13:50 +0100 |
| commit | 7d6a65a4fa4fecf767b3eb5d47b76b7297c3747a (patch) | |
| tree | 67b32935a74300a0d360bc68ea5d0b4ebee61899 /tools/blktap2 | |
| parent | d561caafdc88b8e6d069cbc1c2728d513c59ebed (diff) | |
| download | xen-7d6a65a4fa4fecf767b3eb5d47b76b7297c3747a.tar.gz xen-7d6a65a4fa4fecf767b3eb5d47b76b7297c3747a.tar.bz2 xen-7d6a65a4fa4fecf767b3eb5d47b76b7297c3747a.zip | |
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@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/blktap2')
| -rw-r--r-- | tools/blktap2/drivers/Makefile | 2 | ||||
| -rw-r--r-- | tools/blktap2/drivers/hashtable.c | 6 | ||||
| -rw-r--r-- | tools/blktap2/drivers/hashtable_itr.c | 5 | ||||
| -rw-r--r-- | tools/blktap2/drivers/hashtable_itr.h | 5 |
4 files changed, 16 insertions, 2 deletions
diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile index 472dd62d9d..d205fa07d4 100644 --- a/tools/blktap2/drivers/Makefile +++ b/tools/blktap2/drivers/Makefile @@ -30,8 +30,6 @@ REMUS-OBJS += hashtable.o 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 --git a/tools/blktap2/drivers/hashtable.c b/tools/blktap2/drivers/hashtable.c index 67697498a7..631306b3e4 100644 --- a/tools/blktap2/drivers/hashtable.c +++ b/tools/blktap2/drivers/hashtable.c @@ -1,5 +1,11 @@ /* Copyright (C) 2004 Christopher Clark <firstname.lastname@cl.cam.ac.uk> */ +/* + * 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 --git a/tools/blktap2/drivers/hashtable_itr.c b/tools/blktap2/drivers/hashtable_itr.c index 731917ccf1..402e06b45d 100644 --- a/tools/blktap2/drivers/hashtable_itr.c +++ b/tools/blktap2/drivers/hashtable_itr.c @@ -1,5 +1,10 @@ /* Copyright (C) 2002, 2004 Christopher Clark <firstname.lastname@cl.cam.ac.uk> */ +/* + * 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 --git a/tools/blktap2/drivers/hashtable_itr.h b/tools/blktap2/drivers/hashtable_itr.h index 81da83855d..3d806384d3 100644 --- a/tools/blktap2/drivers/hashtable_itr.h +++ b/tools/blktap2/drivers/hashtable_itr.h @@ -1,5 +1,10 @@ /* Copyright (C) 2002, 2004 Christopher Clark <firstname.lastname@cl.cam.ac.uk> */ +/* + * 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" |