Boot framework rework (#45)

[lunaix-os.git] / lunaix-os / scripts / qemus / qemu_x86_dev.json

diff --git a/lunaix-os/scripts/qemus/qemu_x86_dev.json b/lunaix-os/scripts/qemus/qemu_x86_dev.json
index 023dfece1821dae79f0944f3faa04f532d85b0ca..8f39682ce1904392767c7fd199d195679eae3562 100644 (file)
--- a/lunaix-os/scripts/qemus/qemu_x86_dev.json
+++ b/lunaix-os/scripts/qemus/qemu_x86_dev.json
@@ -19,6 +19,10 @@
             "apic"
         ]
     },
             "apic"
         ]
     },

+    "kernel": {
+        "bin": "$KBIN",
+        "cmd": "$KCMD"
+    },

     "debug": {
         "gdb_port": "$GDB_PORT",
         "traced": [
     "debug": {
         "gdb_port": "$GDB_PORT",
         "traced": [


@@ -28,18 +32,26 @@
     },
     "devices": [
         {
     },
     "devices": [
         {

-            "class": "basic_serial",
-            "protocol": "telnet",
-            "addr": ":12345",
-            "logfile": "lunaix_ttyS0.log"
+            "class": "isa-serial",
+            "io": {
+                "type": "telnet",
+                "port": "12345",
+                "logfile": "lunaix_ttyS0.log"
+            }

         },
         {
             "class": "pci-serial",
         },
         {
             "class": "pci-serial",

-            "logfile": "ttyPCI0.log"
+            "io": {
+                "type": "null",
+                "logfile": "ttypci1.log"
+            }

         },
         {
             "class": "pci-serial",
         },
         {
             "class": "pci-serial",

-            "logfile": "ttyPCI1.log"
+            "io": {
+                "type": "null",
+                "logfile": "ttypci2.log"
+            }

         },
         {
             "class": "rtc",
         },
         {
             "class": "rtc",


@@ -49,24 +61,20 @@
             "class": "ahci",
             "name": "ahci_0",
             "disks": [
             "class": "ahci",
             "name": "ahci_0",
             "disks": [

-                {
-                    "type": "ide-cd",
-                    "img": "$KIMG",
-                    "ro": true,
-                    "format": "raw"
-                },

                 {
                     "type": "ide-hd",
                 {
                     "type": "ide-hd",

-                    "img": "$EXT2_TEST_DISC",
+                    "img": "$ROOTFS",

                     "format": "raw"
                 }
             ]
         },
         {
             "class": "hmp",
                     "format": "raw"
                 }
             ]
         },
         {
             "class": "hmp",

-            "protocol": "telnet",
-            "addr": ":$QMPORT",
-            "logfile": "qm.log"
+            "io": {
+                "type": "telnet",
+                "port": "$QMPORT",
+                "logfile": "qm.log"
+            }

         }
     ]
 }
\ No newline at end of file
         }
     ]
 }
\ No newline at end of file