From c23de0b181df639d2f23314ac9b198b039279cb9 Mon Sep 17 00:00:00 2001 From: Chen Hanxiao Date: Thu, 6 Feb 2014 22:33:00 +0800 Subject: [PATCH] virtinst: drop parameter guest in convert_old_networks We do not use this paramter any more since commit: 46d3e0041ad938e386addd64f3633feebcccdecd. So drop it. Signed-off-by: Chen Hanxiao --- 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 4c49be6e8..784cacbd7 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 fe7ce6bd6..6f4287e50 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 4e054cd00..7341b74f2 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)