search for: blkdev

...- 1 file changed, 39 insertions(+), 30 deletions(-) diff --git a/hw/xen_disk.c b/hw/xen_disk.c index a402ac8..3cecf8d 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -560,7 +560,7 @@ static void blk_alloc(struct XenDevice *xendev) static int blk_init(struct XenDevice *xendev) { struct XenBlkDev *blkdev = container_of(xendev, struct XenBlkDev, xendev); - int index, qflags, info = 0; + int info = 0; /* read xenstore entries */ if (blkdev->params == NULL) { @@ -603,18 +603,49 @@ static int blk_init(struct XenDevice *xendev) } /* read-only ? */ - qflags = B...

From: Stefano Stabellini <stefano.stabellini@eu.citrix.com> When disk is a cdrom and the drive is empty the "params" node in xenstore might be missing completely: cope with it instead of segfaulting. Updated in v2: - actually removed the strchr(blkdev->params, '':'') that caused the segfault; - free all the allocated strings from xenstore before returning; Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> --- hw/xen_disk.c | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 de...

This patch-set deals with some of the style isues in blkvsc_drv.c. We also get rid most of the "dead code" in this file: 1) Get rid of most of the forward declarations in this file. The only remaining forward declarations are to deal with circular dependencies. 2) Get rid of most of the dead code in the file. Some of the functions in this file are place holders - they

This patch-set deals with some of the style isues in blkvsc_drv.c. We also get rid most of the "dead code" in this file: 1) Get rid of most of the forward declarations in this file. The only remaining forward declarations are to deal with circular dependencies. 2) Get rid of most of the dead code in the file. Some of the functions in this file are place holders - they

From: Stefano Stabellini <stefano.stabellini@eu.citrix.com> When disk is a cdrom and the drive is empty the "params" node in xenstore might be missing completely: cope with it instead of segfaulting. Updated in v2: - actually removed the strchr(blkdev->params, '':'') that caused the segfault; - free all the allocated strings from xenstore before returning; Updated in v3: - set blkdev fields to NULL after free''ing them. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> --- hw/xen_disk.c...

This is a resend of a previously sent patch-set. This patch-set deals with some of the style isues in blkvsc_drv.c. We also get rid most of the "dead code" in this file: 1) Get rid of most of the forward declarations in this file. The only remaining forward declarations are to deal with circular dependencies. 2) Get rid of most of the dead code in the file. Some of the

This is a resend of a previously sent patch-set. This patch-set deals with some of the style isues in blkvsc_drv.c. We also get rid most of the "dead code" in this file: 1) Get rid of most of the forward declarations in this file. The only remaining forward declarations are to deal with circular dependencies. 2) Get rid of most of the dead code in the file. Some of the

The latest upstream merge changed struct block_device_operations: This merge got rid of blkvsc_media_changed and introduced the function blkvsc_check_events. This broke all the patches that were sent after the tree was closed the last time. This is a resend of this patch-set to account for this change in the kernel. More cleanup. In this patch-set we deal with the following issues: 1) While a

The latest upstream merge changed struct block_device_operations: This merge got rid of blkvsc_media_changed and introduced the function blkvsc_check_events. This broke all the patches that were sent after the tree was closed the last time. This is a resend of this patch-set to account for this change in the kernel. More cleanup. In this patch-set we deal with the following issues: 1) While a

...m> --- hw/xen_disk.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/hw/xen_disk.c b/hw/xen_disk.c index 096d1c9..801da58 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -616,11 +616,13 @@ static int blk_init(struct XenDevice *xendev) { struct XenBlkDev *blkdev = container_of(xendev, struct XenBlkDev, xendev); int index, qflags, have_barriers, info = 0; - char *h; + char *h = NULL; /* read xenstore entries */ if (blkdev->params == NULL) { blkdev->params = xenstore_read_be_str(&blkdev->xendev, "para...

More cleanup. In this patch-set we deal with the following issues: 1) While a Linux guest on Hyper-V can be assigned removable media devices (DVD, floppy etc), these devices are not handled by the Hyper-V block driver. So, we cleanup all the dead code dealing with removable media devices. 2) There were multiple functions to retrieve information about the device. Since much of

More cleanup. In this patch-set we deal with the following issues: 1) While a Linux guest on Hyper-V can be assigned removable media devices (DVD, floppy etc), these devices are not handled by the Hyper-V block driver. So, we cleanup all the dead code dealing with removable media devices. 2) There were multiple functions to retrieve information about the device. Since much of

