git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Menuconfig Implementation and auto-qemu refactoring (#44)
[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 e006691bd09d566b86519cbd8d2fa617a6da54f8..60b292e780949cd3b0af72ee63bb3706827e2ab1 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",
@@
-27,18
+28,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",
@@
-53,14
+62,21
@@
"img": "$KIMG",
"ro": true,
"format": "raw"
"img": "$KIMG",
"ro": true,
"format": "raw"
+ },
+ {
+ "type": "ide-hd",
+ "img": "$EXT2_TEST_DISC",
+ "format": "raw"
}
]
},
{
"class": "hmp",
}
]
},
{
"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