file-posix: fix max_iov for /dev/sg devices

Git-commit: 8ad5ab6148dca8aad297c134c09c84b0b92d45ed
References: bsc#1190425

Even though it was only called for devices that have bs->sg set (which
must be character devices), sg_get_max_segments looked at /sys/dev/block
which only works for block devices.

On Linux the sg driver has its own way to provide the maximum number of
iovecs in a scatter/gather list, so add support for it.  The block device
path is kept because it will be reinstated in the next patches.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Lin Ma <lma@suse.com>

diff --git a/block/file-posix.c b/block/file-posix.c
index 1b805bd9381f2c8f057d6459fc62dfd98af54ad9..e3cf5a160a46030b4e07b7b6120347b9f2d759cb 100644 (file)
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -1088,6 +1088,17 @@ static int sg_get_max_segments(int fd)
         goto out;
     }
 
+    if (S_ISCHR(st.st_mode)) {
+        if (ioctl(fd, SG_GET_SG_TABLESIZE, &ret) == 0) {
+            return ret;
+        }
+        return -ENOTSUP;
+    }
+
+    if (!S_ISBLK(st.st_mode)) {
+        return -ENOTSUP;
+    }
+
     sysfspath = g_strdup_printf("/sys/dev/block/%u:%u/queue/max_segments",
                                 major(st.st_rdev), minor(st.st_rdev));
     sysfd = open(sysfspath, O_RDONLY);