From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB01BC48BD8 for ; Wed, 26 Jun 2019 10:28:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 992BC20B7C for ; Wed, 26 Jun 2019 10:28:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 992BC20B7C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hg5A3-0007Kp-Nw for qemu-devel@archiver.kernel.org; Wed, 26 Jun 2019 06:28:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48033) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hg50K-0007Xf-Os for qemu-devel@nongnu.org; Wed, 26 Jun 2019 06:18:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hg50J-0001Do-7C for qemu-devel@nongnu.org; Wed, 26 Jun 2019 06:18:16 -0400 Received: from 9.mo173.mail-out.ovh.net ([46.105.72.44]:47688) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hg50I-0000wR-UP for qemu-devel@nongnu.org; Wed, 26 Jun 2019 06:18:15 -0400 Received: from player157.ha.ovh.net (unknown [10.109.143.225]) by mo173.mail-out.ovh.net (Postfix) with ESMTP id C188B10C2E1 for ; Wed, 26 Jun 2019 12:18:04 +0200 (CEST) Received: from kaod.org (lns-bzn-46-82-253-208-248.adsl.proxad.net [82.253.208.248]) (Authenticated sender: groug@kaod.org) by player157.ha.ovh.net (Postfix) with ESMTPSA id 13D637331202; Wed, 26 Jun 2019 10:17:56 +0000 (UTC) Date: Wed, 26 Jun 2019 12:17:54 +0200 From: Greg Kurz To: elohimes@gmail.com Message-ID: <20190626121754.57a32df8@bahia.lan> In-Reply-To: <20190626023130.31315-2-xieyongji@baidu.com> References: <20190626023130.31315-1-xieyongji@baidu.com> <20190626023130.31315-2-xieyongji@baidu.com> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Ovh-Tracer-Id: 5069927283059693869 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeduvddrudeigddvkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 46.105.72.44 Subject: Re: [Qemu-devel] [PATCH v4 1/5] virtio: add "use-started" property X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, ehabkost@redhat.com, mst@redhat.com, qemu-devel@nongnu.org, dgilbert@redhat.com, Xie Yongji Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, 26 Jun 2019 10:31:26 +0800 elohimes@gmail.com wrote: > From: Xie Yongji > > In order to avoid migration issues, we introduce a "use-started" > property to the base virtio device to indicate whether use > "started" flag or not. This property will be true by default and > set to false when machine type <= 4.0. > > Suggested-by: Greg Kurz > Signed-off-by: Xie Yongji > --- LGTM, Reviewed-by: Greg Kurz This fixes the backward migration breakage I was observing. Tested-by: Greg Kurz > hw/block/vhost-user-blk.c | 4 ++-- > hw/core/machine.c | 1 + > hw/virtio/virtio.c | 18 +++++++----------- > include/hw/virtio/virtio.h | 21 +++++++++++++++++++++ > 4 files changed, 31 insertions(+), 13 deletions(-) > > diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c > index 9cb61336a6..85bc4017e7 100644 > --- a/hw/block/vhost-user-blk.c > +++ b/hw/block/vhost-user-blk.c > @@ -191,7 +191,7 @@ static void vhost_user_blk_stop(VirtIODevice *vdev) > static void vhost_user_blk_set_status(VirtIODevice *vdev, uint8_t status) > { > VHostUserBlk *s = VHOST_USER_BLK(vdev); > - bool should_start = vdev->started; > + bool should_start = virtio_device_started(vdev, status); > int ret; > > if (!vdev->vm_running) { > @@ -317,7 +317,7 @@ static int vhost_user_blk_connect(DeviceState *dev) > } > > /* restore vhost state */ > - if (vdev->started) { > + if (virtio_device_started(vdev, vdev->status)) { > ret = vhost_user_blk_start(vdev); > if (ret < 0) { > error_report("vhost-user-blk: vhost start failed: %s", > diff --git a/hw/core/machine.c b/hw/core/machine.c > index ea5a01aa49..ea84bd6788 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -30,6 +30,7 @@ GlobalProperty hw_compat_4_0[] = { > { "bochs-display", "edid", "false" }, > { "virtio-vga", "edid", "false" }, > { "virtio-gpu-pci", "edid", "false" }, > + { "virtio-device", "use-started", "false" }, > }; > const size_t hw_compat_4_0_len = G_N_ELEMENTS(hw_compat_4_0); > > diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c > index e1e90fcfd6..c9a6ca04b8 100644 > --- a/hw/virtio/virtio.c > +++ b/hw/virtio/virtio.c > @@ -1162,10 +1162,8 @@ int virtio_set_status(VirtIODevice *vdev, uint8_t val) > } > } > } > - vdev->started = val & VIRTIO_CONFIG_S_DRIVER_OK; > - if (unlikely(vdev->start_on_kick && vdev->started)) { > - vdev->start_on_kick = false; > - } > + > + virtio_set_started(vdev, val & VIRTIO_CONFIG_S_DRIVER_OK); > > if (k->set_status) { > k->set_status(vdev, val); > @@ -1536,8 +1534,7 @@ static bool virtio_queue_notify_aio_vq(VirtQueue *vq) > ret = vq->handle_aio_output(vdev, vq); > > if (unlikely(vdev->start_on_kick)) { > - vdev->started = true; > - vdev->start_on_kick = false; > + virtio_set_started(vdev, true); > } > } > > @@ -1557,8 +1554,7 @@ static void virtio_queue_notify_vq(VirtQueue *vq) > vq->handle_output(vdev, vq); > > if (unlikely(vdev->start_on_kick)) { > - vdev->started = true; > - vdev->start_on_kick = false; > + virtio_set_started(vdev, true); > } > } > } > @@ -1579,8 +1575,7 @@ void virtio_queue_notify(VirtIODevice *vdev, int n) > } > > if (unlikely(vdev->start_on_kick)) { > - vdev->started = true; > - vdev->start_on_kick = false; > + virtio_set_started(vdev, true); > } > } > > @@ -2291,7 +2286,7 @@ static void virtio_vmstate_change(void *opaque, int running, RunState state) > VirtIODevice *vdev = opaque; > BusState *qbus = qdev_get_parent_bus(DEVICE(vdev)); > VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus); > - bool backend_run = running && vdev->started; > + bool backend_run = running && virtio_device_started(vdev, vdev->status); > vdev->vm_running = running; > > if (backend_run) { > @@ -2669,6 +2664,7 @@ static void virtio_device_instance_finalize(Object *obj) > > static Property virtio_properties[] = { > DEFINE_VIRTIO_COMMON_FEATURES(VirtIODevice, host_features), > + DEFINE_PROP_BOOL("use-started", VirtIODevice, use_started, true), > DEFINE_PROP_END_OF_LIST(), > }; > > diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h > index 27c0efc3d0..15d5366939 100644 > --- a/include/hw/virtio/virtio.h > +++ b/include/hw/virtio/virtio.h > @@ -105,6 +105,7 @@ struct VirtIODevice > uint16_t device_id; > bool vm_running; > bool broken; /* device in invalid state, needs reset */ > + bool use_started; > bool started; > bool start_on_kick; /* virtio 1.0 transitional devices support that */ > VMChangeStateEntry *vmstate; > @@ -351,4 +352,24 @@ static inline bool virtio_is_big_endian(VirtIODevice *vdev) > /* Devices conforming to VIRTIO 1.0 or later are always LE. */ > return false; > } > + > +static inline bool virtio_device_started(VirtIODevice *vdev, uint8_t status) > +{ > + if (vdev->use_started) { > + return vdev->started; > + } > + > + return status & VIRTIO_CONFIG_S_DRIVER_OK; > +} > + > +static inline void virtio_set_started(VirtIODevice *vdev, bool started) > +{ > + if (started) { > + vdev->start_on_kick = false; > + } > + > + if (vdev->use_started) { > + vdev->started = started; > + } > +} > #endif