The following changes since commit f670b3eec7f5d1ed8c4573ef244e7b8c6b32001b:

Merge tag 'migration-20230213-pull-request' of https://gitlab.com/juan.quintela/qemu into staging (2023-02-13 11:54:05 +0000)

for you to fetch changes up to e4b953a26da11d214f91516cb9b0542eab5afaa0:

vdpa: fix VHOST_BACKEND_F_IOTLB_ASID flag check (2023-02-14 14:00:30 +0800)

Christian Svensson (1):

net: Increase L2TPv3 buffer to fit jumboframes

Eugenio Pérez (1):

vdpa: fix VHOST_BACKEND_F_IOTLB_ASID flag check

Fiona Ebner (1):

hw/net/vmxnet3: allow VMXNET3_MAX_MTU itself as a value

Joelle van Dyne (1):

vmnet: stop recieving events when VM is stopped

Laurent Vivier (1):

net: stream: add a new option to automatically reconnect

Qiang Liu (2):

hw/net/lan9118: log [read|write]b when mode_16bit is enabled rather than abort

hw/net/can/xlnx-zynqmp-can: fix assertion failures in transfer_fifo()

Thomas Huth (3):

net: Move the code to collect available NIC models to a separate function

net: Restore printing of the help text with "-nic help"

net: Replace "Supported NIC models" with "Available NIC models"

hw/net/can/xlnx-zynqmp-can.c | 9 +++-

hw/net/lan9118.c | 17 ++++----

hw/net/vmxnet3.c | 2 +-

hw/pci/pci.c | 29 +------------

include/net/net.h | 14 ++++++

net/l2tpv3.c | 2 +-

net/net.c | 50 +++++++++++++++++++--

net/stream.c | 53 ++++++++++++++++++++++-

net/vhost-vdpa.c | 2 +-

net/vmnet-common.m | 48 ++++++++++++++------

net/vmnet_int.h | 2 +

qapi/net.json | 7 ++-

qemu-options.hx | 6 +--

tests/qtest/netdev-socket.c | 101 +++++++++++++++++++++++++++++++++++++++++++

14 files changed, 280 insertions(+), 62 deletions(-)

From: Thomas Huth <thuth@redhat.com>

The code that collects the available NIC models is not really specific

to PCI anymore and will be required in the next patch, too, so let's

move this into a new separate function in net.c instead.

Signed-off-by: Thomas Huth <thuth@redhat.com>

hw/pci/pci.c | 29 +----------------------------

include/net/net.h | 14 ++++++++++++++

net/net.c | 34 ++++++++++++++++++++++++++++++++++

3 files changed, 49 insertions(+), 28 deletions(-)

@@ -XXX,XX +XXX,XX @@ void net_socket_rs_init(SocketReadState *rs,

bool vnet_hdr);

NetClientState *qemu_get_peer(NetClientState *nc, int queue_index);

+/**

+ * qemu_get_nic_models:

+ * @device_type: Defines which devices should be taken into consideration

+ * (e.g. TYPE_DEVICE for all devices, or TYPE_PCI_DEVICE for PCI)

+ *

+ * Get an array of pointers to names of NIC devices that are available in

+ * the QEMU binary. The array is terminated with a NULL pointer entry.

+ * The caller is responsible for freeing the memory when it is not required

+ * anymore, e.g. with g_ptr_array_free(..., true).

+ *

+ * Returns: Pointer to the array that contains the pointers to the names.

+ */

+GPtrArray *qemu_get_nic_models(const char *device_type);

+

/* NIC info */

#define MAX_NICS 8

diff --git a/net/net.c b/net/net.c

--- a/net/net.c

+++ b/net/net.c

@@ -XXX,XX +XXX,XX @@ static int nic_get_free_idx(void)

