admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

MEMORY add compatibility for qemu-kvm

Browse Source 
qemu-kvm iscsi block driver calls iscsi_parse_full_url without
a valid iscsi_context. The driver also creates its own scsi_task
objects.
This commit is contained in:
Peter Lieven
2012-11-03 02:05:16 +01:00
parent 7f98233169
commit 871c56ce7a
4 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/scsi-lowlevel.c
View File

@@ -45,13 +45,21 @@ scsi_free_scsi_task(struct scsi_task *task)
{
struct scsi_allocated_memory *mem;
while ((mem = task->mem)) {
SLIST_REMOVE(&task->mem, mem);
iscsi_free(task->iscsi, mem);
if (task->iscsi != NULL) {
while ((mem = task->mem)) {
SLIST_REMOVE(&task->mem, mem);
iscsi_free(task->iscsi, mem);
}
iscsi_free(task->iscsi,task->datain.data);
iscsi_free(task->iscsi,task);
} else {
while ((mem = task->mem)) {
SLIST_REMOVE(&task->mem, mem);
free(mem);
}
free(task->datain.data);
free(task);
}
iscsi_free(task->iscsi,task->datain.data);
iscsi_free(task->iscsi,task);
}
struct scsi_task *
@@ -68,10 +76,14 @@ void *
scsi_malloc(struct scsi_task *task, size_t size)
{
struct scsi_allocated_memory *mem;
mem = iscsi_zmalloc(task->iscsi,sizeof(struct scsi_allocated_memory) + size);
if (task->iscsi != NULL)
mem = iscsi_malloc(task->iscsi,sizeof(struct scsi_allocated_memory) + size);
else
mem = malloc(sizeof(struct scsi_allocated_memory) + size);
if (mem == NULL) {
return NULL;
}
memset(mem, 0, sizeof(struct scsi_allocated_memory) + size);
mem->ptr = (void *) ((uintptr_t)mem + sizeof(struct scsi_allocated_memory));
SLIST_ADD(&task->mem, mem);
return mem->ptr;