...error/warning messages are: block/blk-core.c: In function ?attempt_plug_merge?: block/blk-core.c:1253:9: error: ?struct request? has no member named ?q? drivers/block/cpqarray.c:938:2: warning: passing argument 1 of ?blk_rq_map_sg? from incompatible pointer type [enabled by default] include/linux/blkdev.h:845:12: note: expected ?struct request *? but argument is of type ?struct request_queue *? drivers/block/cpqarray.c:938:2: warning: passing argument 2 of ?blk_rq_map_sg? from incompatible pointer type [enabled by default] include/linux/blkdev.h:845:12: note: expected ?struct scatterlist *? but ar...

...error/warning messages are: block/blk-core.c: In function ?attempt_plug_merge?: block/blk-core.c:1253:9: error: ?struct request? has no member named ?q? drivers/block/cpqarray.c:938:2: warning: passing argument 1 of ?blk_rq_map_sg? from incompatible pointer type [enabled by default] include/linux/blkdev.h:845:12: note: expected ?struct request *? but argument is of type ?struct request_queue *? drivers/block/cpqarray.c:938:2: warning: passing argument 2 of ?blk_rq_map_sg? from incompatible pointer type [enabled by default] include/linux/blkdev.h:845:12: note: expected ?struct scatterlist *? but ar...

...correct, doing so in the parse error case is wrong; requests_inflight needs to be decremented instead. Change in v2: Adjust coding style. Signed-off-by: Jan Beulich <jbeulich@suse.com> --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -154,7 +154,7 @@ static void ioreq_finish(struct ioreq *i blkdev->requests_finished++; } -static void ioreq_release(struct ioreq *ioreq) +static void ioreq_release(struct ioreq *ioreq, bool finish) { struct XenBlkDev *blkdev = ioreq->blkdev; @@ -162,7 +162,11 @@ static void ioreq_release(struct ioreq * memset(ioreq, 0, sizeof(*ioreq));...

We need to detach the blkdev from the BlockDriverState before calling bdrv_delete. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> CC: Markus Armbruster <armbru@redhat.com> --- hw/xen_disk.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/xen_disk.c b/hw/xen_disk.c...

I foolishly made the following typo: " disk = [ ''phy:/dev/vg00/virt-smtp1-root,0301,w'', ''phy:/dev/vg00/virt-smtp1-root,0302,w'' ] " instead of: " disk = [ ''phy:/dev/vg00/virt-smtp1-root,0301,w'', ''phy:/dev/vg00/virt-smtp1-swap,0302,w'' ]" (the type was that the same Dom0 block device is used twice in the

...es changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index b3d05fc..4fb8094 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -368,6 +368,7 @@ static int blkvsc_probe(struct device *device) blkdev->gd->first_minor = 0; blkdev->gd->fops = &block_ops; blkdev->gd->private_data = blkdev; + blkdev->gd->driverfs_dev = &(blkdev->device_ctx->device); sprintf(blkdev->gd->disk_name, "hd%c", 'a' + devnum); blkvsc_do_inquiry(blkdev)...

...es changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index b3d05fc..4fb8094 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -368,6 +368,7 @@ static int blkvsc_probe(struct device *device) blkdev->gd->first_minor = 0; blkdev->gd->fops = &block_ops; blkdev->gd->private_data = blkdev; + blkdev->gd->driverfs_dev = &(blkdev->device_ctx->device); sprintf(blkdev->gd->disk_name, "hd%c", 'a' + devnum); blkvsc_do_inquiry(blkdev)...

...sfers. > > I''ll leave the check in pci_map_sg(), but it shouldn''t ever trigger > after I patch the IDE and SCSI merge routines, so I''ll add a warning > message if an invalid scatter-gather list is detected. Okay, I''ve checked in a better fix for the blkdev merging bug, which should work okay for all IDE and SCSI devices. Other advantages are that it still permits merging wherever possible, and there is no need for fallback to PIO transfers. Please can people give this a try, particularly on SCSI - fingers crossed the bug will be gone. -- Keir --...