+ while (list) {

+ DeviceClass *dc = OBJECT_CLASS_CHECK(DeviceClass, list->data,

+ TYPE_DEVICE);

+ GSList *next;

+ if (test_bit(DEVICE_CATEGORY_NETWORK, dc->categories) &&

+ dc->user_creatable) {

+ const char *name = object_class_get_name(list->data);

+ /*

+ * A network device might also be something else than a NIC, see

+ * e.g. the "rocker" device. Thus we have to look for the "netdev"

+ * property, too. Unfortunately, some devices like virtio-net only

+ * create this property during instance_init, so we have to create

+ * a temporary instance here to be able to check it.

+ */

+ Object *obj = object_new_with_class(OBJECT_CLASS(dc));

+ if (object_property_find(obj, "netdev")) {

+ g_ptr_array_add(nic_models, (gpointer)name);

+ }

+ object_unref(obj);

+ }

+ next = list->next;

+ g_slist_free_1(list);

+ list = next;

+ }

+ g_ptr_array_add(nic_models, NULL);

+ return nic_models;

int qemu_show_nic_models(const char *arg, const char *const *models)

int i;

From: Thomas Huth <thuth@redhat.com>

Running QEMU with "-nic help" used to work in QEMU 5.2 and earlier versions

(it showed the available netdev backends), but this feature got broken during

some refactoring in version 6.0. Let's restore the old behavior, and while

we're at it, let's also print the available NIC models here now since this

option can be used to configure both, netdev backend and model in one go.

Fixes: ad6f932fe8 ("net: do not exit on "netdev_add help" monitor command")

Signed-off-by: Thomas Huth <thuth@redhat.com>

net/net.c | 14 ++++++++++++--

1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/net/net.c b/net/net.c

--- a/net/net.c

+++ b/net/net.c

@@ -XXX,XX +XXX,XX @@ static int net_param_nic(void *dummy, QemuOpts *opts, Error **errp)

const char *type;

type = qemu_opt_get(opts, "type");

