From 08a07a95dd601b4fe686e4e2d8ef41930652d2bb Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 8 Jun 2010 08:04:09 +0100 Subject: [PATCH] blktap2: Fix E/DPRINTF defs all around the driver/ subdir. This is just to avoid macro madness among subdirs sharing blktaplib.h. Signed-off-by: Daniel Stodden Signed-off-by: Jake Wires --- tools/blktap2/drivers/block-remus.c | 1 - tools/blktap2/drivers/img2qcow.c | 2 -- tools/blktap2/drivers/qcow2raw.c | 1 - tools/blktap2/drivers/tapdisk.h | 4 ++++ tools/blktap2/include/blktaplib.h | 9 --------- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/tools/blktap2/drivers/block-remus.c b/tools/blktap2/drivers/block-remus.c index 0af8189ae7..bb5a8d17ad 100644 --- a/tools/blktap2/drivers/block-remus.c +++ b/tools/blktap2/drivers/block-remus.c @@ -33,7 +33,6 @@ /* due to architectural choices in tapdisk, block-buffer is forced to * reimplement some code which is meant to be private */ -#define TAPDISK #include "tapdisk.h" #include "tapdisk-server.h" #include "tapdisk-driver.h" diff --git a/tools/blktap2/drivers/img2qcow.c b/tools/blktap2/drivers/img2qcow.c index 17a89296f9..57b931e551 100644 --- a/tools/blktap2/drivers/img2qcow.c +++ b/tools/blktap2/drivers/img2qcow.c @@ -64,8 +64,6 @@ #define O_LARGEFILE 0 #endif - -#define TAPDISK 1 #define BLOCK_PROCESSSZ 4096 #define QCOW_VBD 0 #define PROGRESS_QUANT 2 diff --git a/tools/blktap2/drivers/qcow2raw.c b/tools/blktap2/drivers/qcow2raw.c index 04cb26eae4..a2e417dae1 100644 --- a/tools/blktap2/drivers/qcow2raw.c +++ b/tools/blktap2/drivers/qcow2raw.c @@ -62,7 +62,6 @@ #define O_LARGEFILE 0 #endif -#define TAPDISK 1 #define BLOCK_PROCESSSZ 4096 #define QCOW_VBD 0 #define AIO_VBD 1 diff --git a/tools/blktap2/drivers/tapdisk.h b/tools/blktap2/drivers/tapdisk.h index 6625de0001..f945fbfe64 100644 --- a/tools/blktap2/drivers/tapdisk.h +++ b/tools/blktap2/drivers/tapdisk.h @@ -64,6 +64,10 @@ #include "tapdisk-log.h" #include "tapdisk-utils.h" +#define DPRINTF(_f, _a...) syslog(LOG_INFO, _f, ##_a) +#define EPRINTF(_f, _a...) syslog(LOG_ERR, "tap-err:%s: " _f, __func__, ##_a) +#define PERROR(_f, _a...) EPRINTF(_f ": %s", ##_a, strerror(errno)) + #define MAX_SEGMENTS_PER_REQ 11 #define SECTOR_SHIFT 9 #define DEFAULT_SECTOR_SIZE 512 diff --git a/tools/blktap2/include/blktaplib.h b/tools/blktap2/include/blktaplib.h index d91a29b25f..afd1037352 100644 --- a/tools/blktap2/include/blktaplib.h +++ b/tools/blktap2/include/blktaplib.h @@ -36,15 +36,6 @@ #include #include -#if 1 -#define DPRINTF(_f, _a...) syslog(LOG_INFO, _f, ##_a) -#else -#define DPRINTF(_f, _a...) ((void)0) -#endif - -#define EPRINTF(_f, _a...) syslog(LOG_ERR, "tap-err:%s: " _f, __func__, ##_a) -#define PERROR(_f, _a...) EPRINTF(_f ": %s", ##_a, strerror(errno)) - #define BLK_RING_SIZE __CONST_RING_SIZE(blkif, XC_PAGE_SIZE) /* size of the extra VMA area to map in attached pages. */ -- 2.30.2