From nobody Sun May 5 00:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496331541109164.75610956873993; Thu, 1 Jun 2017 08:39:01 -0700 (PDT) Received: from localhost ([::1]:45271 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGS4g-00064l-Ny for importer@patchew.org; Thu, 01 Jun 2017 11:31:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGRRu-0006Sx-76 for qemu-devel@nongnu.org; Thu, 01 Jun 2017 10:51:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dGRRr-0003Qy-23 for qemu-devel@nongnu.org; Thu, 01 Jun 2017 10:51:42 -0400 Received: from m15-111.126.com ([220.181.15.111]:52512) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGRRq-0003PB-C2 for qemu-devel@nongnu.org; Thu, 01 Jun 2017 10:51:38 -0400 Received: from .. (unknown [117.139.248.101]) by smtp1 (Coremail) with SMTP id C8mowACH5SzwKTBZfxyUHQ--.24997S3; Thu, 01 Jun 2017 22:51:30 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=6f/fUBlM1whXihhM10 U7CpnZzbXUFUVNsb+mOmZ8vbE=; b=WmPlwKQYhz4QWs75acGwoF/WcgxPLVfVpH Wrn7z5piPa+qElzcFLvUELys9ZNT2/qKh2wRmu+x3d83vnj8p8KsAMJnPzYEmrRI Vz68XkJKmMmWd28v3dIfZ7qkyUYGydiQk3NTp6hEdDbwR5Uk4Gv3/Wl2kSV4pebB OSqaGG/k8= From: indiffPig@126.com To: mst@redhat.com Date: Thu, 1 Jun 2017 10:51:27 -0400 Message-Id: <1496328687-13121-1-git-send-email-indiffPig@126.com> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: C8mowACH5SzwKTBZfxyUHQ--.24997S3 X-Coremail-Antispam: 1Uf129KBjvdXoWrtryrKF4DJr4rAF1kZryrJFb_yoW3WrXEya 15AFyxWFyUJF4j93y5Cw4SqF13Kay7uan7uFZavry8Zr1UKr1fCwnY9rs2qF9xZrW5CrZ8 Zrs5XrZFqrya9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU0ceOJUUUUU== X-Originating-IP: [117.139.248.101] X-CM-SenderInfo: plqgxwpislwqqrswhudrp/1tbinxTpf1UJWtQWSwAAsS X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.15.111 X-Mailman-Approved-At: Thu, 01 Jun 2017 11:18:29 -0400 Subject: [Qemu-devel] [PATCH] vhost_dev:qemu will quit when vhost_dev is null X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, "yin.zuowei" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "yin.zuowei" Signed-off-by: yin.zuowei when ovdk socket is not ok, this vhost_dev is null ,then qemu will be quit. We think ovdk is just a network devices, should not cause an exit . --- hw/virtio/vhost-user.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index dde094a..3a9fdf4 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -387,6 +387,9 @@ static int vhost_user_set_vring_base(struct vhost_dev *= dev, static int vhost_user_set_vring_enable(struct vhost_dev *dev, int enable) { int i; + if (!dev) { + return -1; + } =20 if (!virtio_has_feature(dev->features, VHOST_USER_F_PROTOCOL_FEATURES)= ) { return -1; --=20 1.8.3.1