Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 196cfe2a authored by Stefan Bader's avatar Stefan Bader Committed by Konrad Rzeszutek Wilk
Browse files

xen-blkfront: Drop name and minor adjustments for emulated scsi devices 



These were intended to avoid the namespace clash when representing
emulated IDE and SCSI devices. However that seems to confuse users
more than expected (a disk defined as sda becomes xvde).
So for now go back to the scheme which does no adjustments. This
will break when mixing IDE and SCSI names in the configuration of
guests but should be by now expected.

Acked-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent a7e9357f

drivers/block/xen-blkfront.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -123,8 +123,8 @@ static DEFINE_SPINLOCK(minor_lock); 
#define BLKIF_MINOR_EXT(dev) ((dev)&(~EXTENDED))

#define BLKIF_MINOR_EXT(dev) ((dev)&(~EXTENDED))

#define EMULATED_HD_DISK_MINOR_OFFSET (0)

#define EMULATED_HD_DISK_MINOR_OFFSET (0)

#define EMULATED_HD_DISK_NAME_OFFSET (EMULATED_HD_DISK_MINOR_OFFSET / 256)

#define EMULATED_HD_DISK_NAME_OFFSET (EMULATED_HD_DISK_MINOR_OFFSET / 256)

#define EMULATED_SD_DISK_MINOR_OFFSET (EMULATED_HD_DISK_MINOR_OFFSET + (4 * 16))

#define EMULATED_SD_DISK_MINOR_OFFSET (0)

#define EMULATED_SD_DISK_NAME_OFFSET (EMULATED_HD_DISK_NAME_OFFSET + 4)

#define EMULATED_SD_DISK_NAME_OFFSET (EMULATED_SD_DISK_MINOR_OFFSET / 256)





#define DEV_NAME	"xvd"	/* name in /dev */

#define DEV_NAME	"xvd"	/* name in /dev */