[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/57] vhost-vdpa: let net_vhost_vdpa_init() returns NetClientStat
From: |
Michael S. Tsirkin |
Subject: |
[PULL 06/57] vhost-vdpa: let net_vhost_vdpa_init() returns NetClientState * |
Date: |
Tue, 5 Oct 2021 12:01:01 -0400 |
From: Jason Wang <jasowang@redhat.com>
This patch switches to let net_vhost_vdpa_init() to return
NetClientState *. This is used for the callers to allocate multiqueue
NetClientState for multiqueue support.
Signed-off-by: Jason Wang <jasowang@redhat.com>
Message-Id: <20210907090322.1756-5-jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
net/vhost-vdpa.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 73d29a74ef..834dab28dd 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -155,8 +155,10 @@ static NetClientInfo net_vhost_vdpa_info = {
.has_ufo = vhost_vdpa_has_ufo,
};
-static int net_vhost_vdpa_init(NetClientState *peer, const char *device,
- const char *name, int vdpa_device_fd)
+static NetClientState *net_vhost_vdpa_init(NetClientState *peer,
+ const char *device,
+ const char *name,
+ int vdpa_device_fd)
{
NetClientState *nc = NULL;
VhostVDPAState *s;
@@ -170,8 +172,9 @@ static int net_vhost_vdpa_init(NetClientState *peer, const
char *device,
ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa);
if (ret) {
qemu_del_net_client(nc);
+ return NULL;
}
- return ret;
+ return nc;
}
static int net_vhost_check_net(void *opaque, QemuOpts *opts, Error **errp)
@@ -196,7 +199,8 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char
*name,
NetClientState *peer, Error **errp)
{
const NetdevVhostVDPAOptions *opts;
- int vdpa_device_fd, ret;
+ int vdpa_device_fd;
+ NetClientState *nc;
assert(netdev->type == NET_CLIENT_DRIVER_VHOST_VDPA);
opts = &netdev->u.vhost_vdpa;
@@ -211,10 +215,11 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char
*name,
return -errno;
}
- ret = net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name, vdpa_device_fd);
- if (ret) {
+ nc = net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name, vdpa_device_fd);
+ if (!nc) {
qemu_close(vdpa_device_fd);
+ return -1;
}
- return ret;
+ return 0;
}
--
MST
- [PULL 39/57] acpi: arm/virt: madt: use build_append_int_noprefix() API to compose MADT table, (continued)
- [PULL 39/57] acpi: arm/virt: madt: use build_append_int_noprefix() API to compose MADT table, Michael S. Tsirkin, 2021/10/05
- [PULL 40/57] acpi: build_dsdt_microvm: use acpi_table_begin()/acpi_table_end() instead of build_header(), Michael S. Tsirkin, 2021/10/05
- [PULL 42/57] acpi: arm: virt: build_iort: use acpi_table_begin()/acpi_table_end() instead of build_header(), Michael S. Tsirkin, 2021/10/05
- [PULL 01/57] hw/virtio: Acquire RCU read lock in virtqueue_packed_drop_all(), Michael S. Tsirkin, 2021/10/05
- [PULL 44/57] acpi: arm/virt: build_spcr: fix invalid cast, Michael S. Tsirkin, 2021/10/05
- [PULL 41/57] acpi: arm: virt: build_dsdt: use acpi_table_begin()/acpi_table_end() instead of build_header(), Michael S. Tsirkin, 2021/10/05
- [PULL 43/57] acpi: arm/virt: convert build_iort() to endian agnostic build_append_FOO() API, Michael S. Tsirkin, 2021/10/05
- [PULL 46/57] acpi: arm/virt: build_gtdt: use acpi_table_begin()/acpi_table_end() instead of build_header(), Michael S. Tsirkin, 2021/10/05
- [PULL 47/57] acpi: build_facs: use build_append_int_noprefix() API to compose table, Michael S. Tsirkin, 2021/10/05
- [PULL 50/57] bios-tables-test: allow changes in DSDT ACPI tables for q35, Michael S. Tsirkin, 2021/10/05
- [PULL 06/57] vhost-vdpa: let net_vhost_vdpa_init() returns NetClientState *,
Michael S. Tsirkin <=
- [PULL 48/57] acpi: remove no longer used build_header(), Michael S. Tsirkin, 2021/10/05
- [PULL 45/57] acpi: arm/virt: build_spcr: use acpi_table_begin()/acpi_table_end() instead of build_header(), Michael S. Tsirkin, 2021/10/05
- [PULL 49/57] acpi: AcpiGenericAddress no longer used to map/access fields of MMIO, drop packed attribute, Michael S. Tsirkin, 2021/10/05
- [PULL 51/57] hw/i386/acpi: fix conflicting IO address range for acpi pci hotplug in q35, Michael S. Tsirkin, 2021/10/05
- [PULL 56/57] hw/i386/amd_iommu: Rename SysBus specific functions as amdvi_sysbus_X(), Michael S. Tsirkin, 2021/10/05
- [PULL 22/57] acpi: build_mcfg: use acpi_table_begin()/acpi_table_end() instead of build_header(), Michael S. Tsirkin, 2021/10/05
- [PULL 55/57] hw/i386/amd_iommu: Rename amdviPCI TypeInfo, Michael S. Tsirkin, 2021/10/05
- [PULL 53/57] virtio-balloon: Fix page-poison subsection name, Michael S. Tsirkin, 2021/10/05
- [PULL 54/57] nvdimm: release the correct device list, Michael S. Tsirkin, 2021/10/05
- [PULL 52/57] bios-tables-test: Update ACPI DSDT table golden blobs for q35, Michael S. Tsirkin, 2021/10/05