From 91ba5b541666473bfe735e4944e6bd923dd717fe Mon Sep 17 00:00:00 2001
From: Julien Duponchelle <julien@duponchelle.info>
Date: Mon, 25 May 2015 18:41:53 +0200
Subject: [PATCH] Qemu graphics options

---
 devices/qemu/arista-veos.json     | 2 +-
 devices/qemu/microcore-linux.json | 3 ++-
 gns3registry/config.py            | 9 ++++++++-
 test/test_config.py               | 4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/devices/qemu/arista-veos.json b/devices/qemu/arista-veos.json
index bdaf88a..3269680 100644
--- a/devices/qemu/arista-veos.json
+++ b/devices/qemu/arista-veos.json
@@ -14,7 +14,7 @@
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 8,
-        "options": "-nographics",
+        "graphics": false,        
         "kvm_support": true,
         "ram": 2048,
         "processor": "x64"
diff --git a/devices/qemu/microcore-linux.json b/devices/qemu/microcore-linux.json
index 0573e3c..793b0cf 100644
--- a/devices/qemu/microcore-linux.json
+++ b/devices/qemu/microcore-linux.json
@@ -15,7 +15,8 @@
         "adapter_type": "e1000",
         "adapters": 1,
         "ram": 32,
-        "processor": "i386"
+        "processor": "i386",
+        "graphics": false
     },
 
     "images": {
diff --git a/gns3registry/config.py b/gns3registry/config.py
index 9d1cc30..8ff8066 100644
--- a/gns3registry/config.py
+++ b/gns3registry/config.py
@@ -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"] = ""
diff --git a/test/test_config.py b/test/test_config.py
index 9b975b9..2c7b349 100644
--- a/test/test_config.py
+++ b/test/test_config.py
@@ -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,