From 12440b00c1bf4638281b762e7952ae7ecf95e0c0 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sat, 11 May 2019 18:05:59 -0400 Subject: osdict: return _OsResources to callers Use the class helper routines to save some tedious dict management --- virt-install | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'virt-install') diff --git a/virt-install b/virt-install index b52a2369..e5647131 100755 --- a/virt-install +++ b/virt-install @@ -526,12 +526,15 @@ def set_resources_from_osinfo(options, guest): if options.disk: return - res = guest.osinfo.get_recommended_resources(guest) - if res and res.get('storage') > 0: - diskstr = 'size=%d' % (res.get('storage') // (1024 ** 3)) - logging.debug("Generated default libosinfo '--disk %s'", diskstr) - options.disk = [diskstr] - cli.ParserDisk(diskstr, guest=guest).parse(None) + res = guest.osinfo.get_recommended_resources() + storage = res.get_recommended_storage(guest.os.arch) + if not storage: + return + + diskstr = 'size=%d' % (storage // (1024 ** 3)) + logging.debug("Generated default libosinfo '--disk %s'", diskstr) + options.disk = [diskstr] + cli.ParserDisk(diskstr, guest=guest).parse(None) def build_guest_instance(conn, options): -- cgit v1.2.1