diff options
author | David Vrabel <david.vrabel@citrix.com> | 2012-02-20 17:31:49 +0000 |
---|---|---|
committer | David Vrabel <david.vrabel@citrix.com> | 2012-02-20 17:31:49 +0000 |
commit | 636171218e1aba94fbf62a36b2dbcf06f8922db5 (patch) | |
tree | 071d7ef47e5bd1eb0c13d7f6b9c1febf6ec221cb /tools/libxc/xc_linux_osdep.c | |
parent | 22aba0d7c6379bad608bf165e86304ca9b70724b (diff) | |
download | xen-636171218e1aba94fbf62a36b2dbcf06f8922db5.tar.gz xen-636171218e1aba94fbf62a36b2dbcf06f8922db5.tar.bz2 xen-636171218e1aba94fbf62a36b2dbcf06f8922db5.zip |
libxc: remove tests of alloca() return value
alloca() does not return NULL on an allocation failure on Linux so
remove the unneccessary tests from this Linux-specific code.
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Cc: Santosh Jodh <santosh.jodh@citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/libxc/xc_linux_osdep.c')
-rw-r--r-- | tools/libxc/xc_linux_osdep.c | 79 |
1 files changed, 34 insertions, 45 deletions
diff --git a/tools/libxc/xc_linux_osdep.c b/tools/libxc/xc_linux_osdep.c index 779fcd763d..896f5c1356 100644 --- a/tools/libxc/xc_linux_osdep.c +++ b/tools/libxc/xc_linux_osdep.c @@ -243,63 +243,54 @@ static void *linux_privcmd_map_foreign_bulk(xc_interface *xch, xc_osdep_handle h * IOCTL_PRIVCMD_MMAPBATCH_V2 is not supported - fall back to * IOCTL_PRIVCMD_MMAPBATCH. */ + privcmd_mmapbatch_t ioctlx; xen_pfn_t *pfn = alloca(num * sizeof(*pfn)); - if ( pfn ) - { - privcmd_mmapbatch_t ioctlx; - - memcpy(pfn, arr, num * sizeof(*arr)); + memcpy(pfn, arr, num * sizeof(*arr)); - ioctlx.num = num; - ioctlx.dom = dom; - ioctlx.addr = (unsigned long)addr; - ioctlx.arr = pfn; + ioctlx.num = num; + ioctlx.dom = dom; + ioctlx.addr = (unsigned long)addr; + ioctlx.arr = pfn; - rc = ioctl(fd, IOCTL_PRIVCMD_MMAPBATCH, &ioctlx); + rc = ioctl(fd, IOCTL_PRIVCMD_MMAPBATCH, &ioctlx); - rc = rc < 0 ? -errno : 0; + rc = rc < 0 ? -errno : 0; - for ( i = 0; i < num; ++i ) + for ( i = 0; i < num; ++i ) + { + switch ( pfn[i] ^ arr[i] ) { - switch ( pfn[i] ^ arr[i] ) + case 0: + err[i] = rc != -ENOENT ? rc : 0; + continue; + default: + err[i] = -EINVAL; + continue; + case XEN_DOMCTL_PFINFO_PAGEDTAB: + if ( rc != -ENOENT ) { - case 0: - err[i] = rc != -ENOENT ? rc : 0; + err[i] = rc ?: -EINVAL; continue; - default: - err[i] = -EINVAL; - continue; - case XEN_DOMCTL_PFINFO_PAGEDTAB: - if ( rc != -ENOENT ) - { - err[i] = rc ?: -EINVAL; - continue; - } - rc = xc_map_foreign_batch_single(fd, dom, pfn + i, + } + rc = xc_map_foreign_batch_single(fd, dom, pfn + i, (unsigned long)addr + ((unsigned long)i<<XC_PAGE_SHIFT)); - if ( rc < 0 ) - { - rc = -errno; - break; - } - rc = -ENOENT; - continue; + if ( rc < 0 ) + { + rc = -errno; + break; } - break; - } - - if ( rc == -ENOENT && i == num ) - rc = 0; - else if ( rc ) - { - errno = -rc; - rc = -1; + rc = -ENOENT; + continue; } + break; } - else + + if ( rc == -ENOENT && i == num ) + rc = 0; + else if ( rc ) { - errno = -ENOMEM; + errno = -rc; rc = -1; } } @@ -525,8 +516,6 @@ static void *linux_gnttab_grant_map(xc_gnttab *xch, xc_osdep_handle h, map = alloca(sizeof(*map) + (count - 1) * sizeof(struct ioctl_gntdev_map_grant_ref)); - if ( map == NULL ) - return NULL; for ( i = 0; i < count; i++ ) { |