* [PULL 01/47] net: add qemu_{configure, create}_nic_device(), qemu_find_nic_info()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 02/47] net: report list of available models according to platform David Woodhouse
` (46 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Most code which directly accesses nd_table[] and nb_nics uses them for
one of two things. Either "I have created a NIC device and I'd like a
configuration for it", or "I will create a NIC device *if* there is a
configuration for it". With some variants on the theme around whether
they actually *check* if the model specified in the configuration is
the right one.
Provide functions which perform both of those, allowing platforms to
be a little more consistent and as a step towards making nd_table[]
and nb_nics private to the net code.
One might argue that platforms ought to be consistent about whether
they create the unconfigured devices or not, but making significant
user-visible changes is explicitly *not* the intent right now.
The new functions leave the 'model' field of the NICInfo as NULL after
using it for the default NIC model, unlike the qemu_check_nic_model()
function which does set nd->model to match default_model explicitly.
This is acceptable because there is no code which consumes nd->model
except this NIC-matching code in net/net.c, and no reasonable excuse
for any code wanting to use nd->model in future.
Also export the qemu_find_nic_info() helper, as some platforms have
special cases they need to handle.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
include/net/net.h | 40 +++++++++++++++++++++++++++++++++++++
net/net.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 91 insertions(+)
diff --git a/include/net/net.h b/include/net/net.h
index ffbd2c8d56..dff1872b4d 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -207,7 +207,47 @@ int qemu_show_nic_models(const char *arg, const char *const *models);
void qemu_check_nic_model(NICInfo *nd, const char *model);
int qemu_find_nic_model(NICInfo *nd, const char * const *models,
const char *default_model);
+/**
+ * qemu_find_nic_info: Obtain NIC configuration information
+ * @typename: Name of device object type
+ * @match_default: Match NIC configurations with no model specified
+ * @alias: Additional model string to match (for user convenience and
+ * backward compatibility).
+ *
+ * Search for a NIC configuration matching the NIC model constraints.
+ */
+NICInfo *qemu_find_nic_info(const char *typename, bool match_default,
+ const char *alias);
+/**
+ * qemu_configure_nic_device: Apply NIC configuration to a given device
+ * @dev: Network device to be configured
+ * @match_default: Match NIC configurations with no model specified
+ * @alias: Additional model string to match
+ *
+ * Search for a NIC configuration for the provided device, using the
+ * additionally specified matching constraints. If found, apply the
+ * configuration using qdev_set_nic_properties() and return %true.
+ *
+ * This is used by platform code which creates the device anyway,
+ * regardless of whether there is a configuration for it. This tends
+ * to be platforms which ignore `--nodefaults` and create net devices
+ * anyway, for example because the Ethernet device on that board is
+ * always physically present.
+ */
+bool qemu_configure_nic_device(DeviceState *dev, bool match_default,
+ const char *alias);
+/**
+ * qemu_create_nic_device: Create a NIC device if a configuration exists for it
+ * @typename: Object typename of network device
+ * @match_default: Match NIC configurations with no model specified
+ * @alias: Additional model string to match
+ *
+ * Search for a NIC configuration for the provided device type. If found,
+ * create an object of the corresponding type and return it.
+ */
+DeviceState *qemu_create_nic_device(const char *typename, bool match_default,
+ const char *alias);
void print_net_client(Monitor *mon, NetClientState *nc);
void net_socket_rs_init(SocketReadState *rs,
SocketReadStateFinalize *finalize,
diff --git a/net/net.c b/net/net.c
index 0520bc1681..aeb7f573fc 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1087,6 +1087,57 @@ static int net_init_nic(const Netdev *netdev, const char *name,
return idx;
}
+NICInfo *qemu_find_nic_info(const char *typename, bool match_default,
+ const char *alias)
+{
+ NICInfo *nd;
+ int i;
+
+ for (i = 0; i < nb_nics; i++) {
+ nd = &nd_table[i];
+
+ if (!nd->used || nd->instantiated) {
+ continue;
+ }
+
+ if ((match_default && !nd->model) || !g_strcmp0(nd->model, typename)
+ || (alias && !g_strcmp0(nd->model, alias))) {
+ return nd;
+ }
+ }
+ return NULL;
+}
+
+
+/* "I have created a device. Please configure it if you can" */
+bool qemu_configure_nic_device(DeviceState *dev, bool match_default,
+ const char *alias)
+{
+ NICInfo *nd = qemu_find_nic_info(object_get_typename(OBJECT(dev)),
+ match_default, alias);
+
+ if (nd) {
+ qdev_set_nic_properties(dev, nd);
+ return true;
+ }
+ return false;
+}
+
+/* "Please create a device, if you have a configuration for it" */
+DeviceState *qemu_create_nic_device(const char *typename, bool match_default,
+ const char *alias)
+{
+ NICInfo *nd = qemu_find_nic_info(typename, match_default, alias);
+ DeviceState *dev;
+
+ if (!nd) {
+ return NULL;
+ }
+
+ dev = qdev_new(typename);
+ qdev_set_nic_properties(dev, nd);
+ return dev;
+}
static int (* const net_client_init_fun[NET_CLIENT_DRIVER__MAX])(
const Netdev *netdev,
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 02/47] net: report list of available models according to platform
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
2024-02-01 16:43 ` [PULL 01/47] net: add qemu_{configure, create}_nic_device(), qemu_find_nic_info() David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 03/47] net: add qemu_create_nic_bus_devices() David Woodhouse
` (45 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
By noting the models for which a configuration was requested, we can give
the user an accurate list of which NIC models were actually available on
the platform/configuration that was otherwise chosen.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
---
net/net.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 94 insertions(+)
diff --git a/net/net.c b/net/net.c
index aeb7f573fc..962904eaef 100644
--- a/net/net.c
+++ b/net/net.c
@@ -75,6 +75,8 @@ typedef QSIMPLEQ_HEAD(, NetdevQueueEntry) NetdevQueue;
static NetdevQueue nd_queue = QSIMPLEQ_HEAD_INITIALIZER(nd_queue);
+static GHashTable *nic_model_help;
+
/***********************************************************/
/* network device redirectors */
@@ -1087,12 +1089,94 @@ static int net_init_nic(const Netdev *netdev, const char *name,
return idx;
}
+static gboolean add_nic_result(gpointer key, gpointer value, gpointer user_data)
+{
+ GPtrArray *results = user_data;
+ GPtrArray *alias_list = value;
+ const char *model = key;
+ char *result;
+
+ if (!alias_list) {
+ result = g_strdup(model);
+ } else {
+ GString *result_str = g_string_new(model);
+ int i;
+
+ g_string_append(result_str, " (aka ");
+ for (i = 0; i < alias_list->len; i++) {
+ if (i) {
+ g_string_append(result_str, ", ");
+ }
+ g_string_append(result_str, alias_list->pdata[i]);
+ }
+ g_string_append(result_str, ")");
+ result = result_str->str;
+ g_string_free(result_str, false);
+ g_ptr_array_unref(alias_list);
+ }
+ g_ptr_array_add(results, result);
+ return true;
+}
+
+static int model_cmp(char **a, char **b)
+{
+ return strcmp(*a, *b);
+}
+
+static void show_nic_models(void)
+{
+ GPtrArray *results = g_ptr_array_new();
+ int i;
+
+ g_hash_table_foreach_remove(nic_model_help, add_nic_result, results);
+ g_ptr_array_sort(results, (GCompareFunc)model_cmp);
+
+ printf("Available NIC models for this configuration:\n");
+ for (i = 0 ; i < results->len; i++) {
+ printf("%s\n", (char *)results->pdata[i]);
+ }
+ g_hash_table_unref(nic_model_help);
+ nic_model_help = NULL;
+}
+
+static void add_nic_model_help(const char *model, const char *alias)
+{
+ GPtrArray *alias_list = NULL;
+
+ if (g_hash_table_lookup_extended(nic_model_help, model, NULL,
+ (gpointer *)&alias_list)) {
+ /* Already exists, no alias to add: return */
+ if (!alias) {
+ return;
+ }
+ if (alias_list) {
+ /* Check if this alias is already in the list. Add if not. */
+ if (!g_ptr_array_find_with_equal_func(alias_list, alias,
+ g_str_equal, NULL)) {
+ g_ptr_array_add(alias_list, g_strdup(alias));
+ }
+ return;
+ }
+ }
+ /* Either this model wasn't in the list already, or a first alias added */
+ if (alias) {
+ alias_list = g_ptr_array_new();
+ g_ptr_array_set_free_func(alias_list, g_free);
+ g_ptr_array_add(alias_list, g_strdup(alias));
+ }
+ g_hash_table_replace(nic_model_help, g_strdup(model), alias_list);
+}
+
NICInfo *qemu_find_nic_info(const char *typename, bool match_default,
const char *alias)
{
NICInfo *nd;
int i;
+ if (nic_model_help) {
+ add_nic_model_help(typename, alias);
+ }
+
for (i = 0; i < nb_nics; i++) {
nd = &nd_table[i];
@@ -1606,6 +1690,10 @@ void net_check_clients(void)
NetClientState *nc;
int i;
+ if (nic_model_help) {
+ show_nic_models();
+ exit(0);
+ }
net_hub_check_clients();
QTAILQ_FOREACH(nc, &net_clients, next) {
@@ -1685,6 +1773,12 @@ static int net_param_nic(void *dummy, QemuOpts *opts, Error **errp)
memset(ni, 0, sizeof(*ni));
ni->model = qemu_opt_get_del(opts, "model");
+ if (!nic_model_help && !g_strcmp0(ni->model, "help")) {
+ nic_model_help = g_hash_table_new_full(g_str_hash, g_str_equal,
+ g_free, NULL);
+ return 0;
+ }
+
/* Create an ID if the user did not specify one */
nd_id = g_strdup(qemu_opts_id(opts));
if (!nd_id) {
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 03/47] net: add qemu_create_nic_bus_devices()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
2024-02-01 16:43 ` [PULL 01/47] net: add qemu_{configure, create}_nic_device(), qemu_find_nic_info() David Woodhouse
2024-02-01 16:43 ` [PULL 02/47] net: report list of available models according to platform David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 04/47] hw/pci: add pci_init_nic_devices(), pci_init_nic_in_slot() David Woodhouse
` (44 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
This will instantiate any NICs which live on a given bus type. Each bus
is allowed *one* substitution (for PCI it's virtio → virtio-net-pci, for
Xen it's xen → xen-net-device; no point in overengineering it unless we
actually want more).
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
include/net/net.h | 22 ++++++++++++++++++++
net/net.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 75 insertions(+)
diff --git a/include/net/net.h b/include/net/net.h
index dff1872b4d..728ca965af 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -248,6 +248,28 @@ bool qemu_configure_nic_device(DeviceState *dev, bool match_default,
*/
DeviceState *qemu_create_nic_device(const char *typename, bool match_default,
const char *alias);
+
+/*
+ * qemu_create_nic_bus_devices: Create configured NIC devices for a given bus
+ * @bus: Bus on which to create devices
+ * @parent_type: Object type for devices to be created (e.g. TYPE_PCI_DEVICE)
+ * @default_model: Object type name for default NIC model (or %NULL)
+ * @alias: Additional model string to replace, for user convenience
+ * @alias_target: Actual object type name to be used in place of @alias
+ *
+ * Instantiate dynamic NICs on a given bus, typically a PCI bus. This scans
+ * for available NIC configurations which either specify a model which is
+ * a child type of @parent_type, or which do not specify a model when
+ * @default_model is non-NULL. Each device is instantiated on the given @bus.
+ *
+ * A single substitution is supported, e.g. "xen" → "xen-net-device" for the
+ * Xen bus, or "virtio" → "virtio-net-pci" for PCI. This allows the user to
+ * specify a more understandable "model=" parameter on the command line, not
+ * only the real object typename.
+ */
+void qemu_create_nic_bus_devices(BusState *bus, const char *parent_type,
+ const char *default_model,
+ const char *alias, const char *alias_target);
void print_net_client(Monitor *mon, NetClientState *nc);
void net_socket_rs_init(SocketReadState *rs,
SocketReadStateFinalize *finalize,
diff --git a/net/net.c b/net/net.c
index 962904eaef..4651b3f443 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1223,6 +1223,59 @@ DeviceState *qemu_create_nic_device(const char *typename, bool match_default,
return dev;
}
+void qemu_create_nic_bus_devices(BusState *bus, const char *parent_type,
+ const char *default_model,
+ const char *alias, const char *alias_target)
+{
+ GPtrArray *nic_models = qemu_get_nic_models(parent_type);
+ const char *model;
+ DeviceState *dev;
+ NICInfo *nd;
+ int i;
+
+ if (nic_model_help) {
+ if (alias_target) {
+ add_nic_model_help(alias_target, alias);
+ }
+ for (i = 0; i < nic_models->len - 1; i++) {
+ add_nic_model_help(nic_models->pdata[i], NULL);
+ }
+ }
+
+ /* Drop the NULL terminator which would make g_str_equal() unhappy */
+ nic_models->len--;
+
+ for (i = 0; i < nb_nics; i++) {
+ nd = &nd_table[i];
+
+ if (!nd->used || nd->instantiated) {
+ continue;
+ }
+
+ model = nd->model ? nd->model : default_model;
+ if (!model) {
+ continue;
+ }
+
+ /* Each bus type is allowed *one* substitution */
+ if (g_str_equal(model, alias)) {
+ model = alias_target;
+ }
+
+ if (!g_ptr_array_find_with_equal_func(nic_models, model,
+ g_str_equal, NULL)) {
+ /* This NIC does not live on this bus. */
+ continue;
+ }
+
+ dev = qdev_new(model);
+ qdev_set_nic_properties(dev, nd);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
+ }
+
+ g_ptr_array_free(nic_models, true);
+}
+
static int (* const net_client_init_fun[NET_CLIENT_DRIVER__MAX])(
const Netdev *netdev,
const char *name,
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 04/47] hw/pci: add pci_init_nic_devices(), pci_init_nic_in_slot()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (2 preceding siblings ...)
2024-02-01 16:43 ` [PULL 03/47] net: add qemu_create_nic_bus_devices() David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 05/47] hw/i386/pc: use qemu_get_nic_info() and pci_init_nic_devices() David Woodhouse
` (43 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
The loop over nd_table[] to add PCI NICs is repeated in quite a few
places. Add a helper function to do it.
Some platforms also try to instantiate a specific model in a specific
slot, to match the real hardware. Add pci_init_nic_in_slot() for that
purpose.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
---
hw/pci/pci.c | 45 ++++++++++++++++++++++++++++++++++++++++++++
include/hw/pci/pci.h | 4 +++-
2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 76080af580..5849606f66 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -1925,6 +1925,51 @@ PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus,
return pci_dev;
}
+void pci_init_nic_devices(PCIBus *bus, const char *default_model)
+{
+ qemu_create_nic_bus_devices(&bus->qbus, TYPE_PCI_DEVICE, default_model,
+ "virtio", "virtio-net-pci");
+}
+
+bool pci_init_nic_in_slot(PCIBus *rootbus, const char *model,
+ const char *alias, const char *devaddr)
+{
+ NICInfo *nd = qemu_find_nic_info(model, true, alias);
+ int dom, busnr, devfn;
+ PCIDevice *pci_dev;
+ unsigned slot;
+ PCIBus *bus;
+
+ if (!nd) {
+ return false;
+ }
+
+ if (!devaddr || pci_parse_devaddr(devaddr, &dom, &busnr, &slot, NULL) < 0) {
+ error_report("Invalid PCI device address %s for device %s",
+ devaddr, model);
+ exit(1);
+ }
+
+ if (dom != 0) {
+ error_report("No support for non-zero PCI domains");
+ exit(1);
+ }
+
+ devfn = PCI_DEVFN(slot, 0);
+
+ bus = pci_find_bus_nr(rootbus, busnr);
+ if (!bus) {
+ error_report("Invalid PCI device address %s for device %s",
+ devaddr, model);
+ exit(1);
+ }
+
+ pci_dev = pci_new(devfn, model);
+ qdev_set_nic_properties(&pci_dev->qdev, nd);
+ pci_realize_and_unref(pci_dev, bus, &error_fatal);
+ return true;
+}
+
PCIDevice *pci_vga_init(PCIBus *bus)
{
vga_interface_created = true;
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index fa6313aabc..6ff0b95a02 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -317,7 +317,9 @@ void pci_device_reset(PCIDevice *dev);
PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus,
const char *default_model,
const char *default_devaddr);
-
+void pci_init_nic_devices(PCIBus *bus, const char *default_model);
+bool pci_init_nic_in_slot(PCIBus *rootbus, const char *default_model,
+ const char *alias, const char *devaddr);
PCIDevice *pci_vga_init(PCIBus *bus);
static inline PCIBus *pci_get_bus(const PCIDevice *dev)
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 05/47] hw/i386/pc: use qemu_get_nic_info() and pci_init_nic_devices()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (3 preceding siblings ...)
2024-02-01 16:43 ` [PULL 04/47] hw/pci: add pci_init_nic_devices(), pci_init_nic_in_slot() David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 06/47] hw/xen: use qemu_create_nic_bus_devices() to instantiate Xen NICs David Woodhouse
` (42 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Eliminate direct access to nd_table[] and nb_nics by processing the the
Xen and ISA NICs first and then calling pci_init_nic_devices() for the
rest.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
---
hw/i386/pc.c | 31 +++++++++++++++++++------------
include/hw/net/ne2000-isa.h | 2 --
2 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 803244e5cc..ebb0b1c667 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -654,15 +654,19 @@ static const int ne2000_io[NE2000_NB_MAX] = { 0x300, 0x320, 0x340, 0x360,
0x280, 0x380 };
static const int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 };
-static void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd)
+static gboolean pc_init_ne2k_isa(ISABus *bus, NICInfo *nd, Error **errp)
{
static int nb_ne2k = 0;
- if (nb_ne2k == NE2000_NB_MAX)
- return;
+ if (nb_ne2k == NE2000_NB_MAX) {
+ error_setg(errp,
+ "maximum number of ISA NE2000 devices exceeded");
+ return false;
+ }
isa_ne2000_init(bus, ne2000_io[nb_ne2k],
ne2000_irq[nb_ne2k], nd);
nb_ne2k++;
+ return true;
}
void pc_acpi_smi_interrupt(void *opaque, int irq, int level)
@@ -1297,23 +1301,26 @@ void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus,
BusState *xen_bus)
{
MachineClass *mc = MACHINE_CLASS(pcmc);
- int i;
+ bool default_is_ne2k = g_str_equal(mc->default_nic, TYPE_ISA_NE2000);
+ NICInfo *nd;
rom_set_order_override(FW_CFG_ORDER_OVERRIDE_NIC);
- for (i = 0; i < nb_nics; i++) {
- NICInfo *nd = &nd_table[i];
- const char *model = nd->model ? nd->model : mc->default_nic;
- if (xen_bus && (!nd->model || g_str_equal(model, "xen-net-device"))) {
+ if (xen_bus) {
+ while ((nd = qemu_find_nic_info("xen-net-device", true, NULL))) {
DeviceState *dev = qdev_new("xen-net-device");
qdev_set_nic_properties(dev, nd);
qdev_realize_and_unref(dev, xen_bus, &error_fatal);
- } else if (g_str_equal(model, "ne2k_isa")) {
- pc_init_ne2k_isa(isa_bus, nd);
- } else {
- pci_nic_init_nofail(nd, pci_bus, model, NULL);
}
}
+
+ while ((nd = qemu_find_nic_info(TYPE_ISA_NE2000, default_is_ne2k, NULL))) {
+ pc_init_ne2k_isa(isa_bus, nd, &error_fatal);
+ }
+
+ /* Anything remaining should be a PCI NIC */
+ pci_init_nic_devices(pci_bus, mc->default_nic);
+
rom_reset_order_override();
}
diff --git a/include/hw/net/ne2000-isa.h b/include/hw/net/ne2000-isa.h
index af59ee0b02..73bae10ad1 100644
--- a/include/hw/net/ne2000-isa.h
+++ b/include/hw/net/ne2000-isa.h
@@ -22,8 +22,6 @@ static inline ISADevice *isa_ne2000_init(ISABus *bus, int base, int irq,
{
ISADevice *d;
- qemu_check_nic_model(nd, "ne2k_isa");
-
d = isa_try_new(TYPE_ISA_NE2000);
if (d) {
DeviceState *dev = DEVICE(d);
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 06/47] hw/xen: use qemu_create_nic_bus_devices() to instantiate Xen NICs
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (4 preceding siblings ...)
2024-02-01 16:43 ` [PULL 05/47] hw/i386/pc: use qemu_get_nic_info() and pci_init_nic_devices() David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 07/47] hw/alpha/dp264: use pci_init_nic_devices() David Woodhouse
` (41 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
When instantiating XenBus itself, for each NIC which is configured with
either the model unspecified, or set to to "xen" or "xen-net-device",
create a corresponding xen-net-device for it.
Now we can revert the previous more hackish version which relied on the
platform code explicitly registering the NICs on its own XenBus, having
returned the BusState* from xen_bus_init() itself.
This also fixes the setup for Xen PV guests, which was previously broken
in various ways and never actually managed to peer with the netdev.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
---
hw/i386/pc.c | 13 ++-----------
hw/i386/pc_piix.c | 2 +-
hw/i386/pc_q35.c | 2 +-
hw/xen/xen-bus.c | 6 ++++--
hw/xen/xen_devconfig.c | 25 -------------------------
hw/xenpv/xen_machine_pv.c | 9 ---------
include/hw/i386/pc.h | 4 +---
include/hw/xen/xen-bus.h | 2 +-
include/hw/xen/xen-legacy-backend.h | 1 -
9 files changed, 10 insertions(+), 54 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index ebb0b1c667..196827531a 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1269,7 +1269,7 @@ void pc_basic_device_init(struct PCMachineState *pcms,
if (pcms->bus) {
pci_create_simple(pcms->bus, -1, "xen-platform");
}
- pcms->xenbus = xen_bus_init();
+ xen_bus_init();
xen_be_init();
}
#endif
@@ -1297,8 +1297,7 @@ void pc_basic_device_init(struct PCMachineState *pcms,
pcms->vmport != ON_OFF_AUTO_ON);
}
-void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus,
- BusState *xen_bus)
+void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus)
{
MachineClass *mc = MACHINE_CLASS(pcmc);
bool default_is_ne2k = g_str_equal(mc->default_nic, TYPE_ISA_NE2000);
@@ -1306,14 +1305,6 @@ void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus,
rom_set_order_override(FW_CFG_ORDER_OVERRIDE_NIC);
- if (xen_bus) {
- while ((nd = qemu_find_nic_info("xen-net-device", true, NULL))) {
- DeviceState *dev = qdev_new("xen-net-device");
- qdev_set_nic_properties(dev, nd);
- qdev_realize_and_unref(dev, xen_bus, &error_fatal);
- }
- }
-
while ((nd = qemu_find_nic_info(TYPE_ISA_NE2000, default_is_ne2k, NULL))) {
pc_init_ne2k_isa(isa_bus, nd, &error_fatal);
}
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index abfcfe4d2b..70d12bb1b5 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -339,7 +339,7 @@ static void pc_init1(MachineState *machine,
pc_basic_device_init(pcms, isa_bus, x86ms->gsi, rtc_state, true,
0x4);
- pc_nic_init(pcmc, isa_bus, pci_bus, pcms->xenbus);
+ pc_nic_init(pcmc, isa_bus, pci_bus);
if (pcmc->pci_enabled) {
pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index f43d5142b8..7ca3f465e0 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -340,7 +340,7 @@ static void pc_q35_init(MachineState *machine)
/* the rest devices to which pci devfn is automatically assigned */
pc_vga_init(isa_bus, host_bus);
- pc_nic_init(pcmc, isa_bus, host_bus, pcms->xenbus);
+ pc_nic_init(pcmc, isa_bus, host_bus);
if (machine->nvdimms_state->is_enabled) {
nvdimm_init_acpi_state(machine->nvdimms_state, system_io,
diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c
index 4973e7d9c9..fb82cc33e4 100644
--- a/hw/xen/xen-bus.c
+++ b/hw/xen/xen-bus.c
@@ -19,6 +19,7 @@
#include "qapi/error.h"
#include "qapi/qmp/qdict.h"
#include "sysemu/sysemu.h"
+#include "net/net.h"
#include "trace.h"
static char *xen_device_get_backend_path(XenDevice *xendev)
@@ -1133,7 +1134,7 @@ static void xen_register_types(void)
type_init(xen_register_types)
-BusState *xen_bus_init(void)
+void xen_bus_init(void)
{
DeviceState *dev = qdev_new(TYPE_XEN_BRIDGE);
BusState *bus = qbus_new(TYPE_XEN_BUS, dev, NULL);
@@ -1141,5 +1142,6 @@ BusState *xen_bus_init(void)
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
qbus_set_bus_hotplug_handler(bus);
- return bus;
+ qemu_create_nic_bus_devices(bus, TYPE_XEN_DEVICE, "xen-net-device",
+ "xen", "xen-net-device");
}
diff --git a/hw/xen/xen_devconfig.c b/hw/xen/xen_devconfig.c
index 3f77c675c6..2150869f60 100644
--- a/hw/xen/xen_devconfig.c
+++ b/hw/xen/xen_devconfig.c
@@ -46,31 +46,6 @@ static int xen_config_dev_all(char *fe, char *be)
/* ------------------------------------------------------------- */
-int xen_config_dev_nic(NICInfo *nic)
-{
- char fe[256], be[256];
- char mac[20];
- int vlan_id = -1;
-
- net_hub_id_for_client(nic->netdev, &vlan_id);
- snprintf(mac, sizeof(mac), "%02x:%02x:%02x:%02x:%02x:%02x",
- nic->macaddr.a[0], nic->macaddr.a[1], nic->macaddr.a[2],
- nic->macaddr.a[3], nic->macaddr.a[4], nic->macaddr.a[5]);
- xen_pv_printf(NULL, 1, "config nic %d: mac=\"%s\"\n", vlan_id, mac);
- xen_config_dev_dirs("vif", "qnic", vlan_id, fe, be, sizeof(fe));
-
- /* frontend */
- xenstore_write_int(fe, "handle", vlan_id);
- xenstore_write_str(fe, "mac", mac);
-
- /* backend */
- xenstore_write_int(be, "handle", vlan_id);
- xenstore_write_str(be, "mac", mac);
-
- /* common stuff */
- return xen_config_dev_all(fe, be);
-}
-
int xen_config_dev_vfb(int vdev, const char *type)
{
char fe[256], be[256];
diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c
index 9f9f137f99..1130d1a147 100644
--- a/hw/xenpv/xen_machine_pv.c
+++ b/hw/xenpv/xen_machine_pv.c
@@ -32,8 +32,6 @@
static void xen_init_pv(MachineState *machine)
{
- int i;
-
setup_xen_backend_ops();
/* Initialize backend core & drivers */
@@ -62,13 +60,6 @@ static void xen_init_pv(MachineState *machine)
vga_interface_created = true;
}
- /* configure nics */
- for (i = 0; i < nb_nics; i++) {
- if (!nd_table[i].model || 0 != strcmp(nd_table[i].model, "xen"))
- continue;
- xen_config_dev_nic(nd_table + i);
- }
-
xen_bus_init();
/* config cleanup hook */
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 916af29f7c..ec0e5efcb2 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -33,7 +33,6 @@ typedef struct PCMachineState {
/* Pointers to devices and objects: */
PCIBus *bus;
- BusState *xenbus;
I2CBus *smbus;
PFlashCFI01 *flash[2];
ISADevice *pcspk;
@@ -185,8 +184,7 @@ void pc_basic_device_init(struct PCMachineState *pcms,
void pc_cmos_init(PCMachineState *pcms,
BusState *ide0, BusState *ide1,
ISADevice *s);
-void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus,
- BusState *xen_bus);
+void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus);
void pc_i8259_create(ISABus *isa_bus, qemu_irq *i8259_irqs);
diff --git a/include/hw/xen/xen-bus.h b/include/hw/xen/xen-bus.h
index 334ddd1ff6..38d40afa37 100644
--- a/include/hw/xen/xen-bus.h
+++ b/include/hw/xen/xen-bus.h
@@ -75,7 +75,7 @@ struct XenBusClass {
OBJECT_DECLARE_TYPE(XenBus, XenBusClass,
XEN_BUS)
-BusState *xen_bus_init(void);
+void xen_bus_init(void);
void xen_device_backend_set_state(XenDevice *xendev,
enum xenbus_state state);
diff --git a/include/hw/xen/xen-legacy-backend.h b/include/hw/xen/xen-legacy-backend.h
index fc42146bc2..2cca174778 100644
--- a/include/hw/xen/xen-legacy-backend.h
+++ b/include/hw/xen/xen-legacy-backend.h
@@ -81,7 +81,6 @@ extern struct XenDevOps xen_usb_ops; /* xen-usb.c */
/* configuration (aka xenbus setup) */
void xen_config_cleanup(void);
-int xen_config_dev_nic(NICInfo *nic);
int xen_config_dev_vfb(int vdev, const char *type);
int xen_config_dev_vkbd(int vdev);
int xen_config_dev_console(int vdev);
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 07/47] hw/alpha/dp264: use pci_init_nic_devices()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (5 preceding siblings ...)
2024-02-01 16:43 ` [PULL 06/47] hw/xen: use qemu_create_nic_bus_devices() to instantiate Xen NICs David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 08/47] hw/arm/sbsa-ref: " David Woodhouse
` (40 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/alpha/dp264.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index 03495e1e60..52a1fa310b 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -124,9 +124,7 @@ static void clipper_init(MachineState *machine)
pci_vga_init(pci_bus);
/* Network setup. e1000 is good enough, failing Tulip support. */
- for (i = 0; i < nb_nics; i++) {
- pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
- }
+ pci_init_nic_devices(pci_bus, mc->default_nic);
/* Super I/O */
isa_create_simple(isa_bus, TYPE_SMC37C669_SUPERIO);
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 08/47] hw/arm/sbsa-ref: use pci_init_nic_devices()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (6 preceding siblings ...)
2024-02-01 16:43 ` [PULL 07/47] hw/alpha/dp264: use pci_init_nic_devices() David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 09/47] hw/arm/virt: " David Woodhouse
` (39 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>
---
hw/arm/sbsa-ref.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
index 85cb68d546..f2adf30337 100644
--- a/hw/arm/sbsa-ref.c
+++ b/hw/arm/sbsa-ref.c
@@ -673,9 +673,7 @@ static void create_pcie(SBSAMachineState *sms)
pci = PCI_HOST_BRIDGE(dev);
if (pci->bus) {
- for (i = 0; i < nb_nics; i++) {
- pci_nic_init_nofail(&nd_table[i], pci->bus, mc->default_nic, NULL);
- }
+ pci_init_nic_devices(pci->bus, mc->default_nic);
}
pci_create_simple(pci->bus, -1, "bochs-display");
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 09/47] hw/arm/virt: use pci_init_nic_devices()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (7 preceding siblings ...)
2024-02-01 16:43 ` [PULL 08/47] hw/arm/sbsa-ref: " David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 10/47] hw/hppa: " David Woodhouse
` (38 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/arm/virt.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index e6ead2c5c8..368c2a415a 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1457,9 +1457,7 @@ static void create_pcie(VirtMachineState *vms)
pci->bypass_iommu = vms->default_bus_bypass_iommu;
vms->bus = pci->bus;
if (vms->bus) {
- for (i = 0; i < nb_nics; i++) {
- pci_nic_init_nofail(&nd_table[i], pci->bus, mc->default_nic, NULL);
- }
+ pci_init_nic_devices(pci->bus, mc->default_nic);
}
nodename = vms->pciehb_nodename = g_strdup_printf("/pcie@%" PRIx64, base);
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 10/47] hw/hppa: use pci_init_nic_devices()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (8 preceding siblings ...)
2024-02-01 16:43 ` [PULL 09/47] hw/arm/virt: " David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 11/47] hw/loongarch: " David Woodhouse
` (37 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/hppa/machine.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 9e611620cc..a1045b48cc 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -342,7 +342,6 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
uint64_t kernel_entry = 0, kernel_low, kernel_high;
MemoryRegion *addr_space = get_system_memory();
MemoryRegion *rom_region;
- long i;
unsigned int smp_cpus = machine->smp.cpus;
SysBusDevice *s;
@@ -368,10 +367,8 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA));
}
- for (i = 0; i < nb_nics; i++) {
- if (!enable_lasi_lan()) {
- pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
- }
+ if (!enable_lasi_lan()) {
+ pci_init_nic_devices(pci_bus, mc->default_nic);
}
/* BMC board: HP Powerbar SP2 Diva (with console only) */
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 11/47] hw/loongarch: use pci_init_nic_devices()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (9 preceding siblings ...)
2024-02-01 16:43 ` [PULL 10/47] hw/hppa: " David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 12/47] hw/mips/fuloong2e: " David Woodhouse
` (36 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/virt.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index c9a680e61a..0ad7d8c887 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -504,9 +504,7 @@ static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState *
fdt_add_uart_node(lams);
/* Network init */
- for (i = 0; i < nb_nics; i++) {
- pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
- }
+ pci_init_nic_devices(pci_bus, mc->default_nic);
/*
* There are some invalid guest memory access.
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 12/47] hw/mips/fuloong2e: use pci_init_nic_devices()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (10 preceding siblings ...)
2024-02-01 16:43 ` [PULL 11/47] hw/loongarch: " David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 13/47] hw/mips/malta: " David Woodhouse
` (35 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
The previous behaviour was: *if* the first NIC specified on the command
line was an RTL8139 (or unspecified model) then it gets assigned to PCI
slot 7, which is where the Fuloong board had an RTL8139. All other
devices (including the first, if it was specified as anything other than
an rtl8319) get dynamically assigned on the bus.
The new behaviour is subtly different: If the first NIC was given a
specific model *other* than rtl8139, and a subsequent NIC was not,
then the rtl8139 (or unspecified) NIC will go to slot 7 and the rest
will be dynamically assigned.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/mips/fuloong2e.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
index 97b2c8ed8e..a45aac368c 100644
--- a/hw/mips/fuloong2e.c
+++ b/hw/mips/fuloong2e.c
@@ -201,19 +201,9 @@ static void main_cpu_reset(void *opaque)
/* Network support */
static void network_init(PCIBus *pci_bus)
{
- int i;
-
- for (i = 0; i < nb_nics; i++) {
- NICInfo *nd = &nd_table[i];
- const char *default_devaddr = NULL;
-
- if (i == 0 && (!nd->model || strcmp(nd->model, "rtl8139") == 0)) {
- /* The Fuloong board has a RTL8139 card using PCI SLOT 7 */
- default_devaddr = "07";
- }
-
- pci_nic_init_nofail(nd, pci_bus, "rtl8139", default_devaddr);
- }
+ /* The Fuloong board has a RTL8139 card using PCI SLOT 7 */
+ pci_init_nic_in_slot(pci_bus, "rtl8139", NULL, "07");
+ pci_init_nic_devices(pci_bus, "rtl8139");
}
static void mips_fuloong2e_init(MachineState *machine)
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 13/47] hw/mips/malta: use pci_init_nic_devices()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (11 preceding siblings ...)
2024-02-01 16:43 ` [PULL 12/47] hw/mips/fuloong2e: " David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 14/47] hw/mips/loongson3_virt: " David Woodhouse
` (34 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
The Malta board setup code would previously place the first NIC into PCI
slot 11 if was a PCNet card, and the rest (including the first if it was
anything other than a PCNet card) would be dynamically assigned.
Now it will place any PCNet NIC into slot 11, and then anything else will
be dynamically assigned.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/mips/malta.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index d22bb1edef..af74008c82 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -612,18 +612,9 @@ static MaltaFPGAState *malta_fpga_init(MemoryRegion *address_space,
/* Network support */
static void network_init(PCIBus *pci_bus)
{
- int i;
-
- for (i = 0; i < nb_nics; i++) {
- NICInfo *nd = &nd_table[i];
- const char *default_devaddr = NULL;
-
- if (i == 0 && (!nd->model || strcmp(nd->model, "pcnet") == 0))
- /* The malta board has a PCNet card using PCI SLOT 11 */
- default_devaddr = "0b";
-
- pci_nic_init_nofail(nd, pci_bus, "pcnet", default_devaddr);
- }
+ /* The malta board has a PCNet card using PCI SLOT 11 */
+ pci_init_nic_in_slot(pci_bus, "pcnet", NULL, "0b");
+ pci_init_nic_devices(pci_bus, "pcnet");
}
static void bl_setup_gt64120_jump_kernel(void **p, uint64_t run_addr,
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 14/47] hw/mips/loongson3_virt: use pci_init_nic_devices()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (12 preceding siblings ...)
2024-02-01 16:43 ` [PULL 13/47] hw/mips/malta: " David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 15/47] hw/ppc/prep: " David Woodhouse
` (33 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/mips/loongson3_virt.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c
index 33eae01eca..caedde2df0 100644
--- a/hw/mips/loongson3_virt.c
+++ b/hw/mips/loongson3_virt.c
@@ -451,9 +451,7 @@ static inline void loongson3_virt_devices_init(MachineState *machine,
usb_create_simple(usb_bus_find(-1), "usb-tablet");
}
- for (i = 0; i < nb_nics; i++) {
- pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
- }
+ pci_init_nic_devices(pci_bus, mc->default_nic);
}
static void mips_loongson3_virt_init(MachineState *machine)
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 15/47] hw/ppc/prep: use pci_init_nic_devices()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (13 preceding siblings ...)
2024-02-01 16:43 ` [PULL 14/47] hw/mips/loongson3_virt: " David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 16/47] hw/ppc/spapr: use qemu_get_nic_info() and pci_init_nic_devices() David Woodhouse
` (32 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Previously, the first PCI NIC would be placed in PCI slot 3 and the rest
would be dynamically assigned. Even if the user overrode the default NIC
type and made it something other than PCNet.
Now, the first PCNet NIC (that is, anything not explicitly specified
to be anything different) will go to slot 3 even if it isn't the first
NIC specified on the command line. And anything else will be dynamically
assigned.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/ppc/prep.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 137276bcb9..1a6cd05c61 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -241,7 +241,6 @@ static void ibm_40p_init(MachineState *machine)
ISADevice *isa_dev;
ISABus *isa_bus;
void *fw_cfg;
- int i;
uint32_t kernel_base = 0, initrd_base = 0;
long kernel_size = 0, initrd_size = 0;
char boot_device;
@@ -336,10 +335,9 @@ static void ibm_40p_init(MachineState *machine)
/* XXX: s3-trio at PCI_DEVFN(2, 0) */
pci_vga_init(pci_bus);
- for (i = 0; i < nb_nics; i++) {
- pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic,
- i == 0 ? "3" : NULL);
- }
+ /* First PCNET device at PCI_DEVFN(3, 0) */
+ pci_init_nic_in_slot(pci_bus, mc->default_nic, NULL, "3");
+ pci_init_nic_devices(pci_bus, mc->default_nic);
}
/* Prepare firmware configuration for OpenBIOS */
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 16/47] hw/ppc/spapr: use qemu_get_nic_info() and pci_init_nic_devices()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (14 preceding siblings ...)
2024-02-01 16:43 ` [PULL 15/47] hw/ppc/prep: " David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 17/47] hw/ppc: use pci_init_nic_devices() David Woodhouse
` (31 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Avoid directly referencing nd_table[] by first instantiating any
spapr-vlan devices using a qemu_get_nic_info() loop, then calling
pci_init_nic_devices() to do the rest.
No functional change intended.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/ppc/spapr.c | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index e8dabc8614..0d72d286d8 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2796,6 +2796,7 @@ static void spapr_machine_init(MachineState *machine)
MemoryRegion *sysmem = get_system_memory();
long load_limit, fw_size;
Error *resize_hpt_err = NULL;
+ NICInfo *nd;
if (!filename) {
error_report("Could not find LPAR firmware '%s'", bios_name);
@@ -2996,21 +2997,12 @@ static void spapr_machine_init(MachineState *machine)
phb = spapr_create_default_phb();
- for (i = 0; i < nb_nics; i++) {
- NICInfo *nd = &nd_table[i];
-
- if (!nd->model) {
- nd->model = g_strdup("spapr-vlan");
- }
-
- if (g_str_equal(nd->model, "spapr-vlan") ||
- g_str_equal(nd->model, "ibmveth")) {
- spapr_vlan_create(spapr->vio_bus, nd);
- } else {
- pci_nic_init_nofail(&nd_table[i], phb->bus, nd->model, NULL);
- }
+ while ((nd = qemu_find_nic_info("spapr-vlan", true, "ibmveth"))) {
+ spapr_vlan_create(spapr->vio_bus, nd);
}
+ pci_init_nic_devices(phb->bus, NULL);
+
for (i = 0; i <= drive_get_max_bus(IF_SCSI); i++) {
spapr_vscsi_create(spapr->vio_bus);
}
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 17/47] hw/ppc: use pci_init_nic_devices()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (15 preceding siblings ...)
2024-02-01 16:43 ` [PULL 16/47] hw/ppc/spapr: use qemu_get_nic_info() and pci_init_nic_devices() David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 18/47] hw/sh4/r2d: " David Woodhouse
` (30 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/ppc/e500.c | 4 +---
hw/ppc/mac_newworld.c | 4 +---
hw/ppc/mac_oldworld.c | 4 +---
hw/ppc/ppc440_bamboo.c | 14 +++++---------
4 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 566f1200dd..3bd12b54ab 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -1079,9 +1079,7 @@ void ppce500_init(MachineState *machine)
if (pci_bus) {
/* Register network interfaces. */
- for (i = 0; i < nb_nics; i++) {
- pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
- }
+ pci_init_nic_devices(pci_bus, mc->default_nic);
}
/* Register spinning region */
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 535710314a..b36dbaf2b6 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -444,9 +444,7 @@ static void ppc_core99_init(MachineState *machine)
graphic_depth = 15;
}
- for (i = 0; i < nb_nics; i++) {
- pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
- }
+ pci_init_nic_devices(pci_bus, mc->default_nic);
/* The NewWorld NVRAM is not located in the MacIO device */
if (kvm_enabled() && qemu_real_host_page_size() > 4096) {
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 9acc7adfc9..1981d3d8f6 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -277,9 +277,7 @@ static void ppc_heathrow_init(MachineState *machine)
pci_vga_init(pci_bus);
- for (i = 0; i < nb_nics; i++) {
- pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
- }
+ pci_init_nic_devices(pci_bus, mc->default_nic);
/* MacIO IDE */
ide_drive_get(hd, ARRAY_SIZE(hd));
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index a189942de4..c75c3083e6 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -161,7 +161,6 @@ static void bamboo_init(MachineState *machine)
DeviceState *uicdev;
SysBusDevice *uicsbd;
int success;
- int i;
if (kvm_enabled()) {
error_report("machine %s does not support the KVM accelerator",
@@ -234,14 +233,11 @@ static void bamboo_init(MachineState *machine)
}
if (pcibus) {
- /* Register network interfaces. */
- for (i = 0; i < nb_nics; i++) {
- /*
- * There are no PCI NICs on the Bamboo board, but there are
- * PCI slots, so we can pick whatever default model we want.
- */
- pci_nic_init_nofail(&nd_table[i], pcibus, mc->default_nic, NULL);
- }
+ /*
+ * There are no PCI NICs on the Bamboo board, but there are
+ * PCI slots, so we can pick whatever default model we want.
+ */
+ pci_init_nic_devices(pcibus, mc->default_nic);
}
/* Load kernel. */
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 18/47] hw/sh4/r2d: use pci_init_nic_devices()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (16 preceding siblings ...)
2024-02-01 16:43 ` [PULL 17/47] hw/ppc: use pci_init_nic_devices() David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 19/47] hw/sparc64/sun4u: " David Woodhouse
` (29 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Previously, the first PCI NIC would be assigned to slot 2 even if the
user override the model and made it something other than an rtl8139
which is the default. Everything else would be dynamically assigned.
Now, the first rtl8139 gets slot 2 and everything else is dynamic.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
hw/sh4/r2d.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 4944994e9c..e9f316a6ce 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -240,7 +240,6 @@ static void r2d_init(MachineState *machine)
MemoryRegion *sdram = g_new(MemoryRegion, 1);
qemu_irq *irq;
DriveInfo *dinfo;
- int i;
DeviceState *dev;
SysBusDevice *busdev;
MemoryRegion *address_space_mem = get_system_memory();
@@ -309,9 +308,8 @@ static void r2d_init(MachineState *machine)
0x555, 0x2aa, 0);
/* NIC: rtl8139 on-board, and 2 slots. */
- for (i = 0; i < nb_nics; i++)
- pci_nic_init_nofail(&nd_table[i], pci_bus,
- mc->default_nic, i == 0 ? "2" : NULL);
+ pci_init_nic_in_slot(pci_bus, mc->default_nic, NULL, "2");
+ pci_init_nic_devices(pci_bus, mc->default_nic);
/* USB keyboard */
usb_create_simple(usb_bus_find(-1), "usb-kbd");
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 19/47] hw/sparc64/sun4u: use pci_init_nic_devices()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (17 preceding siblings ...)
2024-02-01 16:43 ` [PULL 18/47] hw/sh4/r2d: " David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 20/47] hw/xtensa/virt: " David Woodhouse
` (28 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
The first sunhme NIC gets placed a function 1 on slot 1 of PCI bus A,
and the rest are dynamically assigned on PCI bus B.
Previously, any PCI NIC would get the special treatment purely by
virtue of being first in the list.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/sparc64/sun4u.c | 27 ++++++++-------------------
1 file changed, 8 insertions(+), 19 deletions(-)
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 24d53bf5fd..eda9b58a21 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -639,29 +639,18 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
memset(&macaddr, 0, sizeof(MACAddr));
onboard_nic = false;
- for (i = 0; i < nb_nics; i++) {
- PCIBus *bus;
- nd = &nd_table[i];
-
- if (!nd->model || strcmp(nd->model, mc->default_nic) == 0) {
- if (!onboard_nic) {
- pci_dev = pci_new_multifunction(PCI_DEVFN(1, 1), mc->default_nic);
- bus = pci_busA;
- memcpy(&macaddr, &nd->macaddr.a, sizeof(MACAddr));
- onboard_nic = true;
- } else {
- pci_dev = pci_new(-1, mc->default_nic);
- bus = pci_busB;
- }
- } else {
- pci_dev = pci_new(-1, nd->model);
- bus = pci_busB;
- }
+ nd = qemu_find_nic_info(mc->default_nic, true, NULL);
+ if (nd) {
+ pci_dev = pci_new_multifunction(PCI_DEVFN(1, 1), mc->default_nic);
dev = &pci_dev->qdev;
qdev_set_nic_properties(dev, nd);
- pci_realize_and_unref(pci_dev, bus, &error_fatal);
+ pci_realize_and_unref(pci_dev, pci_busA, &error_fatal);
+
+ memcpy(&macaddr, &nd->macaddr.a, sizeof(MACAddr));
+ onboard_nic = true;
}
+ pci_init_nic_devices(pci_busB, mc->default_nic);
/* If we don't have an onboard NIC, grab a default MAC address so that
* we have a valid machine id */
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 20/47] hw/xtensa/virt: use pci_init_nic_devices()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (18 preceding siblings ...)
2024-02-01 16:43 ` [PULL 19/47] hw/sparc64/sun4u: " David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 21/47] hw/arm/allwinner: use qemu_configure_nic_device() David Woodhouse
` (27 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/xtensa/virt.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/xtensa/virt.c b/hw/xtensa/virt.c
index a6cf646e99..5310a88861 100644
--- a/hw/xtensa/virt.c
+++ b/hw/xtensa/virt.c
@@ -102,9 +102,7 @@ static void create_pcie(MachineState *ms, CPUXtensaState *env, int irq_base,
pci = PCI_HOST_BRIDGE(dev);
if (pci->bus) {
- for (i = 0; i < nb_nics; i++) {
- pci_nic_init_nofail(&nd_table[i], pci->bus, mc->default_nic, NULL);
- }
+ pci_init_nic_devices(pci->bus, mc->default_nic);
}
}
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 21/47] hw/arm/allwinner: use qemu_configure_nic_device()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (19 preceding siblings ...)
2024-02-01 16:43 ` [PULL 20/47] hw/xtensa/virt: " David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 22/47] hw/arm/aspeed: " David Woodhouse
` (26 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/arm/allwinner-a10.c | 6 +-----
hw/arm/allwinner-h3.c | 6 +-----
hw/arm/allwinner-r40.c | 27 ++-------------------------
3 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c
index 581dd45edf..57d5d80159 100644
--- a/hw/arm/allwinner-a10.c
+++ b/hw/arm/allwinner-a10.c
@@ -138,11 +138,7 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)
sysbus_realize(SYS_BUS_DEVICE(&s->dramc), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->dramc), 0, AW_A10_DRAMC_BASE);
- /* FIXME use qdev NIC properties instead of nd_table[] */
- if (nd_table[0].used) {
- qemu_check_nic_model(&nd_table[0], TYPE_AW_EMAC);
- qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]);
- }
+ qemu_configure_nic_device(DEVICE(&s->emac), true, NULL);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->emac), errp)) {
return;
}
diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c
index 380e0ec11d..6870c3fe96 100644
--- a/hw/arm/allwinner-h3.c
+++ b/hw/arm/allwinner-h3.c
@@ -371,11 +371,7 @@ static void allwinner_h3_realize(DeviceState *dev, Error **errp)
"sd-bus");
/* EMAC */
- /* FIXME use qdev NIC properties instead of nd_table[] */
- if (nd_table[0].used) {
- qemu_check_nic_model(&nd_table[0], TYPE_AW_SUN8I_EMAC);
- qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]);
- }
+ qemu_configure_nic_device(DEVICE(&s->emac), true, NULL);
object_property_set_link(OBJECT(&s->emac), "dma-memory",
OBJECT(get_system_memory()), &error_fatal);
sysbus_realize(SYS_BUS_DEVICE(&s->emac), &error_fatal);
diff --git a/hw/arm/allwinner-r40.c b/hw/arm/allwinner-r40.c
index eef1fc196e..b8c7202133 100644
--- a/hw/arm/allwinner-r40.c
+++ b/hw/arm/allwinner-r40.c
@@ -318,7 +318,6 @@ static void allwinner_r40_init(Object *obj)
static void allwinner_r40_realize(DeviceState *dev, Error **errp)
{
- const char *r40_nic_models[] = { "gmac", "emac", NULL };
AwR40State *s = AW_R40(dev);
/* CPUs */
@@ -512,31 +511,8 @@ static void allwinner_r40_realize(DeviceState *dev, Error **errp)
sysbus_mmio_map(SYS_BUS_DEVICE(&s->dramc), 2,
s->memmap[AW_R40_DEV_DRAMPHY]);
- /* nic support gmac and emac */
- for (int i = 0; i < ARRAY_SIZE(r40_nic_models) - 1; i++) {
- NICInfo *nic = &nd_table[i];
-
- if (!nic->used) {
- continue;
- }
- if (qemu_show_nic_models(nic->model, r40_nic_models)) {
- exit(0);
- }
-
- switch (qemu_find_nic_model(nic, r40_nic_models, r40_nic_models[0])) {
- case 0: /* gmac */
- qdev_set_nic_properties(DEVICE(&s->gmac), nic);
- break;
- case 1: /* emac */
- qdev_set_nic_properties(DEVICE(&s->emac), nic);
- break;
- default:
- exit(1);
- break;
- }
- }
-
/* GMAC */
+ qemu_configure_nic_device(DEVICE(&s->gmac), true, "gmac");
object_property_set_link(OBJECT(&s->gmac), "dma-memory",
OBJECT(get_system_memory()), &error_fatal);
sysbus_realize(SYS_BUS_DEVICE(&s->gmac), &error_fatal);
@@ -545,6 +521,7 @@ static void allwinner_r40_realize(DeviceState *dev, Error **errp)
qdev_get_gpio_in(DEVICE(&s->gic), AW_R40_GIC_SPI_GMAC));
/* EMAC */
+ qemu_configure_nic_device(DEVICE(&s->emac), true, "emac");
sysbus_realize(SYS_BUS_DEVICE(&s->emac), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->emac), 0, s->memmap[AW_R40_DEV_EMAC]);
sysbus_connect_irq(SYS_BUS_DEVICE(&s->emac), 0,
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 22/47] hw/arm/aspeed: use qemu_configure_nic_device()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (20 preceding siblings ...)
2024-02-01 16:43 ` [PULL 21/47] hw/arm/allwinner: use qemu_configure_nic_device() David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 23/47] hw/arm/exynos4: use qemu_create_nic_device() David Woodhouse
` (25 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Acked-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
---
hw/arm/aspeed.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index cc59176563..bed5e4f40b 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -356,7 +356,6 @@ static void aspeed_machine_init(MachineState *machine)
AspeedMachineClass *amc = ASPEED_MACHINE_GET_CLASS(machine);
AspeedSoCClass *sc;
int i;
- NICInfo *nd = &nd_table[0];
bmc->soc = ASPEED_SOC(object_new(amc->soc_name));
object_property_add_child(OBJECT(machine), "soc", OBJECT(bmc->soc));
@@ -371,10 +370,10 @@ static void aspeed_machine_init(MachineState *machine)
&error_fatal);
for (i = 0; i < sc->macs_num; i++) {
- if ((amc->macs_mask & (1 << i)) && nd->used) {
- qemu_check_nic_model(nd, TYPE_FTGMAC100);
- qdev_set_nic_properties(DEVICE(&bmc->soc->ftgmac100[i]), nd);
- nd++;
+ if ((amc->macs_mask & (1 << i)) &&
+ !qemu_configure_nic_device(DEVICE(&bmc->soc->ftgmac100[i]),
+ true, NULL)) {
+ break; /* No configs left; stop asking */
}
}
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 23/47] hw/arm/exynos4: use qemu_create_nic_device()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (21 preceding siblings ...)
2024-02-01 16:43 ` [PULL 22/47] hw/arm/aspeed: " David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 24/47] hw/arm/fsl: use qemu_configure_nic_device() David Woodhouse
` (24 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/arm/exynos4_boards.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index b0e13eb4f0..003992189b 100644
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -76,10 +76,8 @@ static void lan9215_init(uint32_t base, qemu_irq irq)
SysBusDevice *s;
/* This should be a 9215 but the 9118 is close enough */
- if (nd_table[0].used) {
- qemu_check_nic_model(&nd_table[0], "lan9118");
- dev = qdev_new(TYPE_LAN9118);
- qdev_set_nic_properties(dev, &nd_table[0]);
+ dev = qemu_create_nic_device(TYPE_LAN9118, true, NULL);
+ if (dev) {
qdev_prop_set_uint32(dev, "mode_16bit", 1);
s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal);
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 24/47] hw/arm/fsl: use qemu_configure_nic_device()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (22 preceding siblings ...)
2024-02-01 16:43 ` [PULL 23/47] hw/arm/exynos4: use qemu_create_nic_device() David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 25/47] hw/net/smc91c111: " David Woodhouse
` (23 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/arm/fsl-imx25.c | 2 +-
hw/arm/fsl-imx6.c | 2 +-
hw/arm/fsl-imx6ul.c | 2 +-
hw/arm/fsl-imx7.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
index 4a49507ef1..5ed87edfe4 100644
--- a/hw/arm/fsl-imx25.c
+++ b/hw/arm/fsl-imx25.c
@@ -171,7 +171,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp)
object_property_set_uint(OBJECT(&s->fec), "phy-num", s->phy_num,
&error_abort);
- qdev_set_nic_properties(DEVICE(&s->fec), &nd_table[0]);
+ qemu_configure_nic_device(DEVICE(&s->fec), true, NULL);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->fec), errp)) {
return;
diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c
index b7f93d8d9c..85748cb233 100644
--- a/hw/arm/fsl-imx6.c
+++ b/hw/arm/fsl-imx6.c
@@ -388,7 +388,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
object_property_set_uint(OBJECT(&s->eth), "phy-num", s->phy_num,
&error_abort);
- qdev_set_nic_properties(DEVICE(&s->eth), &nd_table[0]);
+ qemu_configure_nic_device(DEVICE(&s->eth), true, NULL);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->eth), errp)) {
return;
}
diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c
index 343bd65d1b..19f443570b 100644
--- a/hw/arm/fsl-imx6ul.c
+++ b/hw/arm/fsl-imx6ul.c
@@ -473,7 +473,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)
s->phy_num[i], &error_abort);
object_property_set_uint(OBJECT(&s->eth[i]), "tx-ring-num",
FSL_IMX6UL_ETH_NUM_TX_RINGS, &error_abort);
- qdev_set_nic_properties(DEVICE(&s->eth[i]), &nd_table[i]);
+ qemu_configure_nic_device(DEVICE(&s->eth[i]), true, NULL);
sysbus_realize(SYS_BUS_DEVICE(&s->eth[i]), &error_abort);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->eth[i]), 0,
diff --git a/hw/arm/fsl-imx7.c b/hw/arm/fsl-imx7.c
index 5728109491..9f2ef34555 100644
--- a/hw/arm/fsl-imx7.c
+++ b/hw/arm/fsl-imx7.c
@@ -447,7 +447,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)
s->phy_num[i], &error_abort);
object_property_set_uint(OBJECT(&s->eth[i]), "tx-ring-num",
FSL_IMX7_ETH_NUM_TX_RINGS, &error_abort);
- qdev_set_nic_properties(DEVICE(&s->eth[i]), &nd_table[i]);
+ qemu_configure_nic_device(DEVICE(&s->eth[i]), true, NULL);
sysbus_realize(SYS_BUS_DEVICE(&s->eth[i]), &error_abort);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->eth[i]), 0, FSL_IMX7_ENETn_ADDR[i]);
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 25/47] hw/net/smc91c111: use qemu_configure_nic_device()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (23 preceding siblings ...)
2024-02-01 16:43 ` [PULL 24/47] hw/arm/fsl: use qemu_configure_nic_device() David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 26/47] hw/net/lan9118: " David Woodhouse
` (22 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Some callers instantiate the device unconditionally, others will do so only
if there is a NICInfo to go with it. This appears to be fairly random, but
preserve the existing behaviour of each caller for now.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/arm/gumstix.c | 6 ++----
hw/arm/integratorcp.c | 5 +++--
hw/arm/mainstone.c | 3 +--
hw/arm/realview.c | 25 ++++++++++---------------
hw/arm/versatilepb.c | 15 ++++-----------
hw/net/smc91c111.c | 5 ++---
include/hw/net/smc91c111.h | 2 +-
7 files changed, 23 insertions(+), 38 deletions(-)
diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
index 3f2bcaa24e..d5de5409e1 100644
--- a/hw/arm/gumstix.c
+++ b/hw/arm/gumstix.c
@@ -73,8 +73,7 @@ static void connex_init(MachineState *machine)
FLASH_SECTOR_SIZE, 2, 0, 0, 0, 0, 0);
/* Interrupt line of NIC is connected to GPIO line 36 */
- smc91c111_init(&nd_table[0], 0x04000300,
- qdev_get_gpio_in(cpu->gpio, 36));
+ smc91c111_init(0x04000300, qdev_get_gpio_in(cpu->gpio, 36));
}
static void verdex_init(MachineState *machine)
@@ -97,8 +96,7 @@ static void verdex_init(MachineState *machine)
FLASH_SECTOR_SIZE, 2, 0, 0, 0, 0, 0);
/* Interrupt line of NIC is connected to GPIO line 99 */
- smc91c111_init(&nd_table[0], 0x04000300,
- qdev_get_gpio_in(cpu->gpio, 99));
+ smc91c111_init(0x04000300, qdev_get_gpio_in(cpu->gpio, 99));
}
static void connex_class_init(ObjectClass *oc, void *data)
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index 793262eca8..f016d20485 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -666,8 +666,9 @@ static void integratorcp_init(MachineState *machine)
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0x1d000000);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[25]);
- if (nd_table[0].used)
- smc91c111_init(&nd_table[0], 0xc8000000, pic[27]);
+ if (qemu_find_nic_info("smc91c111", true, NULL)) {
+ smc91c111_init(0xc8000000, pic[27]);
+ }
sysbus_create_simple("pl110", 0xc0000000, pic[22]);
diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index fc14e05060..d2e2e68aa3 100644
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -152,8 +152,7 @@ static void mainstone_common_init(MachineState *machine,
qdev_get_gpio_in(mst_irq, S1_IRQ),
qdev_get_gpio_in(mst_irq, S1_CD_IRQ));
- smc91c111_init(&nd_table[0], MST_ETH_PHYS,
- qdev_get_gpio_in(mst_irq, ETHERNET_IRQ));
+ smc91c111_init(MST_ETH_PHYS, qdev_get_gpio_in(mst_irq, ETHERNET_IRQ));
mainstone_binfo.board_id = arm_id;
arm_load_kernel(mpu->cpu, machine, &mainstone_binfo);
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index 566deff9ce..c6bd6e5961 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -90,7 +90,6 @@ static void realview_init(MachineState *machine,
I2CBus *i2c;
int n;
unsigned int smp_cpus = machine->smp.cpus;
- int done_nic = 0;
qemu_irq cpu_irq[4];
int is_mpcore = 0;
int is_pb = 0;
@@ -296,24 +295,20 @@ static void realview_init(MachineState *machine,
n--;
}
}
- for(n = 0; n < nb_nics; n++) {
- nd = &nd_table[n];
-
- if (!done_nic && (!nd->model ||
- strcmp(nd->model, is_pb ? "lan9118" : "smc91c111") == 0)) {
- if (is_pb) {
- lan9118_init(nd, 0x4e000000, pic[28]);
- } else {
- smc91c111_init(nd, 0x4e000000, pic[28]);
- }
- done_nic = 1;
+
+ nd = qemu_find_nic_info(is_pb ? "lan9118" : "smc91c111", true, NULL);
+ if (nd) {
+ if (is_pb) {
+ lan9118_init(nd, 0x4e000000, pic[28]);
} else {
- if (pci_bus) {
- pci_nic_init_nofail(nd, pci_bus, "rtl8139", NULL);
- }
+ smc91c111_init(0x4e000000, pic[28]);
}
}
+ if (pci_bus) {
+ pci_init_nic_devices(pci_bus, "rtl8139");
+ }
+
dev = sysbus_create_simple(TYPE_ARM_SBCON_I2C, 0x10002000, NULL);
i2c = (I2CBus *)qdev_get_child_bus(dev, "i2c");
i2c_slave_create_simple(i2c, "ds1338", 0x68);
diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index 1d813aa23b..d10b75dfdb 100644
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -192,10 +192,8 @@ static void versatile_init(MachineState *machine, int board_id)
SysBusDevice *busdev;
DeviceState *pl041;
PCIBus *pci_bus;
- NICInfo *nd;
I2CBus *i2c;
int n;
- int done_smc = 0;
DriveInfo *dinfo;
if (machine->ram_size > 0x10000000) {
@@ -263,16 +261,11 @@ static void versatile_init(MachineState *machine, int board_id)
sysbus_connect_irq(busdev, 3, sic[30]);
pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci");
- for(n = 0; n < nb_nics; n++) {
- nd = &nd_table[n];
-
- if (!done_smc && (!nd->model || strcmp(nd->model, "smc91c111") == 0)) {
- smc91c111_init(nd, 0x10010000, sic[25]);
- done_smc = 1;
- } else {
- pci_nic_init_nofail(nd, pci_bus, "rtl8139", NULL);
- }
+ if (qemu_find_nic_info("smc91c111", true, NULL)) {
+ smc91c111_init(0x10010000, sic[25]);
}
+ pci_init_nic_devices(pci_bus, "rtl8139");
+
if (machine_usb(machine)) {
pci_create_simple(pci_bus, -1, "pci-ohci");
}
diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index 49b7c26102..702d0e8e83 100644
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -818,14 +818,13 @@ static void smc91c111_register_types(void)
/* Legacy helper function. Should go away when machine config files are
implemented. */
-void smc91c111_init(NICInfo *nd, uint32_t base, qemu_irq irq)
+void smc91c111_init(uint32_t base, qemu_irq irq)
{
DeviceState *dev;
SysBusDevice *s;
- qemu_check_nic_model(nd, "smc91c111");
dev = qdev_new(TYPE_SMC91C111);
- qdev_set_nic_properties(dev, nd);
+ qemu_configure_nic_device(dev, true, NULL);
s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal);
sysbus_mmio_map(s, 0, base);
diff --git a/include/hw/net/smc91c111.h b/include/hw/net/smc91c111.h
index df5b11dcef..dba32a233f 100644
--- a/include/hw/net/smc91c111.h
+++ b/include/hw/net/smc91c111.h
@@ -13,6 +13,6 @@
#include "net/net.h"
-void smc91c111_init(NICInfo *, uint32_t, qemu_irq);
+void smc91c111_init(uint32_t, qemu_irq);
#endif
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 26/47] hw/net/lan9118: use qemu_configure_nic_device()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (24 preceding siblings ...)
2024-02-01 16:43 ` [PULL 25/47] hw/net/smc91c111: " David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 27/47] hw/arm/highbank: use qemu_create_nic_device() David Woodhouse
` (21 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Some callers instantiate the device unconditionally, others will do so only
if there is a NICInfo to go with it. This appears to be fairly random, but
preseve the existing behaviour for now.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/arm/kzm.c | 4 ++--
hw/arm/mps2.c | 2 +-
hw/arm/realview.c | 6 ++----
hw/arm/vexpress.c | 4 ++--
hw/net/lan9118.c | 5 ++---
include/hw/net/lan9118.h | 2 +-
6 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
index 9be91ebeaa..2ccd6f8a76 100644
--- a/hw/arm/kzm.c
+++ b/hw/arm/kzm.c
@@ -113,8 +113,8 @@ static void kzm_init(MachineState *machine)
alias_offset += ram[i].size;
}
- if (nd_table[0].used) {
- lan9118_init(&nd_table[0], KZM_LAN9118_ADDR,
+ if (qemu_find_nic_info("lan9118", true, NULL)) {
+ lan9118_init(KZM_LAN9118_ADDR,
qdev_get_gpio_in(DEVICE(&s->soc.avic), 52));
}
diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
index bd873cc5de..50919ee46d 100644
--- a/hw/arm/mps2.c
+++ b/hw/arm/mps2.c
@@ -456,7 +456,7 @@ static void mps2_common_init(MachineState *machine)
/* In hardware this is a LAN9220; the LAN9118 is software compatible
* except that it doesn't support the checksum-offload feature.
*/
- lan9118_init(&nd_table[0], mmc->ethernet_base,
+ lan9118_init(mmc->ethernet_base,
qdev_get_gpio_in(armv7m,
mmc->fpga_type == FPGA_AN511 ? 47 : 13));
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index c6bd6e5961..9058f5b414 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -85,7 +85,6 @@ static void realview_init(MachineState *machine,
SysBusDevice *busdev;
qemu_irq pic[64];
PCIBus *pci_bus = NULL;
- NICInfo *nd;
DriveInfo *dinfo;
I2CBus *i2c;
int n;
@@ -296,10 +295,9 @@ static void realview_init(MachineState *machine,
}
}
- nd = qemu_find_nic_info(is_pb ? "lan9118" : "smc91c111", true, NULL);
- if (nd) {
+ if (qemu_find_nic_info(is_pb ? "lan9118" : "smc91c111", true, NULL)) {
if (is_pb) {
- lan9118_init(nd, 0x4e000000, pic[28]);
+ lan9118_init(0x4e000000, pic[28]);
} else {
smc91c111_init(0x4e000000, pic[28]);
}
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index f1b45245d5..e5fb3ab1f9 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -679,8 +679,8 @@ static void vexpress_common_init(MachineState *machine)
memory_region_add_subregion(sysmem, map[VE_VIDEORAM], &vms->vram);
/* 0x4e000000 LAN9118 Ethernet */
- if (nd_table[0].used) {
- lan9118_init(&nd_table[0], map[VE_ETHERNET], pic[15]);
+ if (qemu_find_nic_info("lan9118", true, NULL)) {
+ lan9118_init(map[VE_ETHERNET], pic[15]);
}
/* VE_USB: not modelled */
diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index 598dd79e17..47ff25b441 100644
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -1408,14 +1408,13 @@ static void lan9118_register_types(void)
/* Legacy helper function. Should go away when machine config files are
implemented. */
-void lan9118_init(NICInfo *nd, uint32_t base, qemu_irq irq)
+void lan9118_init(uint32_t base, qemu_irq irq)
{
DeviceState *dev;
SysBusDevice *s;
- qemu_check_nic_model(nd, "lan9118");
dev = qdev_new(TYPE_LAN9118);
- qdev_set_nic_properties(dev, nd);
+ qemu_configure_nic_device(dev, true, NULL);
s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal);
sysbus_mmio_map(s, 0, base);
diff --git a/include/hw/net/lan9118.h b/include/hw/net/lan9118.h
index 3d0c67f339..4bf9da7a63 100644
--- a/include/hw/net/lan9118.h
+++ b/include/hw/net/lan9118.h
@@ -15,6 +15,6 @@
#define TYPE_LAN9118 "lan9118"
-void lan9118_init(NICInfo *, uint32_t, qemu_irq);
+void lan9118_init(uint32_t, qemu_irq);
#endif
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 27/47] hw/arm/highbank: use qemu_create_nic_device()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (25 preceding siblings ...)
2024-02-01 16:43 ` [PULL 26/47] hw/net/lan9118: " David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 28/47] hw/arm/npcm7xx: use qemu_configure_nic_device, allow emc0/emc1 as aliases David Woodhouse
` (20 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/arm/highbank.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index e6e27d69af..e12374766e 100644
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -297,19 +297,17 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
sysbus_create_simple(TYPE_SYSBUS_AHCI, 0xffe08000, pic[83]);
- if (nd_table[0].used) {
- qemu_check_nic_model(&nd_table[0], "xgmac");
- dev = qdev_new("xgmac");
- qdev_set_nic_properties(dev, &nd_table[0]);
+ dev = qemu_create_nic_device("xgmac", true, NULL);
+ if (dev) {
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xfff50000);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[77]);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 1, pic[78]);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 2, pic[79]);
+ }
- qemu_check_nic_model(&nd_table[1], "xgmac");
- dev = qdev_new("xgmac");
- qdev_set_nic_properties(dev, &nd_table[1]);
+ dev = qemu_create_nic_device("xgmac", true, NULL);
+ if (dev) {
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xfff51000);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[80]);
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 28/47] hw/arm/npcm7xx: use qemu_configure_nic_device, allow emc0/emc1 as aliases
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (26 preceding siblings ...)
2024-02-01 16:43 ` [PULL 27/47] hw/arm/highbank: use qemu_create_nic_device() David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 29/47] hw/arm/stellaris: use qemu_find_nic_info() David Woodhouse
` (19 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Also update the test to specify which device to attach the test socket
to, and remove the comment lamenting the fact that we can't do so.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/arm/npcm7xx.c | 16 +++++++++-------
tests/qtest/npcm7xx_emc-test.c | 18 ++++--------------
2 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/hw/arm/npcm7xx.c b/hw/arm/npcm7xx.c
index e3243a520d..bdc609b5fb 100644
--- a/hw/arm/npcm7xx.c
+++ b/hw/arm/npcm7xx.c
@@ -656,8 +656,9 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp)
/*
* EMC Modules. Cannot fail.
- * The mapping of the device to its netdev backend works as follows:
- * emc[i] = nd_table[i]
+ * Use the available NIC configurations in order, allowing 'emc0' and
+ * 'emc1' to by used as aliases for the model= parameter to override.
+ *
* This works around the inability to specify the netdev property for the
* emc device: it's not pluggable and thus the -device option can't be
* used.
@@ -665,12 +666,13 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp)
QEMU_BUILD_BUG_ON(ARRAY_SIZE(npcm7xx_emc_addr) != ARRAY_SIZE(s->emc));
QEMU_BUILD_BUG_ON(ARRAY_SIZE(s->emc) != 2);
for (i = 0; i < ARRAY_SIZE(s->emc); i++) {
- s->emc[i].emc_num = i;
SysBusDevice *sbd = SYS_BUS_DEVICE(&s->emc[i]);
- if (nd_table[i].used) {
- qemu_check_nic_model(&nd_table[i], TYPE_NPCM7XX_EMC);
- qdev_set_nic_properties(DEVICE(sbd), &nd_table[i]);
- }
+ char alias[6];
+
+ s->emc[i].emc_num = i;
+ snprintf(alias, sizeof(alias), "emc%u", i);
+ qemu_configure_nic_device(DEVICE(sbd), true, alias);
+
/*
* The device exists regardless of whether it's connected to a QEMU
* netdev backend. So always instantiate it even if there is no
diff --git a/tests/qtest/npcm7xx_emc-test.c b/tests/qtest/npcm7xx_emc-test.c
index b046f1d76a..f7646fae2c 100644
--- a/tests/qtest/npcm7xx_emc-test.c
+++ b/tests/qtest/npcm7xx_emc-test.c
@@ -225,21 +225,11 @@ static int *packet_test_init(int module_num, GString *cmd_line)
g_assert_cmpint(ret, != , -1);
/*
- * KISS and use -nic. We specify two nics (both emc{0,1}) because there's
- * currently no way to specify only emc1: The driver implicitly relies on
- * emc[i] == nd_table[i].
+ * KISS and use -nic. The driver accepts 'emc0' and 'emc1' as aliases
+ * in the 'model' field to specify the device to match.
*/
- if (module_num == 0) {
- g_string_append_printf(cmd_line,
- " -nic socket,fd=%d,model=" TYPE_NPCM7XX_EMC " "
- " -nic user,model=" TYPE_NPCM7XX_EMC " ",
- test_sockets[1]);
- } else {
- g_string_append_printf(cmd_line,
- " -nic user,model=" TYPE_NPCM7XX_EMC " "
- " -nic socket,fd=%d,model=" TYPE_NPCM7XX_EMC " ",
- test_sockets[1]);
- }
+ g_string_append_printf(cmd_line, " -nic socket,fd=%d,model=emc%d ",
+ test_sockets[1], module_num);
g_test_queue_destroy(packet_test_clear, test_sockets);
return test_sockets;
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 29/47] hw/arm/stellaris: use qemu_find_nic_info()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (27 preceding siblings ...)
2024-02-01 16:43 ` [PULL 28/47] hw/arm/npcm7xx: use qemu_configure_nic_device, allow emc0/emc1 as aliases David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 30/47] hw/arm: use qemu_configure_nic_device() David Woodhouse
` (18 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Rather than just using qemu_configure_nic_device(), populate the MAC
address in the system-registers device by peeking at the NICInfo before
it's assigned to the device.
Generate the MAC address early, if there is no matching -nic option.
Otherwise the MAC address wouldn't be generated until net_client_init1()
runs.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/arm/stellaris.c | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index d18b1144af..34c5a86ac2 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -1028,7 +1028,8 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board)
DeviceState *ssys_dev;
int i;
int j;
- const uint8_t *macaddr;
+ NICInfo *nd;
+ MACAddr mac;
MemoryRegion *sram = g_new(MemoryRegion, 1);
MemoryRegion *flash = g_new(MemoryRegion, 1);
@@ -1051,12 +1052,22 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board)
* need its sysclk output.
*/
ssys_dev = qdev_new(TYPE_STELLARIS_SYS);
- /* Most devices come preprogrammed with a MAC address in the user data. */
- macaddr = nd_table[0].macaddr.a;
+
+ /*
+ * Most devices come preprogrammed with a MAC address in the user data.
+ * Generate a MAC address now, if there isn't a matching -nic for it.
+ */
+ nd = qemu_find_nic_info("stellaris_enet", true, "stellaris");
+ if (nd) {
+ memcpy(mac.a, nd->macaddr.a, sizeof(mac.a));
+ } else {
+ qemu_macaddr_default_if_unset(&mac);
+ }
+
qdev_prop_set_uint32(ssys_dev, "user0",
- macaddr[0] | (macaddr[1] << 8) | (macaddr[2] << 16));
+ mac.a[0] | (mac.a[1] << 8) | (mac.a[2] << 16));
qdev_prop_set_uint32(ssys_dev, "user1",
- macaddr[3] | (macaddr[4] << 8) | (macaddr[5] << 16));
+ mac.a[3] | (mac.a[4] << 8) | (mac.a[5] << 16));
qdev_prop_set_uint32(ssys_dev, "did0", board->did0);
qdev_prop_set_uint32(ssys_dev, "did1", board->did1);
qdev_prop_set_uint32(ssys_dev, "dc0", board->dc0);
@@ -1269,10 +1280,13 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board)
if (board->dc4 & (1 << 28)) {
DeviceState *enet;
- qemu_check_nic_model(&nd_table[0], "stellaris");
-
enet = qdev_new("stellaris_enet");
- qdev_set_nic_properties(enet, &nd_table[0]);
+ if (nd) {
+ qdev_set_nic_properties(enet, nd);
+ } else {
+ qdev_prop_set_macaddr(enet, "mac", mac.a);
+ }
+
sysbus_realize_and_unref(SYS_BUS_DEVICE(enet), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(enet), 0, 0x40048000);
sysbus_connect_irq(SYS_BUS_DEVICE(enet), 0, qdev_get_gpio_in(nvic, 42));
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 30/47] hw/arm: use qemu_configure_nic_device()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (28 preceding siblings ...)
2024-02-01 16:43 ` [PULL 29/47] hw/arm/stellaris: use qemu_find_nic_info() David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 31/47] hw/net/etraxfs-eth: " David Woodhouse
` (17 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/arm/mps2-tz.c | 8 ++------
hw/arm/msf2-soc.c | 6 +-----
hw/arm/musicpal.c | 3 +--
hw/arm/xilinx_zynq.c | 11 ++++-------
hw/arm/xlnx-versal.c | 7 +------
hw/arm/xlnx-zynqmp.c | 8 +-------
6 files changed, 10 insertions(+), 33 deletions(-)
diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c
index 5d8cdc1a4c..a2d18afd79 100644
--- a/hw/arm/mps2-tz.c
+++ b/hw/arm/mps2-tz.c
@@ -503,14 +503,12 @@ static MemoryRegion *make_eth_dev(MPS2TZMachineState *mms, void *opaque,
const PPCExtraData *extradata)
{
SysBusDevice *s;
- NICInfo *nd = &nd_table[0];
/* In hardware this is a LAN9220; the LAN9118 is software compatible
* except that it doesn't support the checksum-offload feature.
*/
- qemu_check_nic_model(nd, "lan9118");
mms->lan9118 = qdev_new(TYPE_LAN9118);
- qdev_set_nic_properties(mms->lan9118, nd);
+ qemu_configure_nic_device(mms->lan9118, true, NULL);
s = SYS_BUS_DEVICE(mms->lan9118);
sysbus_realize_and_unref(s, &error_fatal);
@@ -528,7 +526,6 @@ static MemoryRegion *make_eth_usb(MPS2TZMachineState *mms, void *opaque,
* irqs[] is the ethernet IRQ.
*/
SysBusDevice *s;
- NICInfo *nd = &nd_table[0];
memory_region_init(&mms->eth_usb_container, OBJECT(mms),
"mps2-tz-eth-usb-container", 0x200000);
@@ -537,9 +534,8 @@ static MemoryRegion *make_eth_usb(MPS2TZMachineState *mms, void *opaque,
* In hardware this is a LAN9220; the LAN9118 is software compatible
* except that it doesn't support the checksum-offload feature.
*/
- qemu_check_nic_model(nd, "lan9118");
mms->lan9118 = qdev_new(TYPE_LAN9118);
- qdev_set_nic_properties(mms->lan9118, nd);
+ qemu_configure_nic_device(mms->lan9118, true, NULL);
s = SYS_BUS_DEVICE(mms->lan9118);
sysbus_realize_and_unref(s, &error_fatal);
diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c
index b5fe9f364d..35bf1d64e1 100644
--- a/hw/arm/msf2-soc.c
+++ b/hw/arm/msf2-soc.c
@@ -197,12 +197,8 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp)
g_free(bus_name);
}
- /* FIXME use qdev NIC properties instead of nd_table[] */
- if (nd_table[0].used) {
- qemu_check_nic_model(&nd_table[0], TYPE_MSS_EMAC);
- qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]);
- }
dev = DEVICE(&s->emac);
+ qemu_configure_nic_device(dev, true, NULL);
object_property_set_link(OBJECT(&s->emac), "ahb-bus",
OBJECT(get_system_memory()), &error_abort);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->emac), errp)) {
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 0fe0160b48..2020f73a57 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -1277,9 +1277,8 @@ static void musicpal_init(MachineState *machine)
}
sysbus_create_simple(TYPE_MV88W8618_FLASHCFG, MP_FLASHCFG_BASE, NULL);
- qemu_check_nic_model(&nd_table[0], "mv88w8618");
dev = qdev_new(TYPE_MV88W8618_ETH);
- qdev_set_nic_properties(dev, &nd_table[0]);
+ qemu_configure_nic_device(dev, true, "mv88w8618");
object_property_set_link(OBJECT(dev), "dma-memory",
OBJECT(get_system_memory()), &error_fatal);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
index 66d0de139f..35fa804b7d 100644
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -109,16 +109,13 @@ static void zynq_write_board_setup(ARMCPU *cpu,
static struct arm_boot_info zynq_binfo = {};
-static void gem_init(NICInfo *nd, uint32_t base, qemu_irq irq)
+static void gem_init(uint32_t base, qemu_irq irq)
{
DeviceState *dev;
SysBusDevice *s;
dev = qdev_new(TYPE_CADENCE_GEM);
- if (nd->used) {
- qemu_check_nic_model(nd, TYPE_CADENCE_GEM);
- qdev_set_nic_properties(dev, nd);
- }
+ qemu_configure_nic_device(dev, true, NULL);
object_property_set_int(OBJECT(dev), "phy-addr", 7, &error_abort);
s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal);
@@ -280,8 +277,8 @@ static void zynq_init(MachineState *machine)
sysbus_create_varargs("cadence_ttc", 0xF8002000,
pic[69-IRQ_OFFSET], pic[70-IRQ_OFFSET], pic[71-IRQ_OFFSET], NULL);
- gem_init(&nd_table[0], 0xE000B000, pic[54-IRQ_OFFSET]);
- gem_init(&nd_table[1], 0xE000C000, pic[77-IRQ_OFFSET]);
+ gem_init(0xE000B000, pic[54 - IRQ_OFFSET]);
+ gem_init(0xE000C000, pic[77 - IRQ_OFFSET]);
for (n = 0; n < 2; n++) {
int hci_irq = n ? 79 : 56;
diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c
index 2798df3730..50cb0606cb 100644
--- a/hw/arm/xlnx-versal.c
+++ b/hw/arm/xlnx-versal.c
@@ -256,18 +256,13 @@ static void versal_create_gems(Versal *s, qemu_irq *pic)
static const int irqs[] = { VERSAL_GEM0_IRQ_0, VERSAL_GEM1_IRQ_0};
static const uint64_t addrs[] = { MM_GEM0, MM_GEM1 };
char *name = g_strdup_printf("gem%d", i);
- NICInfo *nd = &nd_table[i];
DeviceState *dev;
MemoryRegion *mr;
object_initialize_child(OBJECT(s), name, &s->lpd.iou.gem[i],
TYPE_CADENCE_GEM);
dev = DEVICE(&s->lpd.iou.gem[i]);
- /* FIXME use qdev NIC properties instead of nd_table[] */
- if (nd->used) {
- qemu_check_nic_model(nd, "cadence_gem");
- qdev_set_nic_properties(dev, nd);
- }
+ qemu_configure_nic_device(dev, true, NULL);
object_property_set_int(OBJECT(dev), "phy-addr", 23, &error_abort);
object_property_set_int(OBJECT(dev), "num-priority-queues", 2,
&error_abort);
diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
index 65901c6e74..afeb3f88f8 100644
--- a/hw/arm/xlnx-zynqmp.c
+++ b/hw/arm/xlnx-zynqmp.c
@@ -618,13 +618,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
}
for (i = 0; i < XLNX_ZYNQMP_NUM_GEMS; i++) {
- NICInfo *nd = &nd_table[i];
-
- /* FIXME use qdev NIC properties instead of nd_table[] */
- if (nd->used) {
- qemu_check_nic_model(nd, TYPE_CADENCE_GEM);
- qdev_set_nic_properties(DEVICE(&s->gem[i]), nd);
- }
+ qemu_configure_nic_device(DEVICE(&s->gem[i]), true, NULL);
object_property_set_int(OBJECT(&s->gem[i]), "revision", GEM_REVISION,
&error_abort);
object_property_set_int(OBJECT(&s->gem[i]), "phy-addr", 23,
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 31/47] hw/net/etraxfs-eth: use qemu_configure_nic_device()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (29 preceding siblings ...)
2024-02-01 16:43 ` [PULL 30/47] hw/arm: use qemu_configure_nic_device() David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 32/47] hw/m68k/mcf5208: use qemu_create_nic_device() David Woodhouse
` (16 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/cris/axis_dev88.c | 9 ++++-----
hw/net/etraxfs_eth.c | 5 ++---
include/hw/cris/etraxfs.h | 2 +-
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index d82050d927..5556634921 100644
--- a/hw/cris/axis_dev88.c
+++ b/hw/cris/axis_dev88.c
@@ -308,15 +308,14 @@ void axisdev88_init(MachineState *machine)
/* Add the two ethernet blocks. */
dma_eth = g_malloc0(sizeof dma_eth[0] * 4); /* Allocate 4 channels. */
- etraxfs_eth_init(&nd_table[0], 0x30034000, 1, &dma_eth[0], &dma_eth[1]);
- if (nb_nics > 1) {
- etraxfs_eth_init(&nd_table[1], 0x30036000, 2, &dma_eth[2], &dma_eth[3]);
- }
+ etraxfs_eth_init(0x30034000, 1, &dma_eth[0], &dma_eth[1]);
/* The DMA Connector block is missing, hardwire things for now. */
etraxfs_dmac_connect_client(etraxfs_dmac, 0, &dma_eth[0]);
etraxfs_dmac_connect_client(etraxfs_dmac, 1, &dma_eth[1]);
- if (nb_nics > 1) {
+
+ if (qemu_find_nic_info("etraxfs-eth", true, "fseth")) {
+ etraxfs_eth_init(0x30036000, 2, &dma_eth[2], &dma_eth[3]);
etraxfs_dmac_connect_client(etraxfs_dmac, 6, &dma_eth[2]);
etraxfs_dmac_connect_client(etraxfs_dmac, 7, &dma_eth[3]);
}
diff --git a/hw/net/etraxfs_eth.c b/hw/net/etraxfs_eth.c
index ba57a978d1..5faf20c782 100644
--- a/hw/net/etraxfs_eth.c
+++ b/hw/net/etraxfs_eth.c
@@ -647,15 +647,14 @@ static void etraxfs_eth_class_init(ObjectClass *klass, void *data)
/* Instantiate an ETRAXFS Ethernet MAC. */
DeviceState *
-etraxfs_eth_init(NICInfo *nd, hwaddr base, int phyaddr,
+etraxfs_eth_init(hwaddr base, int phyaddr,
struct etraxfs_dma_client *dma_out,
struct etraxfs_dma_client *dma_in)
{
DeviceState *dev;
- qemu_check_nic_model(nd, "fseth");
dev = qdev_new("etraxfs-eth");
- qdev_set_nic_properties(dev, nd);
+ qemu_configure_nic_device(dev, true, "fseth");
qdev_prop_set_uint32(dev, "phyaddr", phyaddr);
/*
diff --git a/include/hw/cris/etraxfs.h b/include/hw/cris/etraxfs.h
index 467b529dc0..012c4e9974 100644
--- a/include/hw/cris/etraxfs.h
+++ b/include/hw/cris/etraxfs.h
@@ -31,7 +31,7 @@
#include "hw/sysbus.h"
#include "qapi/error.h"
-DeviceState *etraxfs_eth_init(NICInfo *nd, hwaddr base, int phyaddr,
+DeviceState *etraxfs_eth_init(hwaddr base, int phyaddr,
struct etraxfs_dma_client *dma_out,
struct etraxfs_dma_client *dma_in);
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 32/47] hw/m68k/mcf5208: use qemu_create_nic_device()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (30 preceding siblings ...)
2024-02-01 16:43 ` [PULL 31/47] hw/net/etraxfs-eth: " David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 33/47] hw/m68k/q800: use qemu_find_nic_info() David Woodhouse
` (15 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/m68k/mcf5208.c | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index d22d8536db..0cfb806c20 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -206,16 +206,16 @@ static void mcf5208_sys_init(MemoryRegion *address_space, qemu_irq *pic)
}
}
-static void mcf_fec_init(MemoryRegion *sysmem, NICInfo *nd, hwaddr base,
- qemu_irq *irqs)
+static void mcf_fec_init(MemoryRegion *sysmem, hwaddr base, qemu_irq *irqs)
{
DeviceState *dev;
SysBusDevice *s;
int i;
- qemu_check_nic_model(nd, TYPE_MCF_FEC_NET);
- dev = qdev_new(TYPE_MCF_FEC_NET);
- qdev_set_nic_properties(dev, nd);
+ dev = qemu_create_nic_device(TYPE_MCF_FEC_NET, true, NULL);
+ if (!dev) {
+ return;
+ }
s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal);
@@ -267,14 +267,7 @@ static void mcf5208evb_init(MachineState *machine)
mcf5208_sys_init(address_space_mem, pic);
- if (nb_nics > 1) {
- error_report("Too many NICs");
- exit(1);
- }
- if (nd_table[0].used) {
- mcf_fec_init(address_space_mem, &nd_table[0],
- 0xfc030000, pic + 36);
- }
+ mcf_fec_init(address_space_mem, 0xfc030000, pic + 36);
g_free(pic);
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 33/47] hw/m68k/q800: use qemu_find_nic_info()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (31 preceding siblings ...)
2024-02-01 16:43 ` [PULL 32/47] hw/m68k/mcf5208: use qemu_create_nic_device() David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:43 ` [PULL 34/47] hw/microblaze: use qemu_configure_nic_device() David Woodhouse
` (14 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
If a corresponding NIC configuration was found, it will have a MAC address
already assigned, so use that. Else, generate and assign a default one.
Using qemu_find_nic_info() is simpler than the alternative of using
qemu_configure_nic_device() and then having to fetch the "mac" property
as a string and convert it.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/m68k/q800.c | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index b80a3b6d5f..fa7683bf76 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -48,6 +48,7 @@
#include "hw/display/macfb.h"
#include "hw/block/swim.h"
#include "net/net.h"
+#include "net/util.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "sysemu/qtest.h"
@@ -270,6 +271,8 @@ static void q800_machine_init(MachineState *machine)
BusState *adb_bus;
NubusBus *nubus;
DriveInfo *dinfo;
+ NICInfo *nd;
+ MACAddr mac;
uint8_t rng_seed[32];
linux_boot = (kernel_filename != NULL);
@@ -370,13 +373,6 @@ static void q800_machine_init(MachineState *machine)
/* MACSONIC */
- if (nb_nics > 1) {
- error_report("q800 can only have one ethernet interface");
- exit(1);
- }
-
- qemu_check_nic_model(&nd_table[0], "dp83932");
-
/*
* MacSonic driver needs an Apple MAC address
* Valid prefix are:
@@ -386,14 +382,21 @@ static void q800_machine_init(MachineState *machine)
* 08:00:07 Apple
* (Q800 use the last one)
*/
- nd_table[0].macaddr.a[0] = 0x08;
- nd_table[0].macaddr.a[1] = 0x00;
- nd_table[0].macaddr.a[2] = 0x07;
-
object_initialize_child(OBJECT(machine), "dp8393x", &m->dp8393x,
TYPE_DP8393X);
dev = DEVICE(&m->dp8393x);
- qdev_set_nic_properties(dev, &nd_table[0]);
+ nd = qemu_find_nic_info(TYPE_DP8393X, true, "dp83932");
+ if (nd) {
+ qdev_set_nic_properties(dev, nd);
+ memcpy(mac.a, nd->macaddr.a, sizeof(mac.a));
+ } else {
+ qemu_macaddr_default_if_unset(&mac);
+ }
+ mac.a[0] = 0x08;
+ mac.a[1] = 0x00;
+ mac.a[2] = 0x07;
+ qdev_prop_set_macaddr(dev, "mac", mac.a);
+
qdev_prop_set_uint8(dev, "it_shift", 2);
qdev_prop_set_bit(dev, "big_endian", true);
object_property_set_link(OBJECT(dev), "dma_mr",
@@ -414,7 +417,7 @@ static void q800_machine_init(MachineState *machine)
prom = memory_region_get_ram_ptr(&m->dp8393x_prom);
checksum = 0;
for (i = 0; i < 6; i++) {
- prom[i] = revbit8(nd_table[0].macaddr.a[i]);
+ prom[i] = revbit8(mac.a[i]);
checksum ^= prom[i];
}
prom[7] = 0xff - checksum;
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 34/47] hw/microblaze: use qemu_configure_nic_device()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (32 preceding siblings ...)
2024-02-01 16:43 ` [PULL 33/47] hw/m68k/q800: use qemu_find_nic_info() David Woodhouse
@ 2024-02-01 16:43 ` David Woodhouse
2024-02-01 16:44 ` [PULL 35/47] hw/mips/mipssim: use qemu_create_nic_device() David Woodhouse
` (13 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:43 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/microblaze/petalogix_ml605_mmu.c | 3 +--
hw/microblaze/petalogix_s3adsp1800_mmu.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index fb7889cf67..0f5fabc32e 100644
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -133,7 +133,6 @@ petalogix_ml605_init(MachineState *machine)
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[TIMER_IRQ]);
/* axi ethernet and dma initialization. */
- qemu_check_nic_model(&nd_table[0], "xlnx.axi-ethernet");
eth0 = qdev_new("xlnx.axi-ethernet");
dma = qdev_new("xlnx.axi-dma");
@@ -145,7 +144,7 @@ petalogix_ml605_init(MachineState *machine)
"axistream-connected-target", NULL);
cs = object_property_get_link(OBJECT(dma),
"axistream-control-connected-target", NULL);
- qdev_set_nic_properties(eth0, &nd_table[0]);
+ qemu_configure_nic_device(eth0, true, NULL);
qdev_prop_set_uint32(eth0, "rxmem", 0x1000);
qdev_prop_set_uint32(eth0, "txmem", 0x1000);
object_property_set_link(OBJECT(eth0), "axistream-connected", ds,
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index 505639c298..dad46bd7f9 100644
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -114,9 +114,8 @@ petalogix_s3adsp1800_init(MachineState *machine)
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, TIMER_BASEADDR);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[TIMER_IRQ]);
- qemu_check_nic_model(&nd_table[0], "xlnx.xps-ethernetlite");
dev = qdev_new("xlnx.xps-ethernetlite");
- qdev_set_nic_properties(dev, &nd_table[0]);
+ qemu_configure_nic_device(dev, true, NULL);
qdev_prop_set_uint32(dev, "tx-ping-pong", 0);
qdev_prop_set_uint32(dev, "rx-ping-pong", 0);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 35/47] hw/mips/mipssim: use qemu_create_nic_device()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (33 preceding siblings ...)
2024-02-01 16:43 ` [PULL 34/47] hw/microblaze: use qemu_configure_nic_device() David Woodhouse
@ 2024-02-01 16:44 ` David Woodhouse
2024-02-01 16:44 ` [PULL 36/47] hw/mips/jazz: use qemu_find_nic_info() David Woodhouse
` (12 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:44 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
The MIPS SIM platform instantiates its NIC only if a corresponding
configuration exists for it. Use qemu_create_nic_device() function for
that.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/mips/mipssim.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c
index 01e323904d..16af31648e 100644
--- a/hw/mips/mipssim.c
+++ b/hw/mips/mipssim.c
@@ -118,13 +118,15 @@ static void main_cpu_reset(void *opaque)
}
}
-static void mipsnet_init(int base, qemu_irq irq, NICInfo *nd)
+static void mipsnet_init(int base, qemu_irq irq)
{
DeviceState *dev;
SysBusDevice *s;
- dev = qdev_new("mipsnet");
- qdev_set_nic_properties(dev, nd);
+ dev = qemu_create_nic_device("mipsnet", true, NULL);
+ if (!dev) {
+ return;
+ }
s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal);
@@ -225,9 +227,8 @@ mips_mipssim_init(MachineState *machine)
sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0));
}
- if (nd_table[0].used)
- /* MIPSnet uses the MIPS CPU INT0, which is interrupt 2. */
- mipsnet_init(0x4200, env->irq[2], &nd_table[0]);
+ /* MIPSnet uses the MIPS CPU INT0, which is interrupt 2. */
+ mipsnet_init(0x4200, env->irq[2]);
}
static void mips_mipssim_machine_init(MachineClass *mc)
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 36/47] hw/mips/jazz: use qemu_find_nic_info()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (34 preceding siblings ...)
2024-02-01 16:44 ` [PULL 35/47] hw/mips/mipssim: use qemu_create_nic_device() David Woodhouse
@ 2024-02-01 16:44 ` David Woodhouse
2024-02-01 16:44 ` [PULL 37/47] hw/net/lasi_i82596: Re-enable build David Woodhouse
` (11 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:44 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/mips/jazz.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
index 0d2348aa5a..5bf3e328db 100644
--- a/hw/mips/jazz.c
+++ b/hw/mips/jazz.c
@@ -119,15 +119,19 @@ static const MemoryRegionOps dma_dummy_ops = {
.endianness = DEVICE_NATIVE_ENDIAN,
};
-static void mips_jazz_init_net(NICInfo *nd, IOMMUMemoryRegion *rc4030_dma_mr,
+static void mips_jazz_init_net(IOMMUMemoryRegion *rc4030_dma_mr,
DeviceState *rc4030, MemoryRegion *dp8393x_prom)
{
DeviceState *dev;
SysBusDevice *sysbus;
int checksum, i;
uint8_t *prom;
+ NICInfo *nd;
- qemu_check_nic_model(nd, "dp83932");
+ nd = qemu_find_nic_info("dp8393x", true, "dp82932");
+ if (!nd) {
+ return;
+ }
dev = qdev_new("dp8393x");
qdev_set_nic_properties(dev, nd);
@@ -324,12 +328,7 @@ static void mips_jazz_init(MachineState *machine,
}
/* Network controller */
- if (nb_nics == 1) {
- mips_jazz_init_net(&nd_table[0], rc4030_dma_mr, rc4030, dp8393x_prom);
- } else if (nb_nics > 1) {
- error_report("This machine only supports one NIC");
- exit(1);
- }
+ mips_jazz_init_net(rc4030_dma_mr, rc4030, dp8393x_prom);
/* SCSI adapter */
dev = qdev_new(TYPE_SYSBUS_ESP);
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 37/47] hw/net/lasi_i82596: Re-enable build
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (35 preceding siblings ...)
2024-02-01 16:44 ` [PULL 36/47] hw/mips/jazz: use qemu_find_nic_info() David Woodhouse
@ 2024-02-01 16:44 ` David Woodhouse
2024-02-01 16:44 ` [PULL 38/47] hw/net/lasi_i82596: use qemu_create_nic_device() David Woodhouse
` (10 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:44 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
When converting to the shiny build-system-du-jour, a typo prevented the
last_i82596 driver from being built. Correct the config option name to
re-enable the build. And include "sysemu/sysemu.h" so it actually builds.
Fixes: b1419fa66558 ("meson: convert hw/net")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2144
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/net/lasi_i82596.c | 1 +
hw/net/meson.build | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/net/lasi_i82596.c b/hw/net/lasi_i82596.c
index 6a3147fe2d..09e830ba5f 100644
--- a/hw/net/lasi_i82596.c
+++ b/hw/net/lasi_i82596.c
@@ -14,6 +14,7 @@
#include "qapi/error.h"
#include "qemu/timer.h"
#include "hw/sysbus.h"
+#include "sysemu/sysemu.h"
#include "net/eth.h"
#include "hw/net/lasi_82596.h"
#include "hw/net/i82596.h"
diff --git a/hw/net/meson.build b/hw/net/meson.build
index 9afceb0619..2b426d3d5a 100644
--- a/hw/net/meson.build
+++ b/hw/net/meson.build
@@ -33,7 +33,7 @@ system_ss.add(when: 'CONFIG_MARVELL_88W8618', if_true: files('mv88w8618_eth.c'))
system_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_gem.c'))
system_ss.add(when: 'CONFIG_STELLARIS_ENET', if_true: files('stellaris_enet.c'))
system_ss.add(when: 'CONFIG_LANCE', if_true: files('lance.c'))
-system_ss.add(when: 'CONFIG_LASI_I82596', if_true: files('lasi_i82596.c'))
+system_ss.add(when: 'CONFIG_LASI_82596', if_true: files('lasi_i82596.c'))
system_ss.add(when: 'CONFIG_I82596_COMMON', if_true: files('i82596.c'))
system_ss.add(when: 'CONFIG_SUNHME', if_true: files('sunhme.c'))
system_ss.add(when: 'CONFIG_FTGMAC100', if_true: files('ftgmac100.c'))
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 38/47] hw/net/lasi_i82596: use qemu_create_nic_device()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (36 preceding siblings ...)
2024-02-01 16:44 ` [PULL 37/47] hw/net/lasi_i82596: Re-enable build David Woodhouse
@ 2024-02-01 16:44 ` David Woodhouse
2024-02-01 16:44 ` [PULL 39/47] hw/openrisc/openrisc_sim: " David Woodhouse
` (9 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:44 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Create the device only if there is a corresponding NIC config for it.
Remove the explicit check on nd_table[0].used from hw/hppa/machine.c
which (since commit d8a3220005d7) tries to do the same thing.
The lasi_82596 support has been disabled since it was first introduced,
since enable_lasi_lan() has always been zero. This allows the user to
enable it by explicitly requesting a NIC model 'lasi_82596' or just
using the alias 'lasi'. Otherwise, it defaults to a PCI NIC as before.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/hppa/machine.c | 11 ++++-------
hw/net/lasi_i82596.c | 12 +++++++-----
include/hw/net/lasi_82596.h | 4 ++--
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index a1045b48cc..5ae4f176f6 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -362,14 +362,11 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
}
/* Network setup. */
- if (nd_table[0].used && enable_lasi_lan()) {
- lasi_82596_init(addr_space, translate(NULL, LASI_LAN_HPA),
- qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA));
- }
+ lasi_82596_init(addr_space, translate(NULL, LASI_LAN_HPA),
+ qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA),
+ enable_lasi_lan());
- if (!enable_lasi_lan()) {
- pci_init_nic_devices(pci_bus, mc->default_nic);
- }
+ pci_init_nic_devices(pci_bus, mc->default_nic);
/* BMC board: HP Powerbar SP2 Diva (with console only) */
pci_dev = pci_new(-1, "pci-serial");
diff --git a/hw/net/lasi_i82596.c b/hw/net/lasi_i82596.c
index 09e830ba5f..fcf7fae941 100644
--- a/hw/net/lasi_i82596.c
+++ b/hw/net/lasi_i82596.c
@@ -118,19 +118,21 @@ static void lasi_82596_realize(DeviceState *dev, Error **errp)
i82596_common_init(dev, s, &net_lasi_82596_info);
}
-SysBusI82596State *lasi_82596_init(MemoryRegion *addr_space,
- hwaddr hpa, qemu_irq lan_irq)
+SysBusI82596State *lasi_82596_init(MemoryRegion *addr_space, hwaddr hpa,
+ qemu_irq lan_irq, gboolean match_default)
{
DeviceState *dev;
SysBusI82596State *s;
static const MACAddr HP_MAC = {
.a = { 0x08, 0x00, 0x09, 0xef, 0x34, 0xf6 } };
- qemu_check_nic_model(&nd_table[0], TYPE_LASI_82596);
- dev = qdev_new(TYPE_LASI_82596);
+ dev = qemu_create_nic_device(TYPE_LASI_82596, match_default, "lasi");
+ if (!dev) {
+ return NULL;
+ }
+
s = SYSBUS_I82596(dev);
s->state.irq = lan_irq;
- qdev_set_nic_properties(dev, &nd_table[0]);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
s->state.conf.macaddr = HP_MAC; /* set HP MAC prefix */
diff --git a/include/hw/net/lasi_82596.h b/include/hw/net/lasi_82596.h
index 3ef2f47ba2..439356ec19 100644
--- a/include/hw/net/lasi_82596.h
+++ b/include/hw/net/lasi_82596.h
@@ -25,7 +25,7 @@ struct SysBusI82596State {
int val_index:1;
};
-SysBusI82596State *lasi_82596_init(MemoryRegion *addr_space,
- hwaddr hpa, qemu_irq irq);
+SysBusI82596State *lasi_82596_init(MemoryRegion *addr_space, hwaddr hpa,
+ qemu_irq irq, gboolean match_default);
#endif
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 39/47] hw/openrisc/openrisc_sim: use qemu_create_nic_device()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (37 preceding siblings ...)
2024-02-01 16:44 ` [PULL 38/47] hw/net/lasi_i82596: use qemu_create_nic_device() David Woodhouse
@ 2024-02-01 16:44 ` David Woodhouse
2024-02-01 16:44 ` [PULL 40/47] hw/riscv: use qemu_configure_nic_device() David Woodhouse
` (8 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:44 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/openrisc/openrisc_sim.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index 35da123aef..bffd6f721f 100644
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -170,7 +170,7 @@ static void openrisc_create_fdt(Or1ksimState *state,
static void openrisc_sim_net_init(Or1ksimState *state, hwaddr base, hwaddr size,
int num_cpus, OpenRISCCPU *cpus[],
- int irq_pin, NICInfo *nd)
+ int irq_pin)
{
void *fdt = state->fdt;
DeviceState *dev;
@@ -178,8 +178,10 @@ static void openrisc_sim_net_init(Or1ksimState *state, hwaddr base, hwaddr size,
char *nodename;
int i;
- dev = qdev_new("open_eth");
- qdev_set_nic_properties(dev, nd);
+ dev = qemu_create_nic_device("open_eth", true, NULL);
+ if (!dev) {
+ return;
+ }
s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal);
@@ -313,12 +315,10 @@ static void openrisc_sim_init(MachineState *machine)
openrisc_create_fdt(state, or1ksim_memmap, smp_cpus, machine->ram_size,
machine->kernel_cmdline);
- if (nd_table[0].used) {
- openrisc_sim_net_init(state, or1ksim_memmap[OR1KSIM_ETHOC].base,
- or1ksim_memmap[OR1KSIM_ETHOC].size,
- smp_cpus, cpus,
- OR1KSIM_ETHOC_IRQ, nd_table);
- }
+ openrisc_sim_net_init(state, or1ksim_memmap[OR1KSIM_ETHOC].base,
+ or1ksim_memmap[OR1KSIM_ETHOC].size,
+ smp_cpus, cpus,
+ OR1KSIM_ETHOC_IRQ);
if (smp_cpus > 1) {
openrisc_sim_ompic_init(state, or1ksim_memmap[OR1KSIM_OMPIC].base,
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 40/47] hw/riscv: use qemu_configure_nic_device()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (38 preceding siblings ...)
2024-02-01 16:44 ` [PULL 39/47] hw/openrisc/openrisc_sim: " David Woodhouse
@ 2024-02-01 16:44 ` David Woodhouse
2024-02-01 16:44 ` [PULL 41/47] hw/s390x/s390-virtio-ccw: use qemu_create_nic_device() David Woodhouse
` (7 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:44 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/riscv/microchip_pfsoc.c | 14 ++------------
hw/riscv/sifive_u.c | 7 +------
2 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c
index b775aa8946..7725dfbde5 100644
--- a/hw/riscv/microchip_pfsoc.c
+++ b/hw/riscv/microchip_pfsoc.c
@@ -202,7 +202,6 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp)
MemoryRegion *envm_data = g_new(MemoryRegion, 1);
MemoryRegion *qspi_xip_mem = g_new(MemoryRegion, 1);
char *plic_hart_config;
- NICInfo *nd;
int i;
sysbus_realize(SYS_BUS_DEVICE(&s->e_cpus), &error_abort);
@@ -411,17 +410,8 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp)
memmap[MICROCHIP_PFSOC_USB].size);
/* GEMs */
-
- nd = &nd_table[0];
- if (nd->used) {
- qemu_check_nic_model(nd, TYPE_CADENCE_GEM);
- qdev_set_nic_properties(DEVICE(&s->gem0), nd);
- }
- nd = &nd_table[1];
- if (nd->used) {
- qemu_check_nic_model(nd, TYPE_CADENCE_GEM);
- qdev_set_nic_properties(DEVICE(&s->gem1), nd);
- }
+ qemu_configure_nic_device(DEVICE(&s->gem0), true, NULL);
+ qemu_configure_nic_device(DEVICE(&s->gem1), true, NULL);
object_property_set_int(OBJECT(&s->gem0), "revision", GEM_REVISION, errp);
object_property_set_int(OBJECT(&s->gem0), "phy-addr", 8, errp);
diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
index ec76dce6c9..5207ec1fa5 100644
--- a/hw/riscv/sifive_u.c
+++ b/hw/riscv/sifive_u.c
@@ -789,7 +789,6 @@ static void sifive_u_soc_realize(DeviceState *dev, Error **errp)
MemoryRegion *l2lim_mem = g_new(MemoryRegion, 1);
char *plic_hart_config;
int i, j;
- NICInfo *nd = &nd_table[0];
qdev_prop_set_uint32(DEVICE(&s->u_cpus), "num-harts", ms->smp.cpus - 1);
qdev_prop_set_uint32(DEVICE(&s->u_cpus), "hartid-base", 1);
@@ -893,11 +892,7 @@ static void sifive_u_soc_realize(DeviceState *dev, Error **errp)
}
sysbus_mmio_map(SYS_BUS_DEVICE(&s->otp), 0, memmap[SIFIVE_U_DEV_OTP].base);
- /* FIXME use qdev NIC properties instead of nd_table[] */
- if (nd->used) {
- qemu_check_nic_model(nd, TYPE_CADENCE_GEM);
- qdev_set_nic_properties(DEVICE(&s->gem), nd);
- }
+ qemu_configure_nic_device(DEVICE(&s->gem), true, NULL);
object_property_set_int(OBJECT(&s->gem), "revision", GEM_REVISION,
&error_abort);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->gem), errp)) {
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 41/47] hw/s390x/s390-virtio-ccw: use qemu_create_nic_device()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (39 preceding siblings ...)
2024-02-01 16:44 ` [PULL 40/47] hw/riscv: use qemu_configure_nic_device() David Woodhouse
@ 2024-02-01 16:44 ` David Woodhouse
2024-02-01 16:44 ` [PULL 42/47] hw/sparc/sun4m: use qemu_find_nic_info() David Woodhouse
` (6 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:44 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Acked-by: Thomas Huth <thuth@redhat.com>
---
hw/s390x/s390-virtio-ccw.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index c99682b07d..62804cc228 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -229,16 +229,9 @@ static void s390_init_ipl_dev(const char *kernel_filename,
static void s390_create_virtio_net(BusState *bus, const char *name)
{
- int i;
-
- for (i = 0; i < nb_nics; i++) {
- NICInfo *nd = &nd_table[i];
- DeviceState *dev;
-
- qemu_check_nic_model(nd, "virtio");
+ DeviceState *dev;
- dev = qdev_new(name);
- qdev_set_nic_properties(dev, nd);
+ while ((dev = qemu_create_nic_device(name, true, "virtio"))) {
qdev_realize_and_unref(dev, bus, &error_fatal);
}
}
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 42/47] hw/sparc/sun4m: use qemu_find_nic_info()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (40 preceding siblings ...)
2024-02-01 16:44 ` [PULL 41/47] hw/s390x/s390-virtio-ccw: use qemu_create_nic_device() David Woodhouse
@ 2024-02-01 16:44 ` David Woodhouse
2024-02-01 16:44 ` [PULL 43/47] hw/xtensa/xtfpga: use qemu_create_nic_device() David Woodhouse
` (5 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:44 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Obtain the MAC address from the NIC configuration if there is one, or
generate one explicitly so that it can be placed in the PROM.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/sparc/sun4m.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 550af01690..e782c8ec7a 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -299,13 +299,15 @@ static void *iommu_init(hwaddr addr, uint32_t version, qemu_irq irq)
static void *sparc32_dma_init(hwaddr dma_base,
hwaddr esp_base, qemu_irq espdma_irq,
- hwaddr le_base, qemu_irq ledma_irq, NICInfo *nd)
+ hwaddr le_base, qemu_irq ledma_irq,
+ MACAddr *mac)
{
DeviceState *dma;
ESPDMADeviceState *espdma;
LEDMADeviceState *ledma;
SysBusESPState *esp;
SysBusPCNetState *lance;
+ NICInfo *nd = qemu_find_nic_info("lance", true, NULL);
dma = qdev_new(TYPE_SPARC32_DMA);
espdma = SPARC32_ESPDMA_DEVICE(object_resolve_path_component(
@@ -320,7 +322,14 @@ static void *sparc32_dma_init(hwaddr dma_base,
lance = SYSBUS_PCNET(object_resolve_path_component(
OBJECT(ledma), "lance"));
- qdev_set_nic_properties(DEVICE(lance), nd);
+
+ if (nd) {
+ qdev_set_nic_properties(DEVICE(lance), nd);
+ memcpy(mac->a, nd->macaddr.a, sizeof(mac->a));
+ } else {
+ qemu_macaddr_default_if_unset(mac);
+ qdev_prop_set_macaddr(DEVICE(lance), "mac", mac->a);
+ }
sysbus_realize_and_unref(SYS_BUS_DEVICE(dma), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(dma), 0, dma_base);
@@ -823,7 +832,7 @@ static void sun4m_hw_init(MachineState *machine)
unsigned int smp_cpus = machine->smp.cpus;
unsigned int max_cpus = machine->smp.max_cpus;
HostMemoryBackend *ram_memdev = machine->memdev;
- NICInfo *nd = &nd_table[0];
+ MACAddr hostid;
if (machine->ram_size > hwdef->max_mem) {
error_report("Too much memory for this machine: %" PRId64 ","
@@ -884,10 +893,9 @@ static void sun4m_hw_init(MachineState *machine)
hwdef->iommu_pad_base, hwdef->iommu_pad_len);
}
- qemu_check_nic_model(nd, TYPE_LANCE);
sparc32_dma_init(hwdef->dma_base,
hwdef->esp_base, slavio_irq[18],
- hwdef->le_base, slavio_irq[16], nd);
+ hwdef->le_base, slavio_irq[16], &hostid);
if (graphic_depth != 8 && graphic_depth != 24) {
error_report("Unsupported depth: %d", graphic_depth);
@@ -1039,7 +1047,7 @@ static void sun4m_hw_init(MachineState *machine)
machine->initrd_filename,
machine->ram_size, &initrd_size);
- nvram_init(nvram, (uint8_t *)&nd->macaddr, machine->kernel_cmdline,
+ nvram_init(nvram, hostid.a, machine->kernel_cmdline,
machine->boot_config.order, machine->ram_size, kernel_size,
graphic_width, graphic_height, graphic_depth,
hwdef->nvram_machine_id, "Sun4m");
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 43/47] hw/xtensa/xtfpga: use qemu_create_nic_device()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (41 preceding siblings ...)
2024-02-01 16:44 ` [PULL 42/47] hw/sparc/sun4m: use qemu_find_nic_info() David Woodhouse
@ 2024-02-01 16:44 ` David Woodhouse
2024-02-01 16:44 ` [PULL 44/47] net: remove qemu_check_nic_model() David Woodhouse
` (4 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:44 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/xtensa/xtfpga.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index fbad1c83a3..f49e6591dc 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -141,14 +141,16 @@ static void xtfpga_net_init(MemoryRegion *address_space,
hwaddr base,
hwaddr descriptors,
hwaddr buffers,
- qemu_irq irq, NICInfo *nd)
+ qemu_irq irq)
{
DeviceState *dev;
SysBusDevice *s;
MemoryRegion *ram;
- dev = qdev_new("open_eth");
- qdev_set_nic_properties(dev, nd);
+ dev = qemu_create_nic_device("open_eth", true, NULL);
+ if (!dev) {
+ return;
+ }
s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal);
@@ -301,10 +303,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
memory_region_add_subregion(system_memory, board->io[1], io);
}
xtfpga_fpga_init(system_io, 0x0d020000, freq);
- if (nd_table[0].used) {
- xtfpga_net_init(system_io, 0x0d030000, 0x0d030400, 0x0d800000,
- extints[1], nd_table);
- }
+ xtfpga_net_init(system_io, 0x0d030000, 0x0d030400, 0x0d800000, extints[1]);
serial_mm_init(system_io, 0x0d050020, 2, extints[0],
115200, serial_hd(0), DEVICE_NATIVE_ENDIAN);
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 44/47] net: remove qemu_check_nic_model()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (42 preceding siblings ...)
2024-02-01 16:44 ` [PULL 43/47] hw/xtensa/xtfpga: use qemu_create_nic_device() David Woodhouse
@ 2024-02-01 16:44 ` David Woodhouse
2024-02-01 16:44 ` [PULL 45/47] hw/pci: remove pci_nic_init_nofail() David Woodhouse
` (3 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:44 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
There are no callers of this function any more, as they have all been
converted to qemu_{create,configure}_nic_device().
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
include/net/net.h | 1 -
net/net.c | 13 -------------
2 files changed, 14 deletions(-)
diff --git a/include/net/net.h b/include/net/net.h
index 728ca965af..00ee1af7ab 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -204,7 +204,6 @@ int qemu_set_vnet_le(NetClientState *nc, bool is_le);
int qemu_set_vnet_be(NetClientState *nc, bool is_be);
void qemu_macaddr_default_if_unset(MACAddr *macaddr);
int qemu_show_nic_models(const char *arg, const char *const *models);
-void qemu_check_nic_model(NICInfo *nd, const char *model);
int qemu_find_nic_model(NICInfo *nd, const char * const *models,
const char *default_model);
/**
diff --git a/net/net.c b/net/net.c
index 4651b3f443..ffd4b42d5a 100644
--- a/net/net.c
+++ b/net/net.c
@@ -992,19 +992,6 @@ int qemu_show_nic_models(const char *arg, const char *const *models)
return 1;
}
-void qemu_check_nic_model(NICInfo *nd, const char *model)
-{
- const char *models[2];
-
- models[0] = model;
- models[1] = NULL;
-
- if (qemu_show_nic_models(nd->model, models))
- exit(0);
- if (qemu_find_nic_model(nd, models, model) < 0)
- exit(1);
-}
-
int qemu_find_nic_model(NICInfo *nd, const char * const *models,
const char *default_model)
{
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 45/47] hw/pci: remove pci_nic_init_nofail()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (43 preceding siblings ...)
2024-02-01 16:44 ` [PULL 44/47] net: remove qemu_check_nic_model() David Woodhouse
@ 2024-02-01 16:44 ` David Woodhouse
2024-02-01 16:44 ` [PULL 46/47] net: remove qemu_show_nic_models(), qemu_find_nic_model() David Woodhouse
` (2 subsequent siblings)
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:44 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
This function is no longer used, as all its callers have been converted
to use pci_init_nic_devices() instead.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/pci/pci.c | 72 --------------------------------------------
include/hw/pci/pci.h | 3 --
2 files changed, 75 deletions(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 5849606f66..449abfb182 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -1853,78 +1853,6 @@ const pci_class_desc *get_class_desc(int class)
return desc;
}
-/* Initialize a PCI NIC. */
-PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus,
- const char *default_model,
- const char *default_devaddr)
-{
- const char *devaddr = nd->devaddr ? nd->devaddr : default_devaddr;
- GPtrArray *pci_nic_models;
- PCIBus *bus;
- PCIDevice *pci_dev;
- DeviceState *dev;
- int devfn;
- int i;
- int dom, busnr;
- unsigned slot;
-
- if (nd->model && !strcmp(nd->model, "virtio")) {
- g_free(nd->model);
- nd->model = g_strdup("virtio-net-pci");
- }
-
- pci_nic_models = qemu_get_nic_models(TYPE_PCI_DEVICE);
-
- if (qemu_show_nic_models(nd->model, (const char **)pci_nic_models->pdata)) {
- exit(0);
- }
-
- i = qemu_find_nic_model(nd, (const char **)pci_nic_models->pdata,
- default_model);
- if (i < 0) {
- exit(1);
- }
-
- if (!rootbus) {
- error_report("No primary PCI bus");
- exit(1);
- }
-
- assert(!rootbus->parent_dev);
-
- if (!devaddr) {
- devfn = -1;
- busnr = 0;
- } else {
- if (pci_parse_devaddr(devaddr, &dom, &busnr, &slot, NULL) < 0) {
- error_report("Invalid PCI device address %s for device %s",
- devaddr, nd->model);
- exit(1);
- }
-
- if (dom != 0) {
- error_report("No support for non-zero PCI domains");
- exit(1);
- }
-
- devfn = PCI_DEVFN(slot, 0);
- }
-
- bus = pci_find_bus_nr(rootbus, busnr);
- if (!bus) {
- error_report("Invalid PCI device address %s for device %s",
- devaddr, nd->model);
- exit(1);
- }
-
- pci_dev = pci_new(devfn, nd->model);
- dev = &pci_dev->qdev;
- qdev_set_nic_properties(dev, nd);
- pci_realize_and_unref(pci_dev, bus, &error_fatal);
- g_ptr_array_free(pci_nic_models, true);
- return pci_dev;
-}
-
void pci_init_nic_devices(PCIBus *bus, const char *default_model)
{
qemu_create_nic_bus_devices(&bus->qbus, TYPE_PCI_DEVICE, default_model,
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 6ff0b95a02..eaa3fc99d8 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -314,9 +314,6 @@ void pci_device_set_intx_routing_notifier(PCIDevice *dev,
PCIINTxRoutingNotifier notifier);
void pci_device_reset(PCIDevice *dev);
-PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus,
- const char *default_model,
- const char *default_devaddr);
void pci_init_nic_devices(PCIBus *bus, const char *default_model);
bool pci_init_nic_in_slot(PCIBus *rootbus, const char *default_model,
const char *alias, const char *devaddr);
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 46/47] net: remove qemu_show_nic_models(), qemu_find_nic_model()
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (44 preceding siblings ...)
2024-02-01 16:44 ` [PULL 45/47] hw/pci: remove pci_nic_init_nofail() David Woodhouse
@ 2024-02-01 16:44 ` David Woodhouse
2024-02-01 16:44 ` [PULL 47/47] net: make nb_nics and nd_table[] static in net/net.c David Woodhouse
2024-02-02 15:32 ` [PULL 00/47] nic-config.for-upstream queue Peter Maydell
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:44 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
These old functions can be removed now too. Let net_param_nic() print
the full set of network devices directly, and also make it note that a
list more specific to this platform/config will be available by using
'-nic model=help' instead.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
include/net/net.h | 3 ---
net/net.c | 39 ++++++---------------------------------
2 files changed, 6 insertions(+), 36 deletions(-)
diff --git a/include/net/net.h b/include/net/net.h
index 00ee1af7ab..588ee55f28 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -203,9 +203,6 @@ void qemu_set_vnet_hdr_len(NetClientState *nc, int len);
int qemu_set_vnet_le(NetClientState *nc, bool is_le);
int qemu_set_vnet_be(NetClientState *nc, bool is_be);
void qemu_macaddr_default_if_unset(MACAddr *macaddr);
-int qemu_show_nic_models(const char *arg, const char *const *models);
-int qemu_find_nic_model(NICInfo *nd, const char * const *models,
- const char *default_model);
/**
* qemu_find_nic_info: Obtain NIC configuration information
* @typename: Name of device object type
diff --git a/net/net.c b/net/net.c
index ffd4b42d5a..d705e9b0fd 100644
--- a/net/net.c
+++ b/net/net.c
@@ -977,38 +977,6 @@ GPtrArray *qemu_get_nic_models(const char *device_type)
return nic_models;
}
-int qemu_show_nic_models(const char *arg, const char *const *models)
-{
- int i;
-
- if (!arg || !is_help_option(arg)) {
- return 0;
- }
-
- printf("Available NIC models:\n");
- for (i = 0 ; models[i]; i++) {
- printf("%s\n", models[i]);
- }
- return 1;
-}
-
-int qemu_find_nic_model(NICInfo *nd, const char * const *models,
- const char *default_model)
-{
- int i;
-
- if (!nd->model)
- nd->model = g_strdup(default_model);
-
- for (i = 0 ; models[i]; i++) {
- if (strcmp(nd->model, models[i]) == 0)
- return i;
- }
-
- error_report("Unsupported NIC model: %s", nd->model);
- return -1;
-}
-
static int net_init_nic(const Netdev *netdev, const char *name,
NetClientState *peer, Error **errp)
{
@@ -1791,9 +1759,14 @@ static int net_param_nic(void *dummy, QemuOpts *opts, Error **errp)
}
if (is_help_option(type)) {
GPtrArray *nic_models = qemu_get_nic_models(TYPE_DEVICE);
+ int i;
show_netdevs();
printf("\n");
- qemu_show_nic_models(type, (const char **)nic_models->pdata);
+ printf("Available NIC models "
+ "(use -nic model=help for a filtered list):\n");
+ for (i = 0 ; nic_models->pdata[i]; i++) {
+ printf("%s\n", (char *)nic_models->pdata[i]);
+ }
g_ptr_array_free(nic_models, true);
exit(0);
}
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PULL 47/47] net: make nb_nics and nd_table[] static in net/net.c
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (45 preceding siblings ...)
2024-02-01 16:44 ` [PULL 46/47] net: remove qemu_show_nic_models(), qemu_find_nic_model() David Woodhouse
@ 2024-02-01 16:44 ` David Woodhouse
2024-02-02 15:32 ` [PULL 00/47] nic-config.for-upstream queue Peter Maydell
47 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-01 16:44 UTC (permalink / raw)
To: qemu-devel
From: David Woodhouse <dwmw@amazon.co.uk>
Also remove the stale declaration of host_net_devices; the actual
definition was removed long ago in commit 7cc28cb06104 ("net: Remove
the deprecated 'host_net_add' and 'host_net_remove' HMP commands")
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
include/net/net.h | 4 ----
net/net.c | 3 +++
system/globals.c | 2 --
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/include/net/net.h b/include/net/net.h
index 588ee55f28..b1f9b35fcc 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -301,10 +301,6 @@ struct NICInfo {
int nvectors;
};
-extern int nb_nics;
-extern NICInfo nd_table[MAX_NICS];
-extern const char *host_net_devices[];
-
/* from net.c */
extern NetClientStateList net_clients;
bool netdev_is_modern(const char *optstr);
diff --git a/net/net.c b/net/net.c
index d705e9b0fd..a2f0c828bb 100644
--- a/net/net.c
+++ b/net/net.c
@@ -77,6 +77,9 @@ static NetdevQueue nd_queue = QSIMPLEQ_HEAD_INITIALIZER(nd_queue);
static GHashTable *nic_model_help;
+static int nb_nics;
+static NICInfo nd_table[MAX_NICS];
+
/***********************************************************/
/* network device redirectors */
diff --git a/system/globals.c b/system/globals.c
index e83b5428d1..b6d4e72530 100644
--- a/system/globals.c
+++ b/system/globals.c
@@ -36,8 +36,6 @@ int display_opengl;
const char* keyboard_layout;
bool enable_mlock;
bool enable_cpu_pm;
-int nb_nics;
-NICInfo nd_table[MAX_NICS];
int autostart = 1;
int vga_interface_type = VGA_NONE;
bool vga_interface_created;
--
2.43.0
^ permalink raw reply related [flat|nested] 57+ messages in thread* Re: [PULL 00/47] nic-config.for-upstream queue
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
` (46 preceding siblings ...)
2024-02-01 16:44 ` [PULL 47/47] net: make nb_nics and nd_table[] static in net/net.c David Woodhouse
@ 2024-02-02 15:32 ` Peter Maydell
2024-02-02 15:36 ` David Woodhouse
2024-02-02 16:01 ` David Woodhouse
47 siblings, 2 replies; 57+ messages in thread
From: Peter Maydell @ 2024-02-02 15:32 UTC (permalink / raw)
To: David Woodhouse; +Cc: qemu-devel
On Thu, 1 Feb 2024 at 16:48, David Woodhouse <dwmw2@infradead.org> wrote:
>
> The following changes since commit 14639717bf379480e937716fcaf1e72b47fd4c5f:
>
> Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging (2024-01-31 19:53:45 +0000)
>
> are available in the Git repository at:
>
> git://git.infradead.org/users/dwmw2/qemu.git tags/pull-nic-config.for-upstream-20240201
>
> for you to fetch changes up to 5382a24c9b0be4391ea91b020bb72ad15c05cc88:
>
> net: make nb_nics and nd_table[] static in net/net.c (2024-02-01 16:21:52 +0000)
>
> ----------------------------------------------------------------
> Rework matching of network devices to -nic options
This fails "make check' because some of the qom-test and
test-hmp checks fail when the QEMU binary segfaults.
https://gitlab.com/qemu-project/qemu/-/jobs/6084552256
https://gitlab.com/qemu-project/qemu/-/jobs/6084044180
Reproduces on an x86-64 host if you do a build and 'make check'
for all target archs.
Generally this kind of segfault is because some machine type
segfaults on startup. For instance:
$ ./build/all/qemu-system-hppa -M C3700
Segmentation fault (core dumped)
(It's possible that's the only machine type that has a
problem; I haven't tried to exhaustively check.)
-- PMM
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PULL 00/47] nic-config.for-upstream queue
2024-02-02 15:32 ` [PULL 00/47] nic-config.for-upstream queue Peter Maydell
@ 2024-02-02 15:36 ` David Woodhouse
2024-02-02 15:40 ` Peter Maydell
2024-02-02 16:01 ` David Woodhouse
1 sibling, 1 reply; 57+ messages in thread
From: David Woodhouse @ 2024-02-02 15:36 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 940 bytes --]
On Fri, 2024-02-02 at 15:32 +0000, Peter Maydell wrote:
>
> This fails "make check' because some of the qom-test and
> test-hmp checks fail when the QEMU binary segfaults.
>
> https://gitlab.com/qemu-project/qemu/-/jobs/6084552256
> https://gitlab.com/qemu-project/qemu/-/jobs/6084044180
Thanks. Any idea why that didn't show up in my own pipeline?
https://gitlab.com/dwmw2/qemu/-/pipelines/1160949234
(The only difference in that tree is a last minute Reviewed-by:)
> Reproduces on an x86-64 host if you do a build and 'make check'
> for all target archs.
>
> Generally this kind of segfault is because some machine type
> segfaults on startup. For instance:
>
> $ ./build/all/qemu-system-hppa -M C3700
> Segmentation fault (core dumped)
>
> (It's possible that's the only machine type that has a
> problem; I haven't tried to exhaustively check.)
Sorry about that. I'll go improve my test coverage...
[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 5965 bytes --]
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PULL 00/47] nic-config.for-upstream queue
2024-02-02 15:36 ` David Woodhouse
@ 2024-02-02 15:40 ` Peter Maydell
2024-02-05 6:56 ` Thomas Huth
0 siblings, 1 reply; 57+ messages in thread
From: Peter Maydell @ 2024-02-02 15:40 UTC (permalink / raw)
To: David Woodhouse; +Cc: qemu-devel, Alex Bennée, Thomas Huth
On Fri, 2 Feb 2024 at 15:36, David Woodhouse <dwmw2@infradead.org> wrote:
>
> On Fri, 2024-02-02 at 15:32 +0000, Peter Maydell wrote:
> >
> > This fails "make check' because some of the qom-test and
> > test-hmp checks fail when the QEMU binary segfaults.
> >
> > https://gitlab.com/qemu-project/qemu/-/jobs/6084552256
> > https://gitlab.com/qemu-project/qemu/-/jobs/6084044180
>
> Thanks. Any idea why that didn't show up in my own pipeline?
> https://gitlab.com/dwmw2/qemu/-/pipelines/1160949234
I think because the failing runners are the aarch64 and
s390 host ones, which we don't let run for anything
except real merge-pullreq test runs because they're
limited resource. I guess that perhaps we have at some point
said "we don't need to run all the guest architectures
on all jobs" and not noticed that this leaves the
coverage for the submaintainer only-uses-the-public-runners
CI testing with gaps.
CCing Alex and Thomas for possible suggestions.
thanks
-- PMM
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PULL 00/47] nic-config.for-upstream queue
2024-02-02 15:40 ` Peter Maydell
@ 2024-02-05 6:56 ` Thomas Huth
2024-02-05 10:11 ` Thomas Huth
0 siblings, 1 reply; 57+ messages in thread
From: Thomas Huth @ 2024-02-05 6:56 UTC (permalink / raw)
To: Peter Maydell, David Woodhouse; +Cc: qemu-devel, Alex Bennée
On 02/02/2024 16.40, Peter Maydell wrote:
> On Fri, 2 Feb 2024 at 15:36, David Woodhouse <dwmw2@infradead.org> wrote:
>>
>> On Fri, 2024-02-02 at 15:32 +0000, Peter Maydell wrote:
>>>
>>> This fails "make check' because some of the qom-test and
>>> test-hmp checks fail when the QEMU binary segfaults.
>>>
>>> https://gitlab.com/qemu-project/qemu/-/jobs/6084552256
>>> https://gitlab.com/qemu-project/qemu/-/jobs/6084044180
>>
>> Thanks. Any idea why that didn't show up in my own pipeline?
>> https://gitlab.com/dwmw2/qemu/-/pipelines/1160949234
>
> I think because the failing runners are the aarch64 and
> s390 host ones, which we don't let run for anything
> except real merge-pullreq test runs because they're
> limited resource. I guess that perhaps we have at some point
> said "we don't need to run all the guest architectures
> on all jobs"
It's rather "we cannot run all the guest architectures on all jobs due to
time constraints"
> and not noticed that this leaves the
> coverage for the submaintainer only-uses-the-public-runners
> CI testing with gaps.
>
> CCing Alex and Thomas for possible suggestions.
Well, not everybody has access to non-x86 machines, so there's not too much
we can do about this, can we? The only possibility is: We still have support
for travis-CI, so if you've got a github account, you can test aarch64,
s390x and ppc64le there before sending a pull request. The .travis-ci.yml
file needs some love, though, one of the jobs is currently timing out ...
it's on my TODO list since weeks, but I just didn't find enough spare time
to fix it properly yet.
Thomas
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PULL 00/47] nic-config.for-upstream queue
2024-02-05 6:56 ` Thomas Huth
@ 2024-02-05 10:11 ` Thomas Huth
2024-02-05 10:55 ` Peter Maydell
0 siblings, 1 reply; 57+ messages in thread
From: Thomas Huth @ 2024-02-05 10:11 UTC (permalink / raw)
To: Peter Maydell, David Woodhouse, Alex Bennée; +Cc: qemu-devel
On 05/02/2024 07.56, Thomas Huth wrote:
> On 02/02/2024 16.40, Peter Maydell wrote:
>> On Fri, 2 Feb 2024 at 15:36, David Woodhouse <dwmw2@infradead.org> wrote:
>>>
>>> On Fri, 2024-02-02 at 15:32 +0000, Peter Maydell wrote:
>>>>
>>>> This fails "make check' because some of the qom-test and
>>>> test-hmp checks fail when the QEMU binary segfaults.
>>>>
>>>> https://gitlab.com/qemu-project/qemu/-/jobs/6084552256
>>>> https://gitlab.com/qemu-project/qemu/-/jobs/6084044180
>>>
>>> Thanks. Any idea why that didn't show up in my own pipeline?
>>> https://gitlab.com/dwmw2/qemu/-/pipelines/1160949234
>>
>> I think because the failing runners are the aarch64 and
>> s390 host ones, which we don't let run for anything
>> except real merge-pullreq test runs because they're
>> limited resource. I guess that perhaps we have at some point
>> said "we don't need to run all the guest architectures
>> on all jobs"
>
> It's rather "we cannot run all the guest architectures on all jobs due to
> time constraints"
Ah, wait, but we should still run at least "make check" for each target
architecture... so there's indeed something that went wrong recently:
commit 78ebc00b06813 ("gitlab: shuffle some targets and reduce avocado
noise") removed the hppa-softmmu target from the ubuntu job, without making
sure that it gets tested somewhere else.
Alex, why did you remove it? It's now missing from all check-system-* jobs...
Thomas
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PULL 00/47] nic-config.for-upstream queue
2024-02-05 10:11 ` Thomas Huth
@ 2024-02-05 10:55 ` Peter Maydell
0 siblings, 0 replies; 57+ messages in thread
From: Peter Maydell @ 2024-02-05 10:55 UTC (permalink / raw)
To: Thomas Huth; +Cc: David Woodhouse, Alex Bennée, qemu-devel
On Mon, 5 Feb 2024 at 10:11, Thomas Huth <thuth@redhat.com> wrote:
>
> On 05/02/2024 07.56, Thomas Huth wrote:
> > On 02/02/2024 16.40, Peter Maydell wrote:
> >> On Fri, 2 Feb 2024 at 15:36, David Woodhouse <dwmw2@infradead.org> wrote:
> >>>
> >>> On Fri, 2024-02-02 at 15:32 +0000, Peter Maydell wrote:
> >>>>
> >>>> This fails "make check' because some of the qom-test and
> >>>> test-hmp checks fail when the QEMU binary segfaults.
> >>>>
> >>>> https://gitlab.com/qemu-project/qemu/-/jobs/6084552256
> >>>> https://gitlab.com/qemu-project/qemu/-/jobs/6084044180
> >>>
> >>> Thanks. Any idea why that didn't show up in my own pipeline?
> >>> https://gitlab.com/dwmw2/qemu/-/pipelines/1160949234
> >>
> >> I think because the failing runners are the aarch64 and
> >> s390 host ones, which we don't let run for anything
> >> except real merge-pullreq test runs because they're
> >> limited resource. I guess that perhaps we have at some point
> >> said "we don't need to run all the guest architectures
> >> on all jobs"
> >
> > It's rather "we cannot run all the guest architectures on all jobs due to
> > time constraints"
>
> Ah, wait, but we should still run at least "make check" for each target
> architecture...
Yes, this is what I mean -- it's OK to have the target
architecture checks split up between different CI jobs
as long as between the jobs we cover them all, but it's
not so good to be relying on the non-x86 host jobs to
provide part of the coverage.
-- PMM
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PULL 00/47] nic-config.for-upstream queue
2024-02-02 15:32 ` [PULL 00/47] nic-config.for-upstream queue Peter Maydell
2024-02-02 15:36 ` David Woodhouse
@ 2024-02-02 16:01 ` David Woodhouse
2024-02-02 16:15 ` Peter Maydell
1 sibling, 1 reply; 57+ messages in thread
From: David Woodhouse @ 2024-02-02 16:01 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Helge Deller
[-- Attachment #1: Type: text/plain, Size: 1352 bytes --]
On Fri, 2024-02-02 at 15:32 +0000, Peter Maydell wrote:
>
> $ ./build/all/qemu-system-hppa -M C3700
> Segmentation fault (core dumped)
Ah, got it. Some HPPA machine types don't have a lasi_dev.
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -362,9 +362,11 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
}
/* Network setup. */
- lasi_82596_init(addr_space, translate(NULL, LASI_LAN_HPA),
- qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA),
- enable_lasi_lan());
+ if (lasi_dev) {
+ lasi_82596_init(addr_space, translate(NULL, LASI_LAN_HPA),
+ qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA),
+ enable_lasi_lan());
+ }
pci_init_nic_devices(pci_bus, mc->default_nic);
New pipeline running (FWIW) at
https://gitlab.com/dwmw2/qemu/-/pipelines/1162635873
What is the next step? Post the full series as a v5, or perhaps just
the single fixed patch which is now at
https://git.infradead.org/?p=users/dwmw2/qemu.git;a=commitdiff;h=2c20b4ee96db
... and then another pull request? The docs are fairly clear that pull
requests can't have even minor changes that haven't been posted
separately... and I guess the above incremental doesn't count?
Sorry for the noise.
[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 5965 bytes --]
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PULL 00/47] nic-config.for-upstream queue
2024-02-02 16:01 ` David Woodhouse
@ 2024-02-02 16:15 ` Peter Maydell
2024-02-02 17:01 ` David Woodhouse
0 siblings, 1 reply; 57+ messages in thread
From: Peter Maydell @ 2024-02-02 16:15 UTC (permalink / raw)
To: David Woodhouse; +Cc: qemu-devel, Helge Deller
On Fri, 2 Feb 2024 at 16:01, David Woodhouse <dwmw2@infradead.org> wrote:
>
> On Fri, 2024-02-02 at 15:32 +0000, Peter Maydell wrote:
> >
> > $ ./build/all/qemu-system-hppa -M C3700
> > Segmentation fault (core dumped)
>
> Ah, got it. Some HPPA machine types don't have a lasi_dev.
>
>
> --- a/hw/hppa/machine.c
> +++ b/hw/hppa/machine.c
> @@ -362,9 +362,11 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
> }
>
> /* Network setup. */
> - lasi_82596_init(addr_space, translate(NULL, LASI_LAN_HPA),
> - qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA),
> - enable_lasi_lan());
> + if (lasi_dev) {
> + lasi_82596_init(addr_space, translate(NULL, LASI_LAN_HPA),
> + qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA),
> + enable_lasi_lan());
> + }
>
> pci_init_nic_devices(pci_bus, mc->default_nic);
>
> New pipeline running (FWIW) at
> https://gitlab.com/dwmw2/qemu/-/pipelines/1162635873
>
> What is the next step? Post the full series as a v5, or perhaps just
> the single fixed patch which is now at
> https://git.infradead.org/?p=users/dwmw2/qemu.git;a=commitdiff;h=2c20b4ee96db
>
> ... and then another pull request?
If that diff above is the only change, then:
* roll a new pullrequest with the fix squashed into the appropriate patch
* have the subject marker be "PULL v2"
* you can send just the cover-letter and the one patch that has changed,
you don't need to resend the entire series (though it's not a big
deal if you do send the whole set of mails again)
> The docs are fairly clear that pull
> requests can't have even minor changes that haven't been posted
> separately... and I guess the above incremental doesn't count?
Which bit of the docs is that? It's not our actual practice,
so we should really fix the wording. The principle is "don't
stick code into pullreqs that hasn't been through the review
process", but in practice especially for submaintainers who
know the system it's not uncommon to say "I'm going to
squash change X in and take this" or similar rather than
forcing submitters to do another round of sending out patches.
There should be *something* on the list to say this change was
put in, but eg the exchange in this email thread is fine for that.
thanks
-- PMM
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PULL 00/47] nic-config.for-upstream queue
2024-02-02 16:15 ` Peter Maydell
@ 2024-02-02 17:01 ` David Woodhouse
0 siblings, 0 replies; 57+ messages in thread
From: David Woodhouse @ 2024-02-02 17:01 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Helge Deller
[-- Attachment #1: Type: text/plain, Size: 2288 bytes --]
On Fri, 2024-02-02 at 16:15 +0000, Peter Maydell wrote:
> On Fri, 2 Feb 2024 at 16:01, David Woodhouse <dwmw2@infradead.org> wrote:
> >
> > What is the next step? Post the full series as a v5, or perhaps just
> > the single fixed patch which is now at
> > https://git.infradead.org/?p=users/dwmw2/qemu.git;a=commitdiff;h=2c20b4ee96db
> >
> > ... and then another pull request?
>
> If that diff above is the only change, then:
> * roll a new pullrequest with the fix squashed into the appropriate patch
> * have the subject marker be "PULL v2"
> * you can send just the cover-letter and the one patch that has changed,
> you don't need to resend the entire series (though it's not a big
> deal if you do send the whole set of mails again)
Done, thank you.
> > The docs are fairly clear that pull
> > requests can't have even minor changes that haven't been posted
> > separately... and I guess the above incremental doesn't count?
>
> Which bit of the docs is that? It's not our actual practice,
> so we should really fix the wording. The principle is "don't
> stick code into pullreqs that hasn't been through the review
> process", but in practice especially for submaintainers who
> know the system it's not uncommon to say "I'm going to
> squash change X in and take this" or similar rather than
> forcing submitters to do another round of sending out patches.
> There should be *something* on the list to say this change was
> put in, but eg the exchange in this email thread is fine for that.
I think I was looking at
https://www.qemu.org/docs/master/devel/submitting-a-pull-request.html
where it says "In particular if you’ve corrected issues in one round of
code review, you need to send your fixed patch series as normal to the
list; you can’t put it in a pull request until it’s gone through.
(Extremely trivial fixes may be OK to just fix in passing, but if in
doubt err on the side of not.)"
I think the doc is actually fine and I was just reading it too
conservatively. I have been making a conscious effort to pay attention,
follow the process and fit in, rather than just turning up and doing
whatever comes naturally from decades of working on open source. (I do
not *promise* that will last.)
[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 5965 bytes --]
^ permalink raw reply [flat|nested] 57+ messages in thread