On 10/24/19 6:07 PM, Ahmad Fatoum wrote:
On 10/24/19 6:02 PM, Robert Karszniewicz wrote:
This makes it possible to mount block devices from the host machine,
which have been passed as arguments to --image
Signed-off-by: Robert Karszniewicz <r.karszniewicz@xxxxxxxxx>
---
arch/sandbox/os/common.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c
index 86118822a..805ac8eef 100644
--- a/arch/sandbox/os/common.c
+++ b/arch/sandbox/os/common.c
@@ -39,6 +39,8 @@
#include <signal.h>
#include <sys/select.h>
#include <sys/wait.h>
+#include <sys/ioctl.h>
+#include <linux/fs.h>
/*
* ...except the ones needed to connect with barebox
*/
@@ -260,6 +262,12 @@ static int add_image(char *str, char *devname_template, int *devname_number)
hf->size = s.st_size;
hf->devname = strdup(devname);
+ if (S_ISBLK(s.st_mode)) {
+ if (-1 == ioctl(fd, BLKGETSIZE64, &hf->size)) {
This looks out of place for barebox, the -1 should be on the right side.
Oh, right, sorry! I have a habit to put trivial- and constant-sized
symbols to the left, to not hide them behind those long function calls, etc.
+ perror("ioctl");
+ goto err_out;
+ }
+ }
hf->base = (unsigned long)mmap(NULL, hf->size,
PROT_READ | (readonly ? 0 : PROT_WRITE),
MAP_SHARED, fd, 0);
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
