From owner-svn-src-user@FreeBSD.ORG Mon Feb 16 17:08:38 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D38771065674; Mon, 16 Feb 2009 17:08:38 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C05788FC20; Mon, 16 Feb 2009 17:08:38 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1GH8ccG070716; Mon, 16 Feb 2009 17:08:38 GMT (envelope-from dfr@svn.freebsd.org) Received: (from dfr@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1GH8cL5070714; Mon, 16 Feb 2009 17:08:38 GMT (envelope-from dfr@svn.freebsd.org) Message-Id: <200902161708.n1GH8cL5070714@svn.freebsd.org> From: Doug Rabson Date: Mon, 16 Feb 2009 17:08:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188681 - user/dfr/xenhvm/7/sys/xen/xenbus X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2009 17:08:39 -0000 Author: dfr Date: Mon Feb 16 17:08:38 2009 New Revision: 188681 URL: http://svn.freebsd.org/changeset/base/188681 Log: Diff reduction with user/dfr/xenhvm/6. Modified: user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_if.m (contents, props changed) user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_xs.c user/dfr/xenhvm/7/sys/xen/xenbus/xenbusvar.h Modified: user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_if.m ============================================================================== --- user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_if.m Mon Feb 16 16:48:49 2009 (r188680) +++ user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_if.m Mon Feb 16 17:08:38 2009 (r188681) @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: user/dfr/xenhvm/6/sys/kern/device_if.m 139804 2005-01-06 23:35:40Z imp $ +# $FreeBSD$ # #include Modified: user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_xs.c ============================================================================== --- user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_xs.c Mon Feb 16 16:48:49 2009 (r188680) +++ user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_xs.c Mon Feb 16 17:08:38 2009 (r188681) @@ -142,21 +142,17 @@ xs_read_reply(enum xsd_sockmsg_type *typ mtx_lock(&xs_state.reply_lock); while (TAILQ_EMPTY(&xs_state.reply_list)) { - while (TAILQ_EMPTY(&xs_state.reply_list)) { - error = mtx_sleep(&xs_state.reply_waitq, - &xs_state.reply_lock, - PCATCH, "xswait", hz/10); - if (error && error != EWOULDBLOCK) { - mtx_unlock(&xs_state.reply_lock); - return (error); - } - + while (TAILQ_EMPTY(&xs_state.reply_list)) { + error = mtx_sleep(&xs_state.reply_waitq, + &xs_state.reply_lock, + PCATCH, "xswait", hz/10); + if (error && error != EWOULDBLOCK) { + mtx_unlock(&xs_state.reply_lock); + return (error); } - - } + } - msg = TAILQ_FIRST(&xs_state.reply_list); TAILQ_REMOVE(&xs_state.reply_list, msg, list); @@ -202,7 +198,8 @@ xenbus_dev_request_and_reply(struct xsd_ sx_xlock(&xs_state.request_mutex); - error = xb_write(msg, sizeof(*msg) + msg->len, &xs_state.request_mutex.lock_object); + error = xb_write(msg, sizeof(*msg) + msg->len, + &xs_state.request_mutex.lock_object); if (error) { msg->type = XS_ERROR; } else { @@ -243,7 +240,8 @@ xs_talkv(struct xenbus_transaction t, en sx_xlock(&xs_state.request_mutex); - error = xb_write(&msg, sizeof(msg), &xs_state.request_mutex.lock_object); + error = xb_write(&msg, sizeof(msg), + &xs_state.request_mutex.lock_object); if (error) { sx_xunlock(&xs_state.request_mutex); printf("xs_talkv failed %d\n", error); @@ -251,7 +249,8 @@ xs_talkv(struct xenbus_transaction t, en } for (i = 0; i < num_vecs; i++) { - error = xb_write(iovec[i].iov_base, iovec[i].iov_len, &xs_state.request_mutex.lock_object); + error = xb_write(iovec[i].iov_base, iovec[i].iov_len, + &xs_state.request_mutex.lock_object); if (error) { sx_xunlock(&xs_state.request_mutex); printf("xs_talkv failed %d\n", error); @@ -791,7 +790,8 @@ xs_process_msg(enum xsd_sockmsg_type *ty msg = malloc(sizeof(*msg), M_DEVBUF, M_WAITOK); mtx_lock(&xs_state.reply_lock); - error = xb_read(&msg->hdr, sizeof(msg->hdr), &xs_state.reply_lock.lock_object); + error = xb_read(&msg->hdr, sizeof(msg->hdr), + &xs_state.reply_lock.mtx_object); mtx_unlock(&xs_state.reply_lock); if (error) { free(msg, M_DEVBUF); @@ -800,7 +800,8 @@ xs_process_msg(enum xsd_sockmsg_type *ty body = malloc(msg->hdr.len + 1, M_DEVBUF, M_WAITOK); mtx_lock(&xs_state.reply_lock); - error = xb_read(body, msg->hdr.len, &xs_state.reply_lock.lock_object); + error = xb_read(body, msg->hdr.len, + &xs_state.reply_lock.mtx_object); mtx_unlock(&xs_state.reply_lock); if (error) { free(body, M_DEVBUF); Modified: user/dfr/xenhvm/7/sys/xen/xenbus/xenbusvar.h ============================================================================== --- user/dfr/xenhvm/7/sys/xen/xenbus/xenbusvar.h Mon Feb 16 16:48:49 2009 (r188680) +++ user/dfr/xenhvm/7/sys/xen/xenbus/xenbusvar.h Mon Feb 16 17:08:38 2009 (r188681) @@ -26,6 +26,8 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. + * + * $FreeBSD$ */ #ifndef _XEN_XENBUS_XENBUSVAR_H