From owner-svn-src-all@FreeBSD.ORG Sat Sep 21 00:27:54 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3B11D680; Sat, 21 Sep 2013 00:27:54 +0000 (UTC) (envelope-from grehan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0E4092BF4; Sat, 21 Sep 2013 00:27:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8L0Rr5S009599; Sat, 21 Sep 2013 00:27:53 GMT (envelope-from grehan@svn.freebsd.org) Received: (from grehan@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8L0RrZN009598; Sat, 21 Sep 2013 00:27:53 GMT (envelope-from grehan@svn.freebsd.org) Message-Id: <201309210027.r8L0RrZN009598@svn.freebsd.org> From: Peter Grehan Date: Sat, 21 Sep 2013 00:27:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255751 - head/sys/amd64/include X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Sep 2013 00:27:54 -0000 Author: grehan Date: Sat Sep 21 00:27:53 2013 New Revision: 255751 URL: http://svnweb.freebsd.org/changeset/base/255751 Log: Reorder/regroup the vmm ioctl api definitions to allow some semblance of API stability and growth during the 10.* timeframe. Userland/kernel bhyve will have to be recompiled after this. Reviewed by: neel Approved by: re@ (blanket) Modified: head/sys/amd64/include/vmm_dev.h Modified: head/sys/amd64/include/vmm_dev.h ============================================================================== --- head/sys/amd64/include/vmm_dev.h Sat Sep 21 00:17:26 2013 (r255750) +++ head/sys/amd64/include/vmm_dev.h Sat Sep 21 00:27:53 2013 (r255751) @@ -136,27 +136,41 @@ struct vm_x2apic { }; enum { - IOCNUM_RUN, - IOCNUM_MAP_MEMORY, - IOCNUM_GET_MEMORY_SEG, - IOCNUM_SET_REGISTER, - IOCNUM_GET_REGISTER, - IOCNUM_SET_SEGMENT_DESCRIPTOR, - IOCNUM_GET_SEGMENT_DESCRIPTOR, - IOCNUM_INJECT_EVENT, - IOCNUM_LAPIC_IRQ, - IOCNUM_SET_CAPABILITY, - IOCNUM_GET_CAPABILITY, - IOCNUM_BIND_PPTDEV, - IOCNUM_UNBIND_PPTDEV, - IOCNUM_MAP_PPTDEV_MMIO, - IOCNUM_PPTDEV_MSI, - IOCNUM_PPTDEV_MSIX, - IOCNUM_INJECT_NMI, - IOCNUM_VM_STATS, - IOCNUM_VM_STAT_DESC, - IOCNUM_SET_X2APIC_STATE, - IOCNUM_GET_X2APIC_STATE, + /* general routines */ + IOCNUM_ABIVERS = 0, + IOCNUM_RUN = 1, + IOCNUM_SET_CAPABILITY = 2, + IOCNUM_GET_CAPABILITY = 3, + + /* memory apis */ + IOCNUM_MAP_MEMORY = 10, + IOCNUM_GET_MEMORY_SEG = 11, + + /* register/state accessors */ + IOCNUM_SET_REGISTER = 20, + IOCNUM_GET_REGISTER = 21, + IOCNUM_SET_SEGMENT_DESCRIPTOR = 22, + IOCNUM_GET_SEGMENT_DESCRIPTOR = 23, + + /* interrupt injection */ + IOCNUM_INJECT_EVENT = 30, + IOCNUM_LAPIC_IRQ = 31, + IOCNUM_INJECT_NMI = 32, + + /* PCI pass-thru */ + IOCNUM_BIND_PPTDEV = 40, + IOCNUM_UNBIND_PPTDEV = 41, + IOCNUM_MAP_PPTDEV_MMIO = 42, + IOCNUM_PPTDEV_MSI = 43, + IOCNUM_PPTDEV_MSIX = 44, + + /* statistics */ + IOCNUM_VM_STATS = 50, + IOCNUM_VM_STAT_DESC = 51, + + /* kernel device state */ + IOCNUM_SET_X2APIC_STATE = 60, + IOCNUM_GET_X2APIC_STATE = 61, }; #define VM_RUN \