Module Name: src
Committed By: thorpej
Date: Sat Mar 27 01:41:43 UTC 2021
Modified Files:
src/sys/arch/evbmips/mipssim [thorpej-cfargs]: virtio_mainbus.c
src/sys/dev/acpi [thorpej-cfargs]: virtio_acpi.c
src/sys/dev/fdt [thorpej-cfargs]: virtio_mmio_fdt.c
src/sys/dev/pci [thorpej-cfargs]: virtio_pci.c
Log Message:
- config_found_ia() -> config_found().
- virtio only carries a single interface attribute, so no need to
specify it explicitly.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.2.1 src/sys/arch/evbmips/mipssim/virtio_mainbus.c
cvs rdiff -u -r1.7 -r1.7.2.1 src/sys/dev/acpi/virtio_acpi.c
cvs rdiff -u -r1.7 -r1.7.2.1 src/sys/dev/fdt/virtio_mmio_fdt.c
cvs rdiff -u -r1.28 -r1.28.2.1 src/sys/dev/pci/virtio_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbmips/mipssim/virtio_mainbus.c
diff -u src/sys/arch/evbmips/mipssim/virtio_mainbus.c:1.1 src/sys/arch/evbmips/mipssim/virtio_mainbus.c:1.1.2.1
--- src/sys/arch/evbmips/mipssim/virtio_mainbus.c:1.1 Mon Feb 15 22:39:46 2021
+++ src/sys/arch/evbmips/mipssim/virtio_mainbus.c Sat Mar 27 01:41:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_mainbus.c,v 1.1 2021/02/15 22:39:46 reinoud Exp $ */
+/* $NetBSD: virtio_mainbus.c,v 1.1.2.1 2021/03/27 01:41:43 thorpej Exp $ */
/*
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_mainbus.c,v 1.1 2021/02/15 22:39:46 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_mainbus.c,v 1.1.2.1 2021/03/27 01:41:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -108,13 +108,13 @@ virtio_mainbus_attach(device_t parent, d
if (virtio_mmio_common_probe_present(msc))
virtio_mmio_common_attach(msc);
- virtio_mainbus_rescan(self, "virtio", NULL);
+ virtio_mainbus_rescan(self, NULL, NULL);
}
/* ARGSUSED */
static int
-virtio_mainbus_rescan(device_t self, const char *attr, const int *scan_flags)
+virtio_mainbus_rescan(device_t self, const char *ifattr, const int *locs)
{
struct virtio_mainbus_softc *sc = device_private(self);
struct virtio_mmio_softc *msc = &sc->sc_msc;
@@ -127,7 +127,7 @@ virtio_mainbus_rescan(device_t self, con
memset(&va, 0, sizeof(va));
va.sc_childdevid = vsc->sc_childdevid;
- config_found_ia(self, attr, &va, NULL);
+ config_found(self, &va, NULL, CFARG_EOL);
if (virtio_attach_failed(vsc))
return 0;
Index: src/sys/dev/acpi/virtio_acpi.c
diff -u src/sys/dev/acpi/virtio_acpi.c:1.7 src/sys/dev/acpi/virtio_acpi.c:1.7.2.1
--- src/sys/dev/acpi/virtio_acpi.c:1.7 Fri Jan 29 15:49:55 2021
+++ src/sys/dev/acpi/virtio_acpi.c Sat Mar 27 01:41:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_acpi.c,v 1.7 2021/01/29 15:49:55 thorpej Exp $ */
+/* $NetBSD: virtio_acpi.c,v 1.7.2.1 2021/03/27 01:41:43 thorpej Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_acpi.c,v 1.7 2021/01/29 15:49:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_acpi.c,v 1.7.2.1 2021/03/27 01:41:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -160,7 +160,7 @@ virtio_acpi_rescan(device_t self, const
memset(&va, 0, sizeof(va));
va.sc_childdevid = vsc->sc_childdevid;
- config_found_ia(self, ifattr, &va, NULL);
+ config_found(self, &va, NULL, CFARG_EOL);
if (virtio_attach_failed(vsc))
return 0;
Index: src/sys/dev/fdt/virtio_mmio_fdt.c
diff -u src/sys/dev/fdt/virtio_mmio_fdt.c:1.7 src/sys/dev/fdt/virtio_mmio_fdt.c:1.7.2.1
--- src/sys/dev/fdt/virtio_mmio_fdt.c:1.7 Wed Jan 27 03:10:21 2021
+++ src/sys/dev/fdt/virtio_mmio_fdt.c Sat Mar 27 01:41:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_mmio_fdt.c,v 1.7 2021/01/27 03:10:21 thorpej Exp $ */
+/* $NetBSD: virtio_mmio_fdt.c,v 1.7.2.1 2021/03/27 01:41:43 thorpej Exp $ */
/*
* Copyright (c) 2018 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_mmio_fdt.c,v 1.7 2021/01/27 03:10:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_mmio_fdt.c,v 1.7.2.1 2021/03/27 01:41:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -105,7 +105,7 @@ virtio_mmio_fdt_attach(device_t parent,
msc->sc_free_interrupts = virtio_mmio_fdt_free_interrupts;
virtio_mmio_common_attach(msc);
- virtio_mmio_fdt_rescan(self, "virtio", NULL);
+ virtio_mmio_fdt_rescan(self, NULL, NULL);
}
/* ARGSUSED */
@@ -123,7 +123,7 @@ virtio_mmio_fdt_rescan(device_t self, co
memset(&va, 0, sizeof(va));
va.sc_childdevid = vsc->sc_childdevid;
- config_found_ia(self, attr, &va, NULL);
+ config_found(self, &va, NULL, CFARG_EOL);
if (virtio_attach_failed(vsc))
return 0;
Index: src/sys/dev/pci/virtio_pci.c
diff -u src/sys/dev/pci/virtio_pci.c:1.28 src/sys/dev/pci/virtio_pci.c:1.28.2.1
--- src/sys/dev/pci/virtio_pci.c:1.28 Fri Feb 5 19:18:23 2021
+++ src/sys/dev/pci/virtio_pci.c Sat Mar 27 01:41:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_pci.c,v 1.28 2021/02/05 19:18:23 reinoud Exp $ */
+/* $NetBSD: virtio_pci.c,v 1.28.2.1 2021/03/27 01:41:43 thorpej Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_pci.c,v 1.28 2021/02/05 19:18:23 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_pci.c,v 1.28.2.1 2021/03/27 01:41:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -271,13 +271,13 @@ virtio_pci_attach(device_t parent, devic
sc->sc_childdevid = id;
sc->sc_child = NULL;
- virtio_pci_rescan(self, "virtio", 0);
+ virtio_pci_rescan(self, NULL, NULL);
return;
}
/* ARGSUSED */
static int
-virtio_pci_rescan(device_t self, const char *attr, const int *scan_flags)
+virtio_pci_rescan(device_t self, const char *ifattr, const int *locs)
{
struct virtio_pci_softc * const psc = device_private(self);
struct virtio_softc * const sc = &psc->sc_sc;
@@ -289,7 +289,7 @@ virtio_pci_rescan(device_t self, const c
memset(&va, 0, sizeof(va));
va.sc_childdevid = sc->sc_childdevid;
- config_found_ia(self, attr, &va, NULL);
+ config_found(self, &va, NULL, CFARG_EOL);
if (virtio_attach_failed(sc))
return 0;
