From owner-svn-src-head@freebsd.org  Sat Nov 12 01:41:44 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A87F5C3AF1D;
 Sat, 12 Nov 2016 01:41:44 +0000 (UTC)
 (envelope-from jceel@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 75A5E1DE6;
 Sat, 12 Nov 2016 01:41:44 +0000 (UTC)
 (envelope-from jceel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAC1fh8L049370;
 Sat, 12 Nov 2016 01:41:43 GMT (envelope-from jceel@FreeBSD.org)
Received: (from jceel@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAC1fh2J049369;
 Sat, 12 Nov 2016 01:41:43 GMT (envelope-from jceel@FreeBSD.org)
Message-Id: <201611120141.uAC1fh2J049369@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jceel set sender to
 jceel@FreeBSD.org using -f
From: Jakub Wojciech Klama <jceel@FreeBSD.org>
Date: Sat, 12 Nov 2016 01:41:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r308566 - head/sys/dev/virtio/console
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Nov 2016 01:41:44 -0000

Author: jceel
Date: Sat Nov 12 01:41:43 2016
New Revision: 308566
URL: https://svnweb.freebsd.org/changeset/base/308566

Log:
  Reserve space for control message payload (currently a port name).
  
  Approved by:	trasz (mentor)
  Sponsored by:	iXsystems, Inc.

Modified:
  head/sys/dev/virtio/console/virtio_console.c

Modified: head/sys/dev/virtio/console/virtio_console.c
==============================================================================
--- head/sys/dev/virtio/console/virtio_console.c	Sat Nov 12 00:23:09 2016	(r308565)
+++ head/sys/dev/virtio/console/virtio_console.c	Sat Nov 12 01:41:43 2016	(r308566)
@@ -600,7 +600,7 @@ vtcon_ctrl_event_enqueue(struct vtcon_so
 
 	sglist_init(&sg, 2, segs);
 	error = sglist_append(&sg, control,
-	    sizeof(struct virtio_console_control));
+	    sizeof(struct virtio_console_control) + VTCON_BULK_BUFSZ);
 	KASSERT(error == 0, ("%s: error %d adding control to sglist",
 	    __func__, error));
 
@@ -633,7 +633,8 @@ vtcon_ctrl_event_requeue(struct vtcon_so
 {
 	int error;
 
-	bzero(control, sizeof(struct virtio_console_control));
+	bzero(control, sizeof(struct virtio_console_control) +
+	    VTCON_BULK_BUFSZ);
 
 	error = vtcon_ctrl_event_enqueue(sc, control);
 	KASSERT(error == 0,