* [PULL 0/1] Linux user for 6.2 patches
@ 2021-11-29 14:04 Laurent Vivier
2021-11-29 14:04 ` [PULL 1/1] linux-user: implement more loop ioctls Laurent Vivier
2021-11-29 17:57 ` [PULL 0/1] Linux user for 6.2 patches Richard Henderson
0 siblings, 2 replies; 3+ messages in thread
From: Laurent Vivier @ 2021-11-29 14:04 UTC (permalink / raw)
To: qemu-devel; +Cc: Laurent Vivier
The following changes since commit e750c10167fa8ad3fcc98236a474c46e52e7c18c:
Merge tag 'pull-target-arm-20211129' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2021-11-29 11:56:07 +0100)
are available in the Git repository at:
git://github.com/vivier/qemu.git tags/linux-user-for-6.2-pull-request
for you to fetch changes up to 0a761ce30338526213f74dfe9900b9213d4bbb0b:
linux-user: implement more loop ioctls (2021-11-29 14:54:17 +0100)
----------------------------------------------------------------
linux-user pull request 20211129
Fix losetup
----------------------------------------------------------------
Andreas Schwab (1):
linux-user: implement more loop ioctls
linux-user/ioctls.h | 4 ++++
linux-user/linux_loop.h | 2 ++
linux-user/syscall_defs.h | 4 ++++
linux-user/syscall_types.h | 6 ++++++
4 files changed, 16 insertions(+)
--
2.31.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PULL 1/1] linux-user: implement more loop ioctls
2021-11-29 14:04 [PULL 0/1] Linux user for 6.2 patches Laurent Vivier
@ 2021-11-29 14:04 ` Laurent Vivier
2021-11-29 17:57 ` [PULL 0/1] Linux user for 6.2 patches Richard Henderson
1 sibling, 0 replies; 3+ messages in thread
From: Laurent Vivier @ 2021-11-29 14:04 UTC (permalink / raw)
To: qemu-devel; +Cc: Andreas Schwab, Laurent Vivier
From: Andreas Schwab <schwab@suse.de>
LOOP_CONFIGURE is now used by losetup, and it cannot cope with ENOSYS.
Signed-off-by: Andreas Schwab <schwab@suse.de>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <mvmtug4mbfx.fsf_-_@suse.de>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/ioctls.h | 4 ++++
linux-user/linux_loop.h | 2 ++
linux-user/syscall_defs.h | 4 ++++
linux-user/syscall_types.h | 6 ++++++
4 files changed, 16 insertions(+)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index 7193c3b2269a..f182d40190ed 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
@@ -637,6 +637,10 @@
IOCTL(LOOP_SET_STATUS64, IOC_W, MK_PTR(MK_STRUCT(STRUCT_loop_info64)))
IOCTL(LOOP_GET_STATUS64, IOC_R, MK_PTR(MK_STRUCT(STRUCT_loop_info64)))
IOCTL(LOOP_CHANGE_FD, 0, TYPE_INT)
+ IOCTL(LOOP_SET_CAPACITY, 0, TYPE_INT)
+ IOCTL(LOOP_SET_DIRECT_IO, 0, TYPE_INT)
+ IOCTL(LOOP_SET_BLOCK_SIZE, 0, TYPE_INT)
+ IOCTL(LOOP_CONFIGURE, IOC_W, MK_PTR(MK_STRUCT(STRUCT_loop_config)))
IOCTL(LOOP_CTL_ADD, 0, TYPE_INT)
IOCTL(LOOP_CTL_REMOVE, 0, TYPE_INT)
diff --git a/linux-user/linux_loop.h b/linux-user/linux_loop.h
index c69fea11e4e1..f80b96f1ff92 100644
--- a/linux-user/linux_loop.h
+++ b/linux-user/linux_loop.h
@@ -96,6 +96,8 @@ struct loop_info64 {
#define LOOP_CHANGE_FD 0x4C06
#define LOOP_SET_CAPACITY 0x4C07
#define LOOP_SET_DIRECT_IO 0x4C08
+#define LOOP_SET_BLOCK_SIZE 0x4C09
+#define LOOP_CONFIGURE 0x4C0A
/* /dev/loop-control interface */
#define LOOP_CTL_ADD 0x4C80
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 41aaafbac12c..0b139759377b 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -1219,6 +1219,10 @@ struct target_rtc_pll_info {
#define TARGET_LOOP_SET_STATUS64 0x4C04
#define TARGET_LOOP_GET_STATUS64 0x4C05
#define TARGET_LOOP_CHANGE_FD 0x4C06
+#define TARGET_LOOP_SET_CAPACITY 0x4C07
+#define TARGET_LOOP_SET_DIRECT_IO 0x4C08
+#define TARGET_LOOP_SET_BLOCK_SIZE 0x4C09
+#define TARGET_LOOP_CONFIGURE 0x4C0A
#define TARGET_LOOP_CTL_ADD 0x4C80
#define TARGET_LOOP_CTL_REMOVE 0x4C81
diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h
index ba2c1518eb5c..c3b43f80223a 100644
--- a/linux-user/syscall_types.h
+++ b/linux-user/syscall_types.h
@@ -201,6 +201,12 @@ STRUCT(loop_info64,
MK_ARRAY(TYPE_CHAR, 32), /* lo_encrypt_key */
MK_ARRAY(TYPE_ULONGLONG, 2)) /* lo_init */
+STRUCT(loop_config,
+ TYPE_INT, /* fd */
+ TYPE_INT, /* block_size */
+ MK_STRUCT(STRUCT_loop_info64), /* info */
+ MK_ARRAY(TYPE_ULONGLONG, 8)) /* __reserved */
+
/* mag tape ioctls */
STRUCT(mtop, TYPE_SHORT, TYPE_INT)
STRUCT(mtget, TYPE_LONG, TYPE_LONG, TYPE_LONG, TYPE_LONG, TYPE_LONG,
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PULL 0/1] Linux user for 6.2 patches
2021-11-29 14:04 [PULL 0/1] Linux user for 6.2 patches Laurent Vivier
2021-11-29 14:04 ` [PULL 1/1] linux-user: implement more loop ioctls Laurent Vivier
@ 2021-11-29 17:57 ` Richard Henderson
1 sibling, 0 replies; 3+ messages in thread
From: Richard Henderson @ 2021-11-29 17:57 UTC (permalink / raw)
To: Laurent Vivier, qemu-devel
On 11/29/21 3:04 PM, Laurent Vivier wrote:
> The following changes since commit e750c10167fa8ad3fcc98236a474c46e52e7c18c:
>
> Merge tag 'pull-target-arm-20211129' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2021-11-29 11:56:07 +0100)
>
> are available in the Git repository at:
>
> git://github.com/vivier/qemu.git tags/linux-user-for-6.2-pull-request
>
> for you to fetch changes up to 0a761ce30338526213f74dfe9900b9213d4bbb0b:
>
> linux-user: implement more loop ioctls (2021-11-29 14:54:17 +0100)
>
> ----------------------------------------------------------------
> linux-user pull request 20211129
>
> Fix losetup
>
> ----------------------------------------------------------------
>
> Andreas Schwab (1):
> linux-user: implement more loop ioctls
>
> linux-user/ioctls.h | 4 ++++
> linux-user/linux_loop.h | 2 ++
> linux-user/syscall_defs.h | 4 ++++
> linux-user/syscall_types.h | 6 ++++++
> 4 files changed, 16 insertions(+)
Applied, thanks.
r~
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-11-29 18:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-29 14:04 [PULL 0/1] Linux user for 6.2 patches Laurent Vivier
2021-11-29 14:04 ` [PULL 1/1] linux-user: implement more loop ioctls Laurent Vivier
2021-11-29 17:57 ` [PULL 0/1] Linux user for 6.2 patches Richard Henderson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.