3847094b7e
Update to v2.6.0, including enabling a few more recent features. Also include a number of recent security fixes. OBS-URL: https://build.opensuse.org/request/show/398983 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=294
75 lines
2.6 KiB
Diff
75 lines
2.6 KiB
Diff
From 4910a63b38b4b6cd811d59ccf239423f8f6998fc Mon Sep 17 00:00:00 2001
|
|
From: Alexander Graf <agraf@suse.de>
|
|
Date: Wed, 10 Oct 2012 10:21:20 +0200
|
|
Subject: [PATCH] linux-user: add more blk ioctls
|
|
|
|
Implement a few more ioctls that operate on block devices.
|
|
|
|
Signed-off-by: Alexander Graf <agraf@suse.de>
|
|
---
|
|
linux-user/ioctls.h | 18 ++++++++++++++++++
|
|
linux-user/syscall_defs.h | 6 ++++++
|
|
linux-user/syscall_types.h | 3 +++
|
|
3 files changed, 27 insertions(+)
|
|
|
|
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
|
|
index f9f7c83..8eb4446 100644
|
|
--- a/linux-user/ioctls.h
|
|
+++ b/linux-user/ioctls.h
|
|
@@ -73,6 +73,24 @@
|
|
#ifdef BLKGETSIZE64
|
|
IOCTL(BLKGETSIZE64, IOC_R, MK_PTR(TYPE_ULONGLONG))
|
|
#endif
|
|
+#ifdef BLKDISCARD
|
|
+ IOCTL(BLKDISCARD, IOC_W, MK_PTR(MK_STRUCT(STRUCT_blkdiscard)))
|
|
+#endif
|
|
+#ifdef BLKIOMIN
|
|
+ IOCTL(BLKIOMIN, IOC_R, MK_PTR(TYPE_INT))
|
|
+#endif
|
|
+#ifdef BLKIOOPT
|
|
+ IOCTL(BLKIOOPT, IOC_R, MK_PTR(TYPE_INT))
|
|
+#endif
|
|
+#ifdef BLKALIGNOFF
|
|
+ IOCTL(BLKALIGNOFF, IOC_R, MK_PTR(TYPE_INT))
|
|
+#endif
|
|
+#ifdef BLKPBSZGET
|
|
+ IOCTL(BLKPBSZGET, IOC_R, MK_PTR(TYPE_INT))
|
|
+#endif
|
|
+#ifdef BLKDISCARDZEROES
|
|
+ IOCTL(BLKDISCARDZEROES, IOC_R, MK_PTR(TYPE_INT))
|
|
+#endif
|
|
IOCTL(BLKFLSBUF, 0, TYPE_NULL)
|
|
IOCTL(BLKRASET, 0, TYPE_INT)
|
|
IOCTL(BLKRAGET, IOC_R, MK_PTR(TYPE_LONG))
|
|
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
|
|
index 77be181..787ba85 100644
|
|
--- a/linux-user/syscall_defs.h
|
|
+++ b/linux-user/syscall_defs.h
|
|
@@ -956,6 +956,12 @@ struct target_pollfd {
|
|
#define TARGET_BLKGETSIZE64 TARGET_IOR(0x12,114,abi_ulong)
|
|
/* return device size in bytes
|
|
(u64 *arg) */
|
|
+#define TARGET_BLKDISCARD TARGET_IO(0x12,119)
|
|
+#define TARGET_BLKIOMIN TARGET_IO(0x12,120)
|
|
+#define TARGET_BLKIOOPT TARGET_IO(0x12,121)
|
|
+#define TARGET_BLKALIGNOFF TARGET_IO(0x12,122)
|
|
+#define TARGET_BLKPBSZGET TARGET_IO(0x12,123)
|
|
+#define TARGET_BLKDISCARDZEROES TARGET_IO(0x12,124)
|
|
#define TARGET_FIBMAP TARGET_IO(0x00,1) /* bmap access */
|
|
#define TARGET_FIGETBSZ TARGET_IO(0x00,2) /* get the block size used for bmap */
|
|
#define TARGET_FS_IOC_FIEMAP TARGET_IOWR('f',11,struct fiemap)
|
|
diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h
|
|
index e5331b4..a730c87 100644
|
|
--- a/linux-user/syscall_types.h
|
|
+++ b/linux-user/syscall_types.h
|
|
@@ -71,6 +71,9 @@ STRUCT(kbentry,
|
|
STRUCT(kbsentry,
|
|
TYPE_CHAR, MK_ARRAY(TYPE_CHAR, 512))
|
|
|
|
+STRUCT(blkdiscard,
|
|
+ MK_ARRAY(TYPE_LONGLONG, 2))
|
|
+
|
|
STRUCT(audio_buf_info,
|
|
TYPE_INT, TYPE_INT, TYPE_INT, TYPE_INT)
|
|
|