xen-changelog

[Top] [All Lists]

[Xen-changelog] [xen-unstable] merge

from [Xen patchbot-unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] [xen-unstable] merge
From:	Xen patchbot-unstable <patchbot@xxxxxxx>
Date:	Thu, 10 Mar 2011 22:20:14 +0000
Delivery-date:	Thu, 10 Mar 2011 14:25:12 -0800
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	xen-devel@xxxxxxxxxxxxxxxxxxx
Sender:	xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx

# 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

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] [xen-unstable] Merge, Xen patchbot-unstable [Xen-changelog] [xen-unstable] merge, Xen patchbot-unstable <= [Xen-changelog] [xen-unstable] Merge, Xen patchbot-unstable

Previous by Date:	[Xen-changelog] [xen-unstable] xen: add "lto=y" option to build Xen with link-time optimizations., Xen patchbot-unstable
Next by Date:	[Xen-changelog] [xen-unstable] x86_emulate: Fix emulation of FIMUL m32i., Xen patchbot-unstable
Previous by Thread:	[Xen-changelog] [xen-unstable] Merge, Xen patchbot-unstable
Next by Thread:	[Xen-changelog] [xen-unstable] Merge, Xen patchbot-unstable
Indexes:	[Date] [Thread] [Top] [All Lists]