1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
Index: qemu/block.c
@@ -21,6 +21,17 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+
+#include "config-host.h"
+
+#ifdef _BSD
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/queue.h>
+#include <sys/disk.h>
+#endif
+
#include "vl.h"
#include "block_int.h"
@@ -103,14 +103,25 @@
{
int fd, ret, score, score_max;
BlockDriver *drv1, *drv;
- uint8_t buf[1024];
+ uint8_t *buf;
+ size_t bufsize = 1024;
+ u_int sectorsize = 512;
fd = open(filename, O_RDONLY | O_BINARY | O_LARGEFILE);
if (fd < 0)
return NULL;
- ret = read(fd, buf, sizeof(buf));
+#ifdef DIOCGSECTORSIZE
+ if (!ioctl(fd, DIOCGSECTORSIZE, §orsize) &&
+ sectorsize > bufsize)
+ bufsize = sectorsize;
+#endif
+ buf = malloc(bufsize);
+ if (!buf)
+ return NULL;
+ ret = read(fd, buf, bufsize);
if (ret < 0) {
close(fd);
+ free(buf);
return NULL;
}
close(fd);
@@ -124,6 +135,7 @@
drv = drv1;
}
}
+ free(buf);
return drv;
}
@@ -522,6 +533,15 @@
return -1;
bs->read_only = 1;
}
+#ifdef _BSD
+ struct stat sb;
+ if (!fstat(fd,&sb) && (S_IFCHR & sb.st_mode)) {
+#ifdef DIOCGMEDIASIZE
+ if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size))
+#endif
+ size = lseek(fd, 0LL, SEEK_END);
+ } else
+#endif
size = lseek(fd, 0, SEEK_END);
bs->total_sectors = size / 512;
s->fd = fd;
|
