OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

linux-user pull request 20211129

Browse Source 
Fix losetup
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAmGk3e4SHGxhdXJlbnRA
 dml2aWVyLmV1AAoJEPMMOL0/L748U9UP/A1tTpk0wT/xQyRMuo9mk1WJy17dx+zw
 2jq5FnQeTTgkkRx+McwUHpu5TIJgsvHexhoQRpDMeDACrc8JltXc1SqaLft/VRKy
 KjcsPIqxVremAWHm5YYzN6tmnZGy+kBXIa3e7ch69s+TBE4qDJHqYVvrHB1fnAuL
 vGrLJ6TiIkKOYyTxitHEHF91gurvYIAK6SxOpxcRLPtNfSlyZpmns1fPrxVGvypv
 I0yv+4m/Gru00djBbE31xuPdN76H5oDA1iNAADrRM80P19bLB38utWqLLT4L1gp8
 MXexHnGmq3JnVjNOPfzGA/3HV+zWoLj8vk1BU5ALNil7X8EViiTxs4ibo90UgyUk
 DMb4qHWUZ9O5+VE6kZRXViUC9nboTfPAH5LLZbbeN4VYF16m4nPExBF7WMX8QyqC
 PFM4ZMLaodjaCfbMr1galMuxALXCD+fvjSxcmYWMAD/8VMA/YHvvdxVZLqriscTA
 N0+laOOtCol0zCN+GD4xoKREZ+3qYcKbxBU1BiJj1si30T+iV6ky855QMaK39RPs
 UKWz9xR/rQpzOQYTn6FPXXG8a2Gv02oEkJfwb7wP25hjSza+wizZIAD/ejMK+hhI
 RGrMBVmPm+PqPOEOKtB4yPZJrdOyv98OPodlSNk45dgXRVHsuEjmOsxM9C1nlFAe
 MRgdt6PSIyRY
 =S5Ai
 -----END PGP SIGNATURE-----

Merge tag 'linux-user-for-6.2-pull-request' of git://github.com/vivier/qemu into staging

linux-user pull request 20211129

Fix losetup

# gpg: Signature made Mon 29 Nov 2021 03:04:30 PM CET
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]

* tag 'linux-user-for-6.2-pull-request' of git://github.com/vivier/qemu:
  linux-user: implement more loop ioctls

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-11-29 17:46:00 +01:00
commit 095c7737fb
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux-user/ioctls.h
View File

@ -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)

2
linux-user/linux_loop.h
View File

@ -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

4
linux-user/syscall_defs.h
View File

@ -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

6
linux-user/syscall_types.h
View File

@ -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,