[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] libs/foreignmem: Drop useless and/or misleading logging
commit 9351e1468d67ee79fbc6411b087c67ac34813891 Author: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> AuthorDate: Wed Feb 3 15:41:55 2021 +0000 Commit: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> CommitDate: Wed Feb 3 19:25:15 2021 +0000 libs/foreignmem: Drop useless and/or misleading logging These log lines are all in response to single system calls, and do not provide any information which the immediate caller can't determine themselves. It is however rude to put junk like this onto stderr, especially as system call failures are not even error conditions in certain circumstances. The FreeBSD logging has stale function names in, and Solaris shouldn't have passed code review to start with. No functional change. Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> Reviewed-by: Ian Jackson <iwj@xxxxxxxxxxxxxx> Release-Acked-by: Ian Jackson <iwj@xxxxxxxxxxxxxx> --- tools/libs/foreignmemory/freebsd.c | 7 ++----- tools/libs/foreignmemory/linux.c | 6 +----- tools/libs/foreignmemory/netbsd.c | 2 -- tools/libs/foreignmemory/solaris.c | 2 +- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/tools/libs/foreignmemory/freebsd.c b/tools/libs/foreignmemory/freebsd.c index 9a2796f0b7..04bfa806b0 100644 --- a/tools/libs/foreignmemory/freebsd.c +++ b/tools/libs/foreignmemory/freebsd.c @@ -65,10 +65,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, addr = mmap(addr, num << PAGE_SHIFT, prot, flags | MAP_SHARED, fd, 0); if ( addr == MAP_FAILED ) - { - PERROR("xc_map_foreign_bulk: mmap failed"); return NULL; - } ioctlx.num = num; ioctlx.dom = dom; @@ -80,7 +77,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, if ( rc < 0 ) { int saved_errno = errno; - PERROR("xc_map_foreign_bulk: ioctl failed"); + (void)munmap(addr, num << PAGE_SHIFT); errno = saved_errno; return NULL; @@ -137,7 +134,7 @@ int osdep_xenforeignmemory_map_resource(xenforeignmemory_handle *fmem, int saved_errno; if ( errno != ENOSYS ) - PERROR("mmap resource ioctl failed"); + ; else errno = EOPNOTSUPP; diff --git a/tools/libs/foreignmemory/linux.c b/tools/libs/foreignmemory/linux.c index d0eead1196..050b9ed3a5 100644 --- a/tools/libs/foreignmemory/linux.c +++ b/tools/libs/foreignmemory/linux.c @@ -171,10 +171,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, addr = mmap(addr, num << PAGE_SHIFT, prot, flags | MAP_SHARED, fd, 0); if ( addr == MAP_FAILED ) - { - PERROR("mmap failed"); return NULL; - } ioctlx.num = num; ioctlx.dom = dom; @@ -273,7 +270,6 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, { int saved_errno = errno; - PERROR("ioctl failed"); (void)munmap(addr, num << PAGE_SHIFT); errno = saved_errno; return NULL; @@ -330,7 +326,7 @@ int osdep_xenforeignmemory_map_resource( int saved_errno; if ( errno != fmem->unimpl_errno && errno != EOPNOTSUPP ) - PERROR("ioctl failed"); + ; else errno = EOPNOTSUPP; diff --git a/tools/libs/foreignmemory/netbsd.c b/tools/libs/foreignmemory/netbsd.c index 4ae60aafdd..565682e064 100644 --- a/tools/libs/foreignmemory/netbsd.c +++ b/tools/libs/foreignmemory/netbsd.c @@ -147,8 +147,6 @@ int osdep_xenforeignmemory_map_resource( rc = ioctl(fmem->fd, IOCTL_PRIVCMD_MMAP_RESOURCE, &mr); if ( rc ) { - PERROR("ioctl failed"); - if ( fres->addr ) { int saved_errno = errno; diff --git a/tools/libs/foreignmemory/solaris.c b/tools/libs/foreignmemory/solaris.c index ee8aae4fbd..958fb01f6d 100644 --- a/tools/libs/foreignmemory/solaris.c +++ b/tools/libs/foreignmemory/solaris.c @@ -83,7 +83,7 @@ void *osdep_map_foreign_batch(xenforeignmem_handle *fmem, uint32_t dom, if ( ioctl(fd, IOCTL_PRIVCMD_MMAPBATCH, &ioctlx) < 0 ) { int saved_errno = errno; - PERROR("XXXXXXXX"); + (void)munmap(addr, num*XC_PAGE_SIZE); errno = saved_errno; return NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |