[virt-tools-list] [virt-manager PATCH] virtinst: drop parameter guest in convert_old_networks

Chen Hanxiao chenhanxiao at cn.fujitsu.com
Thu Feb 6 09:23:27 UTC 2014


From: Chen Hanxiao <chenhanxiao at cn.fujitsu.com>

We do not use this paramter any more since commit:
46d3e0041ad938e386addd64f3633feebcccdecd.
So drop it.

Signed-off-by: Chen Hanxiao <chenhanxiao at cn.fujitsu.com>
---
 virt-image      | 2 +-
 virt-install    | 2 +-
 virtinst/cli.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/virt-image b/virt-image
index 4c49be6..784cacb 100755
--- a/virt-image
+++ b/virt-image
@@ -103,7 +103,7 @@ def main(conn=None):
     guest.installer = installer
 
     cli.convert_old_memory(options)
-    cli.convert_old_networks(guest, options, image.domain.interface)
+    cli.convert_old_networks(options, image.domain.interface)
     cli.convert_old_graphics(guest, options,
         default_override=bool(image.domain.graphics))
     cli.convert_old_cpuset(options)
diff --git a/virt-install b/virt-install
index fe7ce6b..6f4287e 100755
--- a/virt-install
+++ b/virt-install
@@ -440,7 +440,7 @@ def build_guest_instance(conn, options, parsermap):
 
     cli.convert_old_memory(options)
     convert_old_sound(options)
-    cli.convert_old_networks(guest, options, not options.nonetworks and 1 or 0)
+    cli.convert_old_networks(options, not options.nonetworks and 1 or 0)
     cli.convert_old_graphics(guest, options)
     convert_old_disks(options)
     cli.convert_old_features(options)
diff --git a/virtinst/cli.py b/virtinst/cli.py
index 6c06a2e..3253438 100644
--- a/virtinst/cli.py
+++ b/virtinst/cli.py
@@ -352,7 +352,7 @@ def convert_old_cpuset(options):
     logging.debug("Generated compat cpuset: --vcpus %s", options.vcpus)
 
 
-def convert_old_networks(guest, options, number_of_default_nics):
+def convert_old_networks(options, number_of_default_nics):
     macs     = util.listify(options.mac)
     networks = util.listify(options.network)
     bridges  = util.listify(options.bridge)
-- 
1.8.2.1




More information about the virt-tools-list mailing list