Commit 8ae6bb54 authored by Iustin Pop's avatar Iustin Pop
Browse files

Show the HVM boot order in instance info

This is a merge from the 1.2 branch

Reviewed-by: imsnah
parent 147af04d
...@@ -4067,6 +4067,7 @@ class LUQueryInstanceData(NoHooksLU): ...@@ -4067,6 +4067,7 @@ class LUQueryInstanceData(NoHooksLU):
"vcpus": instance.vcpus, "vcpus": instance.vcpus,
"kernel_path": instance.kernel_path, "kernel_path": instance.kernel_path,
"initrd_path": instance.initrd_path, "initrd_path": instance.initrd_path,
"hvm_boot_order": instance.hvm_boot_order,
} }
result[instance.name] = idict result[instance.name] = idict
......
...@@ -639,6 +639,7 @@ def ShowInstanceConfig(opts, args): ...@@ -639,6 +639,7 @@ def ShowInstanceConfig(opts, args):
else: else:
initrd = instance["initrd_path"] initrd = instance["initrd_path"]
buf.write(" initrd: %s\n" % initrd) buf.write(" initrd: %s\n" % initrd)
buf.write(" HVM boot order: %s\n" % instance["hvm_boot_order"])
buf.write(" Hardware:\n") buf.write(" Hardware:\n")
buf.write(" - VCPUs: %d\n" % instance["vcpus"]) buf.write(" - VCPUs: %d\n" % instance["vcpus"])
buf.write(" - memory: %dMiB\n" % instance["memory"]) buf.write(" - memory: %dMiB\n" % instance["memory"])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment