Qemu graphics options

This commit is contained in:
Julien Duponchelle 2015-05-25 18:41:53 +02:00
parent 148095aa1d
commit 91ba5b5416
4 changed files with 13 additions and 5 deletions

View File

@ -14,7 +14,7 @@
"qemu": {
"adapter_type": "e1000",
"adapters": 8,
"options": "-nographics",
"graphics": false,
"kvm_support": true,
"ram": 2048,
"processor": "x64"

View File

@ -15,7 +15,8 @@
"adapter_type": "e1000",
"adapters": 1,
"ram": 32,
"processor": "i386"
"processor": "i386",
"graphics": false
},
"images": {

View File

@ -98,7 +98,14 @@ class Config:
new_config["initrd"] = ""
new_config["kernel_command_line"] = ""
new_config["kernel_image"] = ""
new_config["options"] = ""
if device_config["qemu"].get("graphics", False):
options = ""
else:
options = "-nographics "
options += device_config["qemu"].get("options", "")
new_config["options"] = options.strip()
new_config["hdb_disk_image"] = ""
new_config["hdc_disk_image"] = ""
new_config["hdd_disk_image"] = ""

View File

@ -99,7 +99,7 @@ def test_add_images_guest(empty_config, linux_microcore_img):
"kernel_image": "",
"legacy_networking": False,
"name": "Micro Core Linux 3.4.1",
"options": "",
"options": "-nographics",
"process_priority": "normal",
"qemu_path": "qemu-system-i386",
"ram": 32,
@ -142,7 +142,7 @@ def test_add_images_router_two_disk(empty_config):
"kernel_image": "",
"legacy_networking": False,
"name": "Arista vEOS 2.1.0 4.13.8M",
"options": "",
"options": "-nographics",
"process_priority": "normal",
"qemu_path": "qemu-system-x86_64",
"ram": 2048,