Mailing List Archive

# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1275980649 -3600
# Node ID a5032d7a87e020848acc4a9c349f92c4b4e3b0cf
# Parent 9009f9f76441e37077258fd9d7b4d84cfc42599d
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 <daniel.stodden@citrix.com>
Signed-off-by: Jake Wires <jake.wires@citrix.com>
---
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 -r 9009f9f76441 -r a5032d7a87e0 tools/blktap2/drivers/block-remus.c
--- a/tools/blktap2/drivers/block-remus.c Tue Jun 08 08:03:41 2010 +0100
+++ b/tools/blktap2/drivers/block-remus.c Tue Jun 08 08:04:09 2010 +0100
@@ -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 -r 9009f9f76441 -r a5032d7a87e0 tools/blktap2/drivers/img2qcow.c
--- a/tools/blktap2/drivers/img2qcow.c Tue Jun 08 08:03:41 2010 +0100
+++ b/tools/blktap2/drivers/img2qcow.c Tue Jun 08 08:04:09 2010 +0100
@@ -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 -r 9009f9f76441 -r a5032d7a87e0 tools/blktap2/drivers/qcow2raw.c
--- a/tools/blktap2/drivers/qcow2raw.c Tue Jun 08 08:03:41 2010 +0100
+++ b/tools/blktap2/drivers/qcow2raw.c Tue Jun 08 08:04:09 2010 +0100
@@ -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 -r 9009f9f76441 -r a5032d7a87e0 tools/blktap2/drivers/tapdisk.h
--- a/tools/blktap2/drivers/tapdisk.h Tue Jun 08 08:03:41 2010 +0100
+++ b/tools/blktap2/drivers/tapdisk.h Tue Jun 08 08:04:09 2010 +0100
@@ -63,6 +63,10 @@
#include "blktaplib.h"
#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
diff -r 9009f9f76441 -r a5032d7a87e0 tools/blktap2/include/blktaplib.h
--- a/tools/blktap2/include/blktaplib.h Tue Jun 08 08:03:41 2010 +0100
+++ b/tools/blktap2/include/blktaplib.h Tue Jun 08 08:04:09 2010 +0100
@@ -35,15 +35,6 @@
#include <syslog.h>
#include <xenctrl.h>
#include <xen/io/blkif.h>
-
-#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)


_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog