xen-changelog

[Top] [All Lists]

[Xen-changelog] Manual merge.

from [BitKeeper Bot]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] Manual merge.
From:	BitKeeper Bot <riel@xxxxxxxxxxx>
Date:	Fri, 20 May 2005 14:20:31 +0000
Delivery-date:	Fri, 20 May 2005 15:01:28 +0000
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/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	Xen Development List <xen-devel@xxxxxxxxxxxxxxxxxxx>
Sender:	xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx

ChangeSet 1.1485, 2005/05/20 15:20:31+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Manual merge.



 vbd.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)


diff -Nru a/linux-2.6.11-xen-sparse/drivers/xen/blkback/vbd.c 
b/linux-2.6.11-xen-sparse/drivers/xen/blkback/vbd.c
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/vbd.c 2005-05-20 11:02:10 
-04:00
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/vbd.c 2005-05-20 11:02:10 
-04:00
@@ -78,7 +78,6 @@
 
     vbd->vdevice  = vdevice; 
     vbd->readonly = create->readonly;
-    vbd->type     = VDISK_TYPE_DISK | VDISK_FLAG_VIRT;
 
     /* Mask to 16-bit for compatibility with old tools */
     vbd->pdevice  = create->pdevice & 0xffff;
@@ -101,6 +100,9 @@
         bdev_put(vbd->bdev);
         return;
     }
+
+    vbd->type = (vbd->bdev->bd_disk->flags & GENHD_FL_CD) ?
+        VDISK_TYPE_CDROM : VDISK_TYPE_DISK;
 #else
     if ( (blk_size[MAJOR(vbd->pdevice)] == NULL) || (vbd_sz(vbd) == 0) )
     {
@@ -108,6 +110,8 @@
         create->status = BLKIF_BE_STATUS_PHYSDEV_NOT_FOUND;
         return;
     }
+
+    vbd->type = VDISK_TYPE_DISK;
 #endif
 
     spin_lock(&blkif->vbd_lock);

_______________________________________________
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] Manual merge., BitKeeper Bot [Xen-changelog] Manual merge., BitKeeper Bot [Xen-changelog] Manual merge., BitKeeper Bot [Xen-changelog] Manual merge., BitKeeper Bot [Xen-changelog] Manual merge., BitKeeper Bot [Xen-changelog] Manual merge., BitKeeper Bot <= [Xen-changelog] Manual merge., BitKeeper Bot [Xen-changelog] Manual merge., BitKeeper Bot

Previous by Date:	[Xen-changelog] Manual merge., BitKeeper Bot
Next by Date:	[Xen-changelog] Pass CD-ROM type info through from blkback to blkfront, and interpret, BitKeeper Bot
Previous by Thread:	[Xen-changelog] Manual merge., BitKeeper Bot
Next by Thread:	[Xen-changelog] Manual merge., BitKeeper Bot
Indexes:	[Date] [Thread] [Top] [All Lists]