Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
DISCONTINUED:openSUSE:11.1:Update
xen
blktap-ioemu-close-fix.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File blktap-ioemu-close-fix.patch of Package xen
Index: xen-3.3.1-testing/tools/blktap/drivers/blktapctrl.c =================================================================== --- xen-3.3.1-testing.orig/tools/blktap/drivers/blktapctrl.c +++ xen-3.3.1-testing/tools/blktap/drivers/blktapctrl.c @@ -221,6 +221,28 @@ static void add_disktype(blkif_t *blkif, entry->pprev = pprev; } +static int qemu_instance_has_disks(pid_t pid) +{ + int i; + int count = 0; + driver_list_entry_t *entry; + + for (i = 0; i < MAX_DISK_TYPES; i++) { + entry = active_disks[i]; + while (entry) { +#ifdef ALWAYS_USE_IOEMU + if (entry->blkif->tappid == pid) +#else + if ((entry->blkif->tappid == pid) && dtypes[i]->use_ioemu) +#endif + count++; + entry = entry->next; + } + } + + return (count != 0); +} + static int del_disktype(blkif_t *blkif) { driver_list_entry_t *entry, **pprev; @@ -245,8 +267,20 @@ static int del_disktype(blkif_t *blkif) DPRINTF("DEL_DISKTYPE: Freeing entry\n"); free(entry); +#ifdef ALWAYS_USE_IOEMU + return !qemu_instance_has_disks(blkif->tappid); +#else + /* + * When using ioemu, all disks of one VM are connected to the same + * qemu-dm instance. We may close the file handle only if there is + * no other disk left for this domain. + */ + if (dtypes[type]->use_ioemu) + return !qemu_instance_has_disks(blkif->tappid); + /* Caller should close() if no single controller, or list is empty. */ return (!dtypes[type]->single_handler || (active_disks[type] == NULL)); +#endif } static int write_msg(int fd, int msgtype, void *ptr, void *ptr2) @@ -721,6 +755,7 @@ static int unmap_blktapctrl(blkif_t *blk } if (del_disktype(blkif)) { + DPRINTF("Closing communication pipe to pid %d\n", blkif->tappid); close(blkif->fds[WRITE]); close(blkif->fds[READ]); }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor