2 files changed, 3 insertions, 2 deletions
diff --git a/src/vnet/devices/virtio/device.c b/src/vnet/devices/virtio/device.c
index 275a3c74990..d4ef6d836c5 100644
--- a/src/vnet/devices/virtio/device.c
+++ b/src/vnet/devices/virtio/device.c
@@ -55,7 +55,7 @@ format_virtio_device_name (u8 * s, va_list * args)
 
   if (vif->type == VIRTIO_IF_TYPE_TAP)
     {
-      s = format (s, "tap-%s", vif->name);
+      s = format (s, "tap%u", vif->id);
     }
   else
     s = format (s, "virtio%lu", vif->dev_instance);
diff --git a/src/vnet/devices/virtio/virtio.h b/src/vnet/devices/virtio/virtio.h
index 7dcd90ac353..cb97df87121 100644
--- a/src/vnet/devices/virtio/virtio.h
+++ b/src/vnet/devices/virtio/virtio.h
@@ -91,6 +91,7 @@ typedef struct
 typedef struct
 {
   u32 flags;
+  u32 id;
   u32 dev_instance;
   u32 hw_if_index;
   u32 sw_if_index;
@@ -102,7 +103,7 @@ typedef struct
   u64 features, remote_features;
 
   virtio_if_type_t type;
-  u8 *name;
+  u8 *host_if_name;
   u8 *net_ns;
   int ifindex;
 } virtio_if_t;