diff -r 5122dc90468b tools/Makefile --- a/tools/Makefile Mon Jan 18 10:48:33 2010 +0100 +++ b/tools/Makefile Mon Jan 18 15:05:28 2010 +0100 @@ -25,7 +25,6 @@ SUBDIRS-$(CONFIG_Linux) += memshr SUBDIRS-$(CONFIG_Linux) += blktap SUBDIRS-$(CONFIG_Linux) += blktap2 SUBDIRS-$(CONFIG_NetBSD) += libaio -SUBDIRS-$(CONFIG_NetBSD) += memshr SUBDIRS-$(CONFIG_NetBSD) += blktap SUBDIRS-$(CONFIG_NetBSD) += blktap2 SUBDIRS-$(CONFIG_NetBSD) += xenbackendd diff -r d58bb8a8d0bd -r 3a0b122a3aeb tools/blktap2/drivers/block-log.c --- a/tools/blktap2/drivers/block-log.c +++ b/tools/blktap2/drivers/block-log.c @@ -250,11 +250,13 @@ static int shmem_open(struct tdlog_state path_escape(s->shmpath + 5, strlen(name)); +#if 0 if ((fd = shm_open(s->shmpath, O_CREAT|O_RDWR, 0750)) < 0) { BWPRINTF("could not open shared memory file %s: %s", s->shmpath, strerror(errno)); goto err; } +#endif if (ftruncate(fd, SHMSIZE) < 0) { BWPRINTF("error truncating shmem to size %u", SHMSIZE); close(fd); @@ -284,7 +286,9 @@ static int shmem_close(struct tdlog_stat } if (s->shmpath) { +#if 0 shm_unlink(s->shmpath); +#endif s->shmpath = NULL; } diff -r d58bb8a8d0bd -r 3a0b122a3aeb tools/blktap2/drivers/tapdisk-client.c --- a/tools/blktap2/drivers/tapdisk-client.c +++ b/tools/blktap2/drivers/tapdisk-client.c @@ -243,11 +243,13 @@ static int writelog_map(struct writelog* int fd; void* shm; +#if 0 if ((fd = shm_open(wl->shmpath, O_RDWR, 0750)) < 0) { BWPRINTF("could not open shared memory at %s: %s", wl->shmpath, strerror(errno)); return -1; } +#endif wl->shm = mmap(NULL, wl->shmsize, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); close(fd);

AltStyle によって変換されたページ (->オリジナル) /