X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/28c176b668c841a3b7fb093faccf0efa39257603..bffa3430fbbaaad29bec0b5bee9c1f0bfc7fd068:/lunaix-os/scripts/qemus/qemu_x86_dev.json?ds=sidebyside diff --git a/lunaix-os/scripts/qemus/qemu_x86_dev.json b/lunaix-os/scripts/qemus/qemu_x86_dev.json index 474ad1a..8f39682 100644 --- 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", + "ncpu": 1, "machine": "q35", "cpu": { "type": "base", @@ -18,6 +19,10 @@ "apic" ] }, + "kernel": { + "bin": "$KBIN", + "cmd": "$KCMD" + }, "debug": { "gdb_port": "$GDB_PORT", "traced": [ @@ -27,10 +32,26 @@ }, "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", @@ -41,18 +62,19 @@ "name": "ahci_0", "disks": [ { - "type": "ide-cd", - "img": "$KIMG", - "ro": true, + "type": "ide-hd", + "img": "$ROOTFS", "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