- if (type && g_str_equal(type, "none")) {

- return 0; /* Nothing to do, default_net is cleared in vl.c */

+ if (type) {

+ if (g_str_equal(type, "none")) {

+ return 0; /* Nothing to do, default_net is cleared in vl.c */

+ }

+ if (is_help_option(type)) {

+ GPtrArray *nic_models = qemu_get_nic_models(TYPE_DEVICE);

+ show_netdevs();

+ printf("\n");

+ qemu_show_nic_models(type, (const char **)nic_models->pdata);

+ g_ptr_array_free(nic_models, true);

+ exit(0);

+ }

}

idx = nic_get_free_idx();

From: Qiang Liu <cyruscyliu@gmail.com>

This patch replaces hw_error to guest error log for [read|write]b

accesses when mode_16bit is enabled. This avoids aborting qemu.

Fixes: 1248f8d4cbc3 ("hw/lan9118: Add basic 16-bit mode support.")

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1433

Reported-by: Qiang Liu <cyruscyliu@gmail.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Signed-off-by: Qiang Liu <cyruscyliu@gmail.com>

Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org>

hw/net/lan9118.c | 17 ++++++++---------

1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c

--- a/hw/net/lan9118.c

+++ b/hw/net/lan9118.c

@@ -XXX,XX +XXX,XX @@

#include "migration/vmstate.h"

#include "net/net.h"

#include "net/eth.h"

-#include "hw/hw.h"

#include "hw/irq.h"

#include "hw/net/lan9118.h"

#include "hw/ptimer.h"

@@ -XXX,XX +XXX,XX @@

#ifdef DEBUG_LAN9118

#define DPRINTF(fmt, ...) \

do { printf("lan9118: " fmt , ## __VA_ARGS__); } while (0)

-#define BADF(fmt, ...) \

-do { hw_error("lan9118: error: " fmt , ## __VA_ARGS__);} while (0)

#else

#define DPRINTF(fmt, ...) do {} while(0)

-#define BADF(fmt, ...) \

-do { fprintf(stderr, "lan9118: error: " fmt , ## __VA_ARGS__);} while (0)

#endif

/* The tx and rx fifo ports are a range of aliased 32-bit registers */

@@ -XXX,XX +XXX,XX @@ static uint32_t do_phy_read(lan9118_state *s, int reg)

case 30: /* Interrupt mask */

return s->phy_int_mask;

default:

- BADF("PHY read reg %d\n", reg);

+ qemu_log_mask(LOG_GUEST_ERROR,

+ "do_phy_read: PHY read reg %d\n", reg);

return 0;

@@ -XXX,XX +XXX,XX @@ static void do_phy_write(lan9118_state *s, int reg, uint32_t val)

phy_update_irq(s);

break;

default:

- BADF("PHY write reg %d = 0x%04x\n", reg, val);

+ qemu_log_mask(LOG_GUEST_ERROR,

+ "do_phy_write: PHY write reg %d = 0x%04x\n", reg, val);

@@ -XXX,XX +XXX,XX @@ static void lan9118_16bit_mode_write(void *opaque, hwaddr offset,

return;

- hw_error("lan9118_write: Bad size 0x%x\n", size);

+ qemu_log_mask(LOG_GUEST_ERROR,

+ "lan9118_16bit_mode_write: Bad size 0x%x\n", size);

}

static uint64_t lan9118_readl(void *opaque, hwaddr offset,

@@ -XXX,XX +XXX,XX @@ static uint64_t lan9118_16bit_mode_read(void *opaque, hwaddr offset,

return lan9118_readl(opaque, offset, size);

- hw_error("lan9118_read: Bad size 0x%x\n", size);

+ qemu_log_mask(LOG_GUEST_ERROR,

+ "lan9118_16bit_mode_read: Bad size 0x%x\n", size);

return 0;

From: Joelle van Dyne <j@getutm.app>

When the VM is stopped using the HMP command "stop", soon the handler will

stop reading from the vmnet interface. This causes a flood of

`VMNET_INTERFACE_PACKETS_AVAILABLE` events to arrive and puts the host CPU

at 100%. We fix this by removing the event handler from vmnet when the VM

is no longer in a running state and restore it when we return to a running

state.

Signed-off-by: Joelle van Dyne <j@getutm.app>

net/vmnet-common.m | 48 +++++++++++++++++++++++++++++++++++-------------

net/vmnet_int.h | 2 ++

2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/net/vmnet-common.m b/net/vmnet-common.m

index XXXXXXX..XXXXXXX 100644

--- a/net/vmnet-common.m

+++ b/net/vmnet-common.m

#include "clients.h"

#include "qemu/error-report.h"

#include "qapi/error.h"

+#include "sysemu/runstate.h"

#include <vmnet/vmnet.h>

#include <dispatch/dispatch.h>

@@ -XXX,XX +XXX,XX @@ static void vmnet_bufs_init(VmnetState *s)

}

}

+/**

+ * Called on state change to un-register/re-register handlers

+ if (running) {

+ vmnet_interface_set_event_callback(

+ s->vmnet_if,

+ VMNET_INTERFACE_PACKETS_AVAILABLE,

+ s->if_queue,

+ ^(interface_event_t event_id, xpc_object_t event) {

+ assert(event_id == VMNET_INTERFACE_PACKETS_AVAILABLE);

+ /*

+ * This function is being called from a non qemu thread, so

+ * we only schedule a BH, and do the rest of the io completion

+ * handling from vmnet_send_bh() which runs in a qemu context.

+ */

+ qemu_bh_schedule(s->send_bh);

+ });

+ } else {

+ vmnet_interface_set_event_callback(

+ s->vmnet_if,

+ VMNET_INTERFACE_PACKETS_AVAILABLE,

+ NULL,

+ NULL);

+ s->change = qemu_add_vm_change_state_handler(vmnet_vm_state_change_cb, s);

return 0;

}

@@ -XXX,XX +XXX,XX @@ void vmnet_cleanup_common(NetClientState *nc)

return;

}

+ vmnet_vm_state_change_cb(s, 0, RUN_STATE_SHUTDOWN);

+ qemu_del_vm_change_state_handler(s->change);

if_stopped_sem = dispatch_semaphore_create(0);

vmnet_stop_interface(

s->vmnet_if,

diff --git a/net/vmnet_int.h b/net/vmnet_int.h

index XXXXXXX..XXXXXXX 100644

--- a/net/vmnet_int.h

+++ b/net/vmnet_int.h

@@ -XXX,XX +XXX,XX @@ typedef struct VmnetState {

int packets_send_end_pos;

struct iovec iov_buf[VMNET_PACKETS_LIMIT];

+ VMChangeStateEntry *change;

} VmnetState;

const char *vmnet_status_map_str(vmnet_return_t status);