diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-11-29 18:06:10 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-11-29 18:06:10 -0500 |
| commit | e39ad01fe3506c7714d52eb3bf276e44de732c59 (patch) | |
| tree | 4ad881ff8feb3d98d4f0a667c867d0c426053bb4 | |
| parent | 16b7556fa5cc10f3eebdb8af1e675d7049c45a33 (diff) | |
| parent | 94549dfd0c4a13ee80f199935635ca66d013ff2a (diff) | |
| download | illumos-joyent-e39ad01fe3506c7714d52eb3bf276e44de732c59.tar.gz | |
[illumos-gate merge]
commit 94549dfd0c4a13ee80f199935635ca66d013ff2a
15216 vioif should attach to device 0x1000 also
commit 9f3a0b43a03b04d53325dbc0fcefe03085efe59f
15162 rpcgen: warnings from generated code
Conflicts:
usr/src/uts/intel/os/driver_aliases
| -rw-r--r-- | usr/src/cmd/rpcgen/rpc_cout.c | 8 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/driver-network-vioif.p5m | 5 | ||||
| -rw-r--r-- | usr/src/uts/intel/os/driver_aliases | 1 |
3 files changed, 10 insertions, 4 deletions
diff --git a/usr/src/cmd/rpcgen/rpc_cout.c b/usr/src/cmd/rpcgen/rpc_cout.c index 8a661fc1bb..d0192c8152 100644 --- a/usr/src/cmd/rpcgen/rpc_cout.c +++ b/usr/src/cmd/rpcgen/rpc_cout.c @@ -153,8 +153,7 @@ print_header(definition *def) if (inlinelen == 0) return; - /* May cause lint to complain. but ... */ - f_print(fout, "\trpc_inline_t *buf;\n\n"); + f_print(fout, "\trpc_inline_t *buf __unused;\n\n"); } static void @@ -220,7 +219,7 @@ print_ifclose(int indent) static void print_ifstat(int indent, char *prefix, char *type, relation rel, - char *amax, char *objname, char *name) + char *amax, char *objname, char *name) { char *alt = NULL; @@ -363,6 +362,9 @@ emit_union(definition *def) dflt->array_max, object, dflt->name); free(object); f_print(fout, "\t\tbreak;\n"); + } else { + f_print(fout, "\tdefault:\n"); + f_print(fout, "\t\tbreak;\n"); } } else { f_print(fout, "\tdefault:\n"); diff --git a/usr/src/pkg/manifests/driver-network-vioif.p5m b/usr/src/pkg/manifests/driver-network-vioif.p5m index f5c0c371b1..e165f64b0e 100644 --- a/usr/src/pkg/manifests/driver-network-vioif.p5m +++ b/usr/src/pkg/manifests/driver-network-vioif.p5m @@ -15,6 +15,7 @@ # # Copyright (c) 2013, Nexenta Systems Inc. All rights reserved. +# Copyright 2022 MNX Cloud, Inc. # # @@ -36,7 +37,9 @@ file path=kernel/drv/$(ARCH64)/vioif group=sys dir path=usr/share/man dir path=usr/share/man/man4d file path=usr/share/man/man4d/vioif.4d -driver name=vioif perms="* 0666 root sys" alias=pci1af4,1 +driver name=vioif perms="* 0666 root sys" \ + alias=pci1af4,1 \ + alias=pci1af4,1000,p legacy pkg=SUNWvioif desc="VirtIO network driver" name="VirtIO network driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/uts/intel/os/driver_aliases b/usr/src/uts/intel/os/driver_aliases index 23405538d4..1a9c082f57 100644 --- a/usr/src/uts/intel/os/driver_aliases +++ b/usr/src/uts/intel/os/driver_aliases @@ -1825,6 +1825,7 @@ vgatext "pciclass,030001" vio9f "pci1af4,9" vioblk "pci1af4,1001" vioif "pci1af4,1" +vioif "pci1af4,1000,p" vioscsi "pci1af4,1004" vmxnet "pci15ad,720" vmxnet3s "pci15ad,7b0" |