Bug 348616 - Wine/valgrind: Warning: noted but unhandled ioctl 0x5390

with no size/direction hints. (DVD_READ_STRUCT)

Patch from Austin English (austinenglish@gmail.com).

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16153

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index 5e540e86a82f77cb1c0d18dbcae2970342458d1a..af10b92b604cb78560d17e7f25454c36b03366dc 100644 (file)
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -5674,7 +5674,10 @@ PRE(sys_ioctl)
    case VKI_CDROM_DISC_STATUS:
    case VKI_CDROMSTOP:
 
-   /* KVM ioctls that dont check for a numeric value as parameter */
+   /* DVD stuff */
+   case VKI_DVD_READ_STRUCT:
+
+   /* KVM ioctls that don't check for a numeric value as parameter */
    case VKI_KVM_S390_ENABLE_SIE:
    case VKI_KVM_CREATE_IRQCHIP:
    case VKI_KVM_S390_INITIAL_RESET:
@@ -9226,6 +9229,10 @@ POST(sys_ioctl)
    case VKI_CDROM_GET_CAPABILITY: /* 0x5331 */
       break;
 
+      /* DVD stuff */
+   case VKI_DVD_READ_STRUCT:
+      break;
+
    case VKI_FIGETBSZ:
       POST_MEM_WRITE(ARG3, sizeof(unsigned long));
       break;

diff --git a/include/vki/vki-linux.h b/include/vki/vki-linux.h
index 7f6a117eb5fabd03c7a5fd8a7bacb63a8c02549e..b64b52108aec7155deb98389d06a39c377e1d6f1 100644 (file)
--- a/include/vki/vki-linux.h
+++ b/include/vki/vki-linux.h
@@ -1885,6 +1885,7 @@ struct vki_scsi_idlun {
 #define VKI_CDROM_DISC_STATUS          0x5327  /* get CD type information */
 #define VKI_CDROM_GET_CAPABILITY       0x5331  /* get capabilities */
 
+#define VKI_DVD_READ_STRUCT            0x5390  /* read structure */
 #define VKI_CDROM_SEND_PACKET          0x5393  /* send a packet to the drive */
 
 struct vki_cdrom_msf0