Merge "vif: Remove 'plug_vhostuser', 'unplug_vhostuser'"

Author: Zuul

nova/virt/libvirt/vif.py

@@ -694,9 +694,6 @@ def plug_tap(self, instance, vif):
         mtu = network.get_meta('mtu') if network else None
         nova.privsep.linux_net.set_device_mtu(dev, mtu)
 
-    def plug_vhostuser(self, instance, vif):
-        pass
-
     def _plug_os_vif(self, instance, vif):
         instance_info = os_vif_util.nova_to_osvif_instance(instance)
 
@@ -813,9 +810,6 @@ def unplug_iovisor(self, instance, vif):
         except processutils.ProcessExecutionError:
             LOG.exception(_("Failed while unplugging vif"), instance=instance)
 
-    def unplug_vhostuser(self, instance, vif):
-        pass
-
     def _unplug_os_vif(self, instance, vif):
         instance_info = os_vif_util.nova_to_osvif_instance(instance)