From nobody Tue Feb 10 23:13:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1559633874; cv=none; d=zoho.com; s=zohoarc; b=RDDqLuUr1OBoxmEDHiMbiciWfQB4e2Eb4YvgKHNocbSYpN1vmOqYduQu2Uy3IKTEz2XqvPnTdUH/1W81LIXAKOpgZ5IKHFlmK6wSx5mVYaUT6wtWk8T5IuvB1k1jyyDIKJTj8xbWWXNSQmlZ6iqxL2lC+OJFenFWMAAggwxgXJU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559633874; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=BlmwWQSrvfnPLK3snMGwGG+KcVuIss3R/7Aben6MrQw=; b=gm8bVWMPwYayEJuiZXAV2npds7Zk3bnhJMNXp/4nL4jdG/WjRCryCzDt65vOtH+yuu7SKjXwNjlVFReQRf7DRRfsMp3bfSZ27br7jgJMc3AP7h/36/CKKWdh0oI5FDlZ+jaOg8cwKGKwMYHrSMgW+3LuM4PapUBCvQdj7TDhhlw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559633874077223.71350823580735; Tue, 4 Jun 2019 00:37:54 -0700 (PDT) Received: from localhost ([127.0.0.1]:47446 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hY410-0002hQ-1x for importer@patchew.org; Tue, 04 Jun 2019 03:37:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hY3z1-0001Ns-ES for qemu-devel@nongnu.org; Tue, 04 Jun 2019 03:35:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hY3z0-0004wQ-3V for qemu-devel@nongnu.org; Tue, 04 Jun 2019 03:35:47 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:45280) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hY3yz-0004tR-TY for qemu-devel@nongnu.org; Tue, 04 Jun 2019 03:35:46 -0400 Received: by mail-pg1-x541.google.com with SMTP id w34so9815477pga.12 for ; Tue, 04 Jun 2019 00:35:45 -0700 (PDT) Received: from localhost ([116.247.112.152]) by smtp.gmail.com with ESMTPSA id m20sm995215pjn.16.2019.06.04.00.35.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Jun 2019 00:35:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BlmwWQSrvfnPLK3snMGwGG+KcVuIss3R/7Aben6MrQw=; b=VJ8WpLxq43rtFJQ9KMSJSFwSHLmfhxYJ4phcnhQLO6VuOcNa81TtNGRMs0fdFpCz4S yMfq4G9kHxo9Ec2eTESm5PTfnDoK6OUxen1oNS73U0n91eYHkJ0QXHj52gsZqrpzfahN /RmFv5nfN+i+cyKFfF1bJbAqD50f+QSF1inhSLMz5PjFFM4VrqQkhbxh3drXMEiGTQ2Q tXu4b6yN4NGx+yLNF3qfN7ATT/xtHSzHTp08k9D2e2PiXZBvteBuZXDk9NA0eByrlB03 Usi2BvVjXKSxhtbwixUXfgZhz8wOAQyVXYHUYT01uiMz1HVWDIaa01cdcmmd2+CeVYuw 7S+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BlmwWQSrvfnPLK3snMGwGG+KcVuIss3R/7Aben6MrQw=; b=Fm+KzA9QW4PNGmNlfpofHLQyGEwLDm6ue3MgTY/vJENnfGCmIOQqveHGCvu3JWTdJX mvcq6808w3mxT1RxVlfV7jBunKn+o7Eudvrm/sbPCJNNtVwnxdETy/qyGg6hWOIUINSA uUOww/PQZ+8MsO2LvcfX7AjfiFsUsEnvIelgl+q1u1NK4vUdksRuHRbGKd1QrQDa96ol 8kmGd9dQmHLExZX90+H3cma8oyC157PcLabkIOOFu0b+0bcqlEXnyKSlajVA6hSqaikL 8/YxB4PPFG6LNw5plmzQgD7s5d5BIU1wH5tC0+qE7MNg/HnVbkTbNg+B7rNcvKz8EAr6 cm3Q== X-Gm-Message-State: APjAAAXcy6d1Hy0UIz3fhD9jYTTxVfi9ZszkNF1zUIVdFgQYAm3zGRUe CpoY+CjOxQpa4XCB7BQEpIQqgqm+ X-Google-Smtp-Source: APXvYqyx2Cn2oWru565C85iqVbPdB5kTgKZHSX0YYGuquvXmTkPAhf81/XoH66oZlUvYcmoIecANXA== X-Received: by 2002:a17:90a:6348:: with SMTP id v8mr35026298pjs.34.1559633744907; Tue, 04 Jun 2019 00:35:44 -0700 (PDT) From: elohimes@gmail.com X-Google-Original-From: xieyongji@baidu.com To: mst@redhat.com, groug@kaod.org Date: Tue, 4 Jun 2019 15:34:59 +0800 Message-Id: <20190604073459.15651-6-xieyongji@baidu.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190604073459.15651-1-xieyongji@baidu.com> References: <20190604073459.15651-1-xieyongji@baidu.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 Subject: [Qemu-devel] [PATCH v2 5/5] virtio: add "use-started" property 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: Xie Yongji , dgilbert@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 <=3D 4.0.1. Signed-off-by: Xie Yongji --- hw/block/vhost-user-blk.c | 4 ++-- hw/core/machine.c | 4 +++- hw/virtio/virtio.c | 21 ++++++++------------- include/hw/virtio/virtio.h | 21 +++++++++++++++++++++ 4 files changed, 34 insertions(+), 16 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 =3D VHOST_USER_BLK(vdev); - bool should_start =3D vdev->started; + bool should_start =3D virtio_device_started(vdev, status); int ret; =20 if (!vdev->vm_running) { @@ -317,7 +317,7 @@ static int vhost_user_blk_connect(DeviceState *dev) } =20 /* restore vhost state */ - if (vdev->started) { + if (virtio_device_started(vdev, vdev->status)) { ret =3D 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 f1a0f45f9c..133c113ebf 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -24,7 +24,9 @@ #include "hw/pci/pci.h" #include "hw/mem/nvdimm.h" =20 -GlobalProperty hw_compat_4_0_1[] =3D {}; +GlobalProperty hw_compat_4_0_1[] =3D { + { "virtio-device", "use-started", "false" }, +}; const size_t hw_compat_4_0_1_len =3D G_N_ELEMENTS(hw_compat_4_0_1); =20 GlobalProperty hw_compat_4_0[] =3D {}; diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 3960619bd4..9af2e339af 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -1165,10 +1165,7 @@ int virtio_set_status(VirtIODevice *vdev, uint8_t va= l) =20 if ((vdev->status & VIRTIO_CONFIG_S_DRIVER_OK) !=3D (val & VIRTIO_CONFIG_S_DRIVER_OK)) { - vdev->started =3D val & VIRTIO_CONFIG_S_DRIVER_OK; - if (unlikely(vdev->start_on_kick && vdev->started)) { - vdev->start_on_kick =3D false; - } + virtio_set_started(vdev, val & VIRTIO_CONFIG_S_DRIVER_OK); } =20 if (k->set_status) { @@ -1539,8 +1536,7 @@ static bool virtio_queue_notify_aio_vq(VirtQueue *vq) ret =3D vq->handle_aio_output(vdev, vq); =20 if (unlikely(vdev->start_on_kick)) { - vdev->started =3D true; - vdev->start_on_kick =3D false; + virtio_set_started(vdev, true); } } =20 @@ -1560,8 +1556,7 @@ static void virtio_queue_notify_vq(VirtQueue *vq) vq->handle_output(vdev, vq); =20 if (unlikely(vdev->start_on_kick)) { - vdev->started =3D true; - vdev->start_on_kick =3D false; + virtio_set_started(vdev, true); } } } @@ -1581,8 +1576,7 @@ void virtio_queue_notify(VirtIODevice *vdev, int n) vq->handle_output(vdev, vq); =20 if (unlikely(vdev->start_on_kick)) { - vdev->started =3D true; - vdev->start_on_kick =3D false; + virtio_set_started(vdev, true); } } } @@ -2083,7 +2077,7 @@ int virtio_set_features(VirtIODevice *vdev, uint64_t = val) } } =20 - if (!vdev->started && + if (!virtio_device_started(vdev, vdev->status) && !virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { vdev->start_on_kick =3D true; } @@ -2238,7 +2232,7 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f, int = version_id) } } =20 - if (!vdev->started && + if (!virtio_device_started(vdev, vdev->status) && !virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { vdev->start_on_kick =3D true; } @@ -2306,7 +2300,7 @@ static void virtio_vmstate_change(void *opaque, int r= unning, RunState state) VirtIODevice *vdev =3D opaque; BusState *qbus =3D qdev_get_parent_bus(DEVICE(vdev)); VirtioBusClass *k =3D VIRTIO_BUS_GET_CLASS(qbus); - bool backend_run =3D running && vdev->started; + bool backend_run =3D running && virtio_device_started(vdev, vdev->stat= us); vdev->vm_running =3D running; =20 if (backend_run) { @@ -2683,6 +2677,7 @@ static void virtio_device_instance_finalize(Object *o= bj) =20 static Property virtio_properties[] =3D { DEFINE_VIRTIO_COMMON_FEATURES(VirtIODevice, host_features), + DEFINE_PROP_BOOL("use-started", VirtIODevice, use_started, true), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index 303242b3c2..b189788cb2 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; /* when virtio 1.0 feature has not been negotiated= */ 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 statu= s) +{ + 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 =3D false; + } + + if (vdev->use_started) { + vdev->started =3D started; + } +} #endif --=20 2.17.1