From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Tue, 11 Feb 2014 15:15:31 +0000 (+0000)
Subject: - Handle KVM_CREATE_IRQCHIP, which does not take any parameter
X-Git-Tag: svn/VALGRIND_3_10_0~637
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b8f0be86d36d247768c820ec83da692372c2c3b;p=thirdparty%2Fvalgrind.git

- 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 181849d99f..de02d2c6cb 100644
--- 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 dc59239009..9dadd843ae 100644
--- 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;