openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

vbox: Use virIndexToDiskName() in vboxGenerateMediumName()

This commit is contained in:
Matthias Bolte 2009-12-04 15:18:45 +01:00
parent 81ea6e4d9f
commit 03fa46886a
1 changed files with 9 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/vbox/vbox_tmpl.c
View File

@ -412,9 +412,6 @@ static void vboxUtf8toIID(virConnectPtr conn, char *uuidstr, vboxIID **iid) {
* function to generate the name for medium,
* for e.g: hda, sda, etc
*
* Limitation: 1) max (26+(26*26)+(26*26*26)) i.e
* 18,278 names for now
*
* @returns null terminated string with device name or NULL
* for failures
* @param conn Input Connection Pointer
@ -426,15 +423,14 @@ static void vboxUtf8toIID(virConnectPtr conn, char *uuidstr, vboxIID **iid) {
* @param aMaxSlotPerPort Input array of max slot per device port
*
*/
static char *vboxGenerateMediumName(virConnectPtr conn,
PRUint32 storageBus,
static char *vboxGenerateMediumName(PRUint32 storageBus,
PRInt32 deviceInst,
PRInt32 devicePort,
PRInt32 deviceSlot,
PRUint32 *aMaxPortPerInst,
PRUint32 *aMaxSlotPerPort) {
const char *prefix = NULL;
char *name = NULL;
int len = 0;
int total = 0;
PRUint32 maxPortPerInst = 0;
PRUint32 maxSlotPerPort = 0;
@ -453,48 +449,20 @@ static char *vboxGenerateMediumName(virConnectPtr conn,
+ (devicePort * maxSlotPerPort)
+ deviceSlot;
if ((total >= 0) && (total < 26))
len = 4;
else if ((total >= 26) && (total < 26*26 + 26))
len = 5;
else if ((total >= 26*26 + 26) && (total < 26*26*26 + 26*26 + 26))
len = 6;
else
return NULL;
if (VIR_ALLOC_N(name, len) < 0) {
virReportOOMError(conn);
return NULL;
}
/* TODO: use virIndexToDiskName() here when available */
if (storageBus == StorageBus_IDE) {
name[0] = 'h';
name[1] = 'd';
prefix = "hd";
} else if ( (storageBus == StorageBus_SATA)
|| (storageBus == StorageBus_SCSI)) {
name[0] = 's';
name[1] = 'd';
prefix = "sd";
} else if (storageBus == StorageBus_Floppy) {
name[0] = 'f';
name[1] = 'd';
prefix = "fd";
}
if (len == 4) {
name[2] = (char)(97 + total);
} else if (len == 5) {
name[2] = (char)(96 + (total / 26));
name[3] = (char)(97 + (total % 26));
} else if (len == 6) {
name[2] = (char)(96 + (total / 26*26));
name[3] = (char)(96 + ((total % (26*26)) / 26));
name[4] = (char)(97 + ((total % (26*26)) % 26));
}
name = virIndexToDiskName(total, prefix);
name[len - 1] = '\0';
DEBUG("name=%s, len=%d, total=%d, storageBus=%u, deviceInst=%d, "
DEBUG("name=%s, total=%d, storageBus=%u, deviceInst=%d, "
"devicePort=%d deviceSlot=%d, maxPortPerInst=%u maxSlotPerPort=%u",
name, len, total, storageBus, deviceInst, devicePort,
NULLSTR(name), total, storageBus, deviceInst, devicePort,
deviceSlot, maxPortPerInst, maxSlotPerPort);
return name;
}
@ -505,9 +473,6 @@ static char *vboxGenerateMediumName(virConnectPtr conn,
* e.g: hda has StorageBus = IDE, port = 0,
* device = 0
*
* Limitation: only name till 4 chars supported
* i.e from hda till hdzz
*
* @returns true on Success, false on failure.
* @param deviceName Input device name
* @param aMaxPortPerInst Input array of max port per device instance
@ -2496,8 +2461,7 @@ static char *vboxDomainDumpXML(virDomainPtr dom, int flags) {
imediumattach->vtbl->GetPort(imediumattach, &devicePort);
imediumattach->vtbl->GetDevice(imediumattach, &deviceSlot);
def->disks[diskCount]->dst = vboxGenerateMediumName(dom->conn,
storageBus,
def->disks[diskCount]->dst = vboxGenerateMediumName(storageBus,
deviceInst,
devicePort,
deviceSlot,