diff options
| author | Alexandru Elisei <alexandru.elisei@arm.com> | 2023-09-07 18:16:53 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2023-09-18 11:42:35 +0100 |
| commit | 4498eb7400c6a6289b71be9e8f90e56c6a36271e (patch) | |
| tree | 61ffb0aafbf060afb7e36d1af454163e4d026928 | |
| parent | 106e2ea7756d980454d68631b87d5e25ba4e4881 (diff) | |
| download | kvmtool-4498eb7400c6a6289b71be9e8f90e56c6a36271e.tar.gz | |
Revert "virtio-net: Don't print the compat warning for the default device"
This reverts commit 15757e8e6441d83757c39046a6cdd3e4d74200ce.
Turns out there's a way to disable the default virtio-net device: pass
--network mode=none when running a VM.
Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com>
Link: https://lore.kernel.org/r/20230907171655.6996-2-alexandru.elisei@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
| -rw-r--r-- | virtio/net.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/virtio/net.c b/virtio/net.c index 77f7c9a7..f09dd0a4 100644 --- a/virtio/net.c +++ b/virtio/net.c @@ -847,7 +847,7 @@ done: return 0; } -static int virtio_net__init_one(struct virtio_net_params *params, bool suppress_compat) +static int virtio_net__init_one(struct virtio_net_params *params) { enum virtio_trans trans = params->kvm->cfg.virtio_transport; struct net_dev *ndev; @@ -913,7 +913,7 @@ static int virtio_net__init_one(struct virtio_net_params *params, bool suppress_ if (params->vhost) virtio_net__vhost_init(params->kvm, ndev); - if (compat_id == -1 && !suppress_compat) + if (compat_id == -1) compat_id = virtio_compat_add_message("virtio-net", "CONFIG_VIRTIO_NET"); return 0; @@ -925,7 +925,7 @@ int virtio_net__init(struct kvm *kvm) for (i = 0; i < kvm->cfg.num_net_devices; i++) { kvm->cfg.net_params[i].kvm = kvm; - r = virtio_net__init_one(&kvm->cfg.net_params[i], false); + r = virtio_net__init_one(&kvm->cfg.net_params[i]); if (r < 0) goto cleanup; } @@ -943,7 +943,7 @@ int virtio_net__init(struct kvm *kvm) str_to_mac(kvm->cfg.guest_mac, net_params.guest_mac); str_to_mac(kvm->cfg.host_mac, net_params.host_mac); - r = virtio_net__init_one(&net_params, true); + r = virtio_net__init_one(&net_params); if (r < 0) goto cleanup; } |