Deleted Added
full compact
block.h (181643) block.h (185605)
1/*
2 *
3 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
4 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
5 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
6 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
7 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
8 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
9 * IN THE SOFTWARE.
10 *
1/*
2 *
3 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
4 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
5 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
6 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
7 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
8 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
9 * IN THE SOFTWARE.
10 *
11 * $FreeBSD: head/sys/dev/xen/blkfront/block.h 181643 2008-08-12 20:01:57Z kmacy $
11 * $FreeBSD: head/sys/dev/xen/blkfront/block.h 185605 2008-12-04 07:59:05Z kmacy $
12 */
13
14
15#ifndef __XEN_DRIVERS_BLOCK_H__
16#define __XEN_DRIVERS_BLOCK_H__
17#include <xen/interface/io/blkif.h>
18
19struct xlbd_type_info

--- 35 unchanged lines hidden (view full) ---

55
56/*
57 * We have one of these per vbd, whether ide, scsi or 'other'. They
58 * hang in private_data off the gendisk structure. We may end up
59 * putting all kinds of interesting stuff here :-)
60 */
61struct blkfront_info
62{
12 */
13
14
15#ifndef __XEN_DRIVERS_BLOCK_H__
16#define __XEN_DRIVERS_BLOCK_H__
17#include <xen/interface/io/blkif.h>
18
19struct xlbd_type_info

--- 35 unchanged lines hidden (view full) ---

55
56/*
57 * We have one of these per vbd, whether ide, scsi or 'other'. They
58 * hang in private_data off the gendisk structure. We may end up
59 * putting all kinds of interesting stuff here :-)
60 */
61struct blkfront_info
62{
63 struct xenbus_device *xbdev;
63 device_t xbdev;
64 dev_t dev;
65 struct gendisk *gd;
66 int vdevice;
67 blkif_vdev_t handle;
68 int connected;
69 int ring_ref;
70 blkif_front_ring_t ring;
71 unsigned int irq;

--- 12 unchanged lines hidden (view full) ---

84 * The number of people holding this device open. We won't allow a
85 * hot-unplug unless this is 0.
86 */
87 int users;
88};
89/* Note that xlvbd_add doesn't call add_disk for you: you're expected
90 to call add_disk on info->gd once the disk is properly connected
91 up. */
64 dev_t dev;
65 struct gendisk *gd;
66 int vdevice;
67 blkif_vdev_t handle;
68 int connected;
69 int ring_ref;
70 blkif_front_ring_t ring;
71 unsigned int irq;

--- 12 unchanged lines hidden (view full) ---

84 * The number of people holding this device open. We won't allow a
85 * hot-unplug unless this is 0.
86 */
87 int users;
88};
89/* Note that xlvbd_add doesn't call add_disk for you: you're expected
90 to call add_disk on info->gd once the disk is properly connected
91 up. */
92int xlvbd_add(blkif_sector_t capacity, int device,
92int xlvbd_add(device_t, blkif_sector_t capacity, int device,
93 uint16_t vdisk_info, uint16_t sector_size, struct blkfront_info *info);
94void xlvbd_del(struct blkfront_info *info);
95
96#endif /* __XEN_DRIVERS_BLOCK_H__ */
97
93 uint16_t vdisk_info, uint16_t sector_size, struct blkfront_info *info);
94void xlvbd_del(struct blkfront_info *info);
95
96#endif /* __XEN_DRIVERS_BLOCK_H__ */
97