[Xen-changelog] [xen-unstable] merge

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxx>
# Date 1299515749 0
# Node ID 6183ba4f45e094ad04c48c2663f5104d12e80e0a
# Parent  ca556b7bad5c09521b59ba6bbd71e22958940975
# Parent  649de04caff58624fc36d3cae595015e60dfcb22
merge
---


diff -r ca556b7bad5c -r 6183ba4f45e0 tools/blktap2/drivers/tapdisk-disktype.h
--- a/tools/blktap2/drivers/tapdisk-disktype.h  Mon Mar 07 16:07:06 2011 +0000
+++ b/tools/blktap2/drivers/tapdisk-disktype.h  Mon Mar 07 16:35:49 2011 +0000
@@ -37,9 +37,9 @@
 #define DISK_TYPE_RAM         5
 #define DISK_TYPE_QCOW        6
 #define DISK_TYPE_BLOCK_CACHE 7
-#define DISK_TYPE_LOG         9
-#define DISK_TYPE_REMUS       10
-#define DISK_TYPE_VINDEX      11
+#define DISK_TYPE_LOG         8
+#define DISK_TYPE_REMUS       9
+#define DISK_TYPE_VINDEX      10
 
 #define DISK_TYPE_NAME_MAX    32
 

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