From patchwork Fri Apr 1 11:16:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 8723051 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 643209F7C9 for ; Fri, 1 Apr 2016 11:22:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8A94620379 for ; Fri, 1 Apr 2016 11:22:38 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D1B8920398 for ; Fri, 1 Apr 2016 11:22:37 +0000 (UTC) Received: from localhost ([::1]:43554 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alx9x-0006jr-65 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 01 Apr 2016 07:22:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alx4Y-0005o9-Eu for qemu-devel@nongnu.org; Fri, 01 Apr 2016 07:17:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alx4X-0001oK-F0 for qemu-devel@nongnu.org; Fri, 01 Apr 2016 07:17:02 -0400 Received: from mail-qg0-x236.google.com ([2607:f8b0:400d:c04::236]:35189) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alx4X-0001o3-Ah for qemu-devel@nongnu.org; Fri, 01 Apr 2016 07:17:01 -0400 Received: by mail-qg0-x236.google.com with SMTP id y89so93621136qge.2 for ; Fri, 01 Apr 2016 04:17:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tbioRRZu6IVEWqu6yQpFxNjEo2MtWCP3NUPzrvEscu4=; b=LcoqbqnWMm7+bzaN8IPmL32lDc0b2WnDgzwA30f2QVdzhdejjaS3RBdEoFtUNlssZi ezmmk4nFeNzWp1DRLjAeWUzClZdg1zp9+O0EZFRBSZg33pXcyC0mg5u0OeYYQXXeFICl tm/nAi6c3AP1bezWEgeLe0SGMNNxZFQh8gmHZTIzVaqPGNJiomQkbWlLL/H/XG8Fv/M3 q2cdWg6BfKy37ZPgWnYewRHIkaYxi9goozHowoOOtwKGEdoW6iqnScmZJGxPClMhmARb hHLBztwbDjqWY37Q6iBn57h5xDpE6wP0/+MM+lXGE8HQl+Llfl6bWcX7di+6dSeRa0Ud Gdng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=tbioRRZu6IVEWqu6yQpFxNjEo2MtWCP3NUPzrvEscu4=; b=SwXL1vmUzzU3cFuMYTgAs0VP+dAc3dkL47k/g2ggVjnCdetq5dAjLhTfVaWWIxeUWQ KWtAmGICt5r6nYEHbU47DxKFsJ932pv4dDblY/YOt/BV5FXVyI4fvdpfMhhQiEEqPsJw TTCceEltIvepQT2EpSW0EUmC+igX0heZhHtG6+00/roK7Z2b+d0PRAGJ5tG+/9rCH8Q8 0EepPJjHOgfwZpHo4DygLFqXyL9EKbLYVIocRmllYzwPlTUi1ZAUV+McRlfu0yfqzg9V fzrQN/5ntsj2ExHePhNwCJ3GQhi9x7+w6YzmVn0An27wXiiT+eclzOyXXWawlcaEonRz 1yaw== X-Gm-Message-State: AD7BkJIaWl9Jxi2IhjqoKzRW4ZikisbpqpTLr2AEXthhWqjEvA6trr28w/3thjXhUO5jKg== X-Received: by 10.140.32.100 with SMTP id g91mr24055384qgg.47.1459509421032; Fri, 01 Apr 2016 04:17:01 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by smtp.gmail.com with ESMTPSA id c62sm5878278qge.24.2016.04.01.04.16.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Apr 2016 04:17:00 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Fri, 1 Apr 2016 13:16:21 +0200 Message-Id: <1459509388-6185-12-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1459509388-6185-1-git-send-email-marcandre.lureau@redhat.com> References: <1459509388-6185-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c04::236 Cc: Yuanhan Liu , "Michael S. Tsirkin" , Ilya Maximets , jonshin@cisco.com, Tetsuya Mukawa , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [Qemu-devel] [PATCH 11/18] vhost-user: add shutdown support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- docs/specs/vhost-user.txt | 15 +++++++++++++++ hw/virtio/vhost-user.c | 16 ++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/docs/specs/vhost-user.txt b/docs/specs/vhost-user.txt index 8a635fa..60d6d13 100644 --- a/docs/specs/vhost-user.txt +++ b/docs/specs/vhost-user.txt @@ -487,3 +487,18 @@ Message types request to the master. It is passed in the ancillary data. This message is only sent if VHOST_USER_PROTOCOL_F_SLAVE_CHANNEL feature is available. + +Slave message types +------------------- + + * VHOST_USER_SLAVE_SHUTDOWN: + Id: 1 + Master payload: N/A + Slave payload: u64 + + Request the master to shutdown the slave. A 0 reply is for + success, in which case the slave may close all connections + immediately and quit. A non-zero reply cancels the request. + + Before a reply comes, the master may make other requests in + order to flush or sync state. diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 890c1bd..f91baee 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -67,6 +67,8 @@ typedef enum VhostUserRequest { typedef enum VhostUserSlaveRequest { VHOST_USER_SLAVE_NONE = 0, + VHOST_USER_SLAVE_SHUTDOWN = 1, + VHOST_USER_SLAVE_MAX } VhostUserSlaveRequest; @@ -539,6 +541,20 @@ static void slave_read(void *opaque) } switch (msg.request) { + case VHOST_USER_SLAVE_SHUTDOWN: { + uint64_t success = 1; /* 0 is for success */ + if (dev->stop) { + dev->stop(dev); + success = 0; + } + msg.payload.u64 = success; + msg.size = sizeof(msg.payload.u64); + size = send(u->slave_fd, &msg, VHOST_USER_HDR_SIZE + msg.size, 0); + if (size != VHOST_USER_HDR_SIZE + msg.size) { + error_report("Failed to write reply."); + } + break; + } default: error_report("Received unexpected msg type."); }