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 474ad1a1c9b2396b6433e6cdb38241d35b8b0e96..8f39682ce1904392767c7fd199d195679eae3562 100644 (file)
--- a/lunaix-os/scripts/qemus/qemu_x86_dev.json
+++ b/lunaix-os/scripts/qemus/qemu_x86_dev.json
@@ -1,6 +1,7 @@
 {
     "arch": "$ARCH",
     "memory": "1G",
 {
     "arch": "$ARCH",
     "memory": "1G",

+    "ncpu": 1,

     "machine": "q35",
     "cpu": {
         "type": "base",
     "machine": "q35",
     "cpu": {
         "type": "base",


@@ -18,6 +19,10 @@
             "apic"
         ]
     },
             "apic"
         ]
     },

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

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


@@ -27,10 +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",
+            "io": {
+                "type": "null",
+                "logfile": "ttypci1.log"
+            }
+        },
+        {
+            "class": "pci-serial",
+            "io": {
+                "type": "null",
+                "logfile": "ttypci2.log"
+            }

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


@@ -41,18 +62,19 @@
             "name": "ahci_0",
             "disks": [
                 {
             "name": "ahci_0",
             "disks": [
                 {

-                    "type": "ide-cd",
-                    "img": "$KIMG",
-                    "ro": true,
+                    "type": "ide-hd",
+                    "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