- Handle KVM_CREATE_IRQCHIP, which does not take any parameter

  and returns 0 or -1.
- white space fixes around the KVM ioctls

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

diff --git a/NEWS b/NEWS
index 181849d99f3cd7ddea6e34fdd5d2198112449ff3..de02d2c6cbddc9703fd389100a3755eff115824e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -51,6 +51,7 @@ where XXXXXX is the bug number as listed below.
 330469  Add clock_adjtime syscall support
 330939  Support for AMD's syscall instruction on x86
 330941  Typo in PRE(poll) syscall wrapper
+n-i-bz  Fix KVM_CREATE_IRQCHIP ioctl handling
 
 Release 3.9.0 (31 October 2013)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index dc592390090286f5628c3bb2ba515449a642f151..9dadd843ae1362db967fff73f0438793ba6b89ff 100644 (file)
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -5528,9 +5528,10 @@ PRE(sys_ioctl)
       /* SCSI no operand */
    case VKI_SCSI_IOCTL_DOORLOCK:
    case VKI_SCSI_IOCTL_DOORUNLOCK:
-      
+
    /* KVM ioctls that dont check for a numeric value as parameter */
    case VKI_KVM_S390_ENABLE_SIE:
+   case VKI_KVM_CREATE_IRQCHIP:
    case VKI_KVM_S390_INITIAL_RESET:
 
    /* vhost without parameter */
@@ -6889,7 +6890,7 @@ PRE(sys_ioctl)
                        ir->num_rsp * sizeof(struct vki_inquiry_info));
       }
       break;
-      
+
    /* KVM ioctls that check for a numeric value as parameter */
    case VKI_KVM_GET_API_VERSION:
    case VKI_KVM_CREATE_VM:
@@ -7982,6 +7983,7 @@ POST(sys_ioctl)
    case VKI_KVM_GET_VCPU_MMAP_SIZE:
    case VKI_KVM_S390_ENABLE_SIE:
    case VKI_KVM_CREATE_VCPU:
+   case VKI_KVM_CREATE_IRQCHIP:
    case VKI_KVM_RUN:
    case VKI_KVM_S390_INITIAL_RESET:
       break;