From nobody Thu Apr 10 06:27:42 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1736949072; cv=none;
d=zohomail.com; s=zohoarc;
b=Ixpmw00q3HHGdpM1tZubV2+e5o0dx0TuyfVQ3HpVQ3P5AVDX8E1M5fKvzYPg2plJJJsrYoEZjpnkEgw6gy/Ilkp4ZN725oBJWvOFm/5wYkLKHi+xciqTcEiMmsGQbsEjxLlo0jcbi9LDfG9JSPTh9+wR2aJpXhQGvIo4y0oYtIs=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1736949072;
h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=xsKepFBipeuwCEkbj9TToSPlSSF2s/jUgoEpM16fklg=;
b=k65WV+wB0v6pCGrsNiT2SMRkrQqH7GGfpIYeUMvXv+ZVloyZ8XkmCaUr6vRKBRjRduwBefuZJeOJ3V32SwZeqXC+LRIoL1MBVZW/Ujl/OrKWMTZOPsHqCwjnL5LpvkLQjzMmOuoEgfRMancUAmY3Su0oL4uHupYJnl3f95lbdjk=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<lvivier@redhat.com> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1736949072549358.5695019554738;
Wed, 15 Jan 2025 05:51:12 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tY3nU-0006hn-JU; Wed, 15 Jan 2025 08:51:08 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <lvivier@redhat.com>)
id 1tY3nL-0006Ze-6y
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 08:50:55 -0500
Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <lvivier@redhat.com>)
id 1tY3nJ-0007uZ-5s
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 08:50:54 -0500
Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com
(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by
relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
cipher=TLS_AES_256_GCM_SHA384) id us-mta-363-GpbBqshOOX-0kccjMcRxBA-1; Wed,
15 Jan 2025 08:50:50 -0500
Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com
(mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest
SHA256)
(No client certificate requested)
by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS
id 28215197700A
for <qemu-devel@nongnu.org>; Wed, 15 Jan 2025 13:50:50 +0000 (UTC)
Received: from lenovo-t14s.redhat.com (unknown [10.39.192.232])
by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP
id 7D5AB19560A3; Wed, 15 Jan 2025 13:50:48 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1736949052;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=xsKepFBipeuwCEkbj9TToSPlSSF2s/jUgoEpM16fklg=;
b=VXpptz3zCVdqb3+jdgC1lEyOmLHWAgeWBLDj1mgkuIISYUkxA8h1aEYANNCOoa6eBuYxGS
PaFkcjmU0n9itkBrxbgM+WoH9+ysaWJzGAAbf2ThDY6pMJ82vu58n4iT61/H8ORggwl7T9
1OML7kQTatCw0VES3fLEp7Z3uOcV1mI=
X-MC-Unique: GpbBqshOOX-0kccjMcRxBA-1
X-Mimecast-MFC-AGG-ID: GpbBqshOOX-0kccjMcRxBA
From: Laurent Vivier <lvivier@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>, Hanna Czenczek <hreitz@redhat.com>,
Jason Wang <jasowang@redhat.com>
Subject: [PATCH v2 1/2] vhost: Add stubs for the migration state transfer
interface
Date: Wed, 15 Jan 2025 14:50:43 +0100
Message-ID: <20250115135044.799698-2-lvivier@redhat.com>
In-Reply-To: <20250115135044.799698-1-lvivier@redhat.com>
References: <20250115135044.799698-1-lvivier@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12
Received-SPF: pass (zohomail.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;
Received-SPF: pass client-ip=170.10.129.124; envelope-from=lvivier@redhat.com;
helo=us-smtp-delivery-124.mimecast.com
X-Spam_score_int: -21
X-Spam_score: -2.2
X-Spam_bar: --
X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.141,
DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,
RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1736949074667019000
Content-Type: text/plain; charset="utf-8"
Migration state transfer interface is only used by vhost-user-fs,
so the interface needs to be defined only when vhost is built.
But I need to use this interface with virtio-net and vhost is not always
enabled, and to avoid undefined reference error during build, define stub
functions for vhost_supports_device_state(), vhost_save_backend_state() and
vhost_load_backend_state().
Cc: Hanna Czenczek <hreitz@redhat.com>
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
include/hw/virtio/vhost.h | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h
index 461c168c3739..a9469d50bca1 100644
--- a/include/hw/virtio/vhost.h
+++ b/include/hw/virtio/vhost.h
@@ -365,7 +365,14 @@ static inline int vhost_reset_device(struct vhost_dev =
*hdev)
* Returns true if the device supports these commands, and false if it
* does not.
*/
+#ifdef CONFIG_VHOST
bool vhost_supports_device_state(struct vhost_dev *dev);
+#else
+static inline bool vhost_supports_device_state(struct vhost_dev *dev)
+{
+ return false;
+}
+#endif
=20
/**
* vhost_set_device_state_fd(): Begin transfer of internal state from/to
@@ -448,7 +455,15 @@ int vhost_check_device_state(struct vhost_dev *dev, Er=
ror **errp);
*
* Returns 0 on success, and -errno otherwise.
*/
+#ifdef CONFIG_VHOST
int vhost_save_backend_state(struct vhost_dev *dev, QEMUFile *f, Error **e=
rrp);
+#else
+static inline int vhost_save_backend_state(struct vhost_dev *dev, QEMUFile=
*f,
+ Error **errp)
+{
+ return -ENOSYS;
+}
+#endif
=20
/**
* vhost_load_backend_state(): High-level function to load a vhost
@@ -465,6 +480,14 @@ int vhost_save_backend_state(struct vhost_dev *dev, QE=
MUFile *f, Error **errp);
*
* Returns 0 on success, and -errno otherwise.
*/
+#ifdef CONFIG_VHOST
int vhost_load_backend_state(struct vhost_dev *dev, QEMUFile *f, Error **e=
rrp);
+#else
+static inline int vhost_load_backend_state(struct vhost_dev *dev, QEMUFile=
*f,
+ Error **errp)
+{
+ return -ENOSYS;
+}
+#endif
=20
#endif
--=20
2.47.1
From nobody Thu Apr 10 06:27:42 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1736949138; cv=none;
d=zohomail.com; s=zohoarc;
b=nARm6ronSoMwmE5RLedDBYnCLHhB2m0+zoXHs5tlvPjnJOhv4fYhECkmYmhN9BZ9WXz+UmjgXQL/B+jKrg7PbZ6JUa4uN3j+CPGbOc9anOGH7bpjOl7WIue74fuw/cMoy0XzM3zvJ90tw3WzUK8VtbiD2/jIgDGDhdEYM8ogTgA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1736949138;
h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=wBVkcW5CGvtlFb1EfsIoXBs6ncD8DVmImAJX2HMJ6vg=;
b=gIyTTXXUuy0kiVFymoat9Fmw2YwwTcIZCYoVvOK9/rnjMTddXIZkNLUNLAT/VqFeTg0lDEypHCTBYF3pEJayAgCPB5sWLPcfP3SZqyeOsofYJ7cUDdFkMabmLeTrT7bXk6TB+TcwKS8T6wfpH19SRXblzwssm6b5cvSlacEupVw=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<lvivier@redhat.com> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1736949138580179.0353080847383;
Wed, 15 Jan 2025 05:52:18 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tY3nY-0006jW-Qf; Wed, 15 Jan 2025 08:51:09 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <lvivier@redhat.com>)
id 1tY3nN-0006eH-Kq
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 08:50:58 -0500
Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <lvivier@redhat.com>)
id 1tY3nM-0007uk-0m
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 08:50:57 -0500
Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com
(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by
relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
cipher=TLS_AES_256_GCM_SHA384) id us-mta-223-YTQ8Nif6PDC5ogc41gIRBg-1; Wed,
15 Jan 2025 08:50:53 -0500
Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com
(mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest
SHA256)
(No client certificate requested)
by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS
id 381181955D64
for <qemu-devel@nongnu.org>; Wed, 15 Jan 2025 13:50:52 +0000 (UTC)
Received: from lenovo-t14s.redhat.com (unknown [10.39.192.232])
by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP
id C2DD619560AD; Wed, 15 Jan 2025 13:50:50 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1736949054;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=wBVkcW5CGvtlFb1EfsIoXBs6ncD8DVmImAJX2HMJ6vg=;
b=cyzIGl2T+vfeCe07DqPc6xdp26+EptlSgRoTuoyYtCG50JgR4w9wg30v1gjjS7z2SWUdaV
sk1Pam6v1XgCeNhWIZgD34GVb2EzrwQvvmp+GZGLzGilkgip5B8EWUclRq5rSkr9D2MCmW
XFPtO109+J5Oa9gRl4BFLZE5Y5w2Hfg=
X-MC-Unique: YTQ8Nif6PDC5ogc41gIRBg-1
X-Mimecast-MFC-AGG-ID: YTQ8Nif6PDC5ogc41gIRBg
From: Laurent Vivier <lvivier@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>, Hanna Czenczek <hreitz@redhat.com>,
Jason Wang <jasowang@redhat.com>
Subject: [PATCH v2 2/2] virtio-net: vhost-user: Implement internal migration
Date: Wed, 15 Jan 2025 14:50:44 +0100
Message-ID: <20250115135044.799698-3-lvivier@redhat.com>
In-Reply-To: <20250115135044.799698-1-lvivier@redhat.com>
References: <20250115135044.799698-1-lvivier@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12
Received-SPF: pass (zohomail.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;
Received-SPF: pass client-ip=170.10.129.124; envelope-from=lvivier@redhat.com;
helo=us-smtp-delivery-124.mimecast.com
X-Spam_score_int: -21
X-Spam_score: -2.2
X-Spam_bar: --
X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.141,
DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,
RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1736949138905019000
Content-Type: text/plain; charset="utf-8"
Add support of VHOST_USER_PROTOCOL_F_DEVICE_STATE in virtio-net
with vhost-user backend.
Cc: Hanna Czenczek <hreitz@redhat.com>
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
hw/net/virtio-net.c | 135 ++++++++++++++++++++++++++++++++++++--------
1 file changed, 112 insertions(+), 23 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 06f096abf678..85e14b788cf2 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -3337,6 +3337,117 @@ static const VMStateDescription vmstate_virtio_net_=
rss =3D {
},
};
=20
+static struct vhost_dev *virtio_net_get_vhost(VirtIODevice *vdev)
+{
+ VirtIONet *n =3D VIRTIO_NET(vdev);
+ NetClientState *nc;
+ struct vhost_net *net;
+
+ if (!n->nic) {
+ return NULL;
+ }
+
+ nc =3D qemu_get_queue(n->nic);
+ if (!nc) {
+ return NULL;
+ }
+
+ net =3D get_vhost_net(nc->peer);
+ if (!net) {
+ return NULL;
+ }
+
+ return &net->dev;
+}
+
+static int vhost_user_net_save_state(QEMUFile *f, void *pv, size_t size,
+ const VMStateField *field,
+ JSONWriter *vmdesc)
+{
+ VirtIONet *n =3D pv;
+ VirtIODevice *vdev =3D VIRTIO_DEVICE(n);
+ struct vhost_dev *vhdev;
+ Error *local_error =3D NULL;
+ int ret;
+
+ vhdev =3D virtio_net_get_vhost(vdev);
+ if (vhdev =3D=3D NULL) {
+ error_reportf_err(local_error,
+ "Error getting vhost back-end of %s device %s: ",
+ vdev->name, vdev->parent_obj.canonical_path);
+ return -1;
+ }
+
+ ret =3D vhost_save_backend_state(vhdev, f, &local_error);
+ if (ret < 0) {
+ error_reportf_err(local_error,
+ "Error saving back-end state of %s device %s: ",
+ vdev->name, vdev->parent_obj.canonical_path);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int vhost_user_net_load_state(QEMUFile *f, void *pv, size_t size,
+ const VMStateField *field)
+{
+ VirtIONet *n =3D pv;
+ VirtIODevice *vdev =3D VIRTIO_DEVICE(n);
+ struct vhost_dev *vhdev;
+ Error *local_error =3D NULL;
+ int ret;
+
+ vhdev =3D virtio_net_get_vhost(vdev);
+ if (vhdev =3D=3D NULL) {
+ error_reportf_err(local_error,
+ "Error getting vhost back-end of %s device %s: ",
+ vdev->name, vdev->parent_obj.canonical_path);
+ return -1;
+ }
+
+ ret =3D vhost_load_backend_state(vhdev, f, &local_error);
+ if (ret < 0) {
+ error_reportf_err(local_error,
+ "Error loading back-end state of %s device %s: =
",
+ vdev->name, vdev->parent_obj.canonical_path);
+ return ret;
+ }
+
+ return 0;
+}
+
+static bool vhost_user_net_is_internal_migration(void *opaque)
+{
+ VirtIONet *n =3D opaque;
+ VirtIODevice *vdev =3D VIRTIO_DEVICE(n);
+ struct vhost_dev *vhdev;
+
+ vhdev =3D virtio_net_get_vhost(vdev);
+ if (vhdev =3D=3D NULL) {
+ return false;
+ }
+
+ return vhost_supports_device_state(vhdev);
+}
+
+static const VMStateDescription vhost_user_net_backend_state =3D {
+ .name =3D "virtio-net-device/backend",
+ .version_id =3D 0,
+ .needed =3D vhost_user_net_is_internal_migration,
+ .fields =3D (const VMStateField[]) {
+ {
+ .name =3D "backend",
+ .info =3D &(const VMStateInfo) {
+ .name =3D "virtio-net vhost-user backend state",
+ .get =3D vhost_user_net_load_state,
+ .put =3D vhost_user_net_save_state,
+ },
+ },
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static const VMStateDescription vmstate_virtio_net_device =3D {
.name =3D "virtio-net-device",
.version_id =3D VIRTIO_NET_VM_VERSION,
@@ -3389,6 +3500,7 @@ static const VMStateDescription vmstate_virtio_net_de=
vice =3D {
},
.subsections =3D (const VMStateDescription * const []) {
&vmstate_virtio_net_rss,
+ &vhost_user_net_backend_state,
NULL
}
};
@@ -3950,29 +4062,6 @@ static bool dev_unplug_pending(void *opaque)
return vdc->primary_unplug_pending(dev);
}
=20
-static struct vhost_dev *virtio_net_get_vhost(VirtIODevice *vdev)
-{
- VirtIONet *n =3D VIRTIO_NET(vdev);
- NetClientState *nc;
- struct vhost_net *net;
-
- if (!n->nic) {
- return NULL;
- }
-
- nc =3D qemu_get_queue(n->nic);
- if (!nc) {
- return NULL;
- }
-
- net =3D get_vhost_net(nc->peer);
- if (!net) {
- return NULL;
- }
-
- return &net->dev;
-}
-
static const VMStateDescription vmstate_virtio_net =3D {
.name =3D "virtio-net",
.minimum_version_id =3D VIRTIO_NET_VM_VERSION,
--=20
2.47.1