Skip to content
Snippets Groups Projects
Commit 1b3e46d5 authored by gback's avatar gback
Browse files

support raw format warning and use longform for -smp

These changes make Pintos work with Qemu 6.2.0 as of Spring '22
See https://lists.nongnu.org/archive/html/qemu-discuss/2022-01/msg00036.html
parent af566e4e
No related branches found
No related tags found
No related merge requests found
......@@ -656,13 +656,14 @@ sub run_qemu {
push (@cmd, '-usb');
push (@cmd, '-usbdevice', "disk:$_") foreach @disks[1...$#disks];
} else {
push (@cmd, '-hda', $disks[0]) if defined $disks[0];
push (@cmd, '-hdb', $disks[1]) if defined $disks[1];
push (@cmd, '-hdc', $disks[2]) if defined $disks[2];
push (@cmd, '-hdd', $disks[3]) if defined $disks[3];
for (my ($i) = 0; $i < 4; $i++) {
push (@cmd, '-drive', 'file=' . $disks[$i] . ',format=raw,index='.$i.',media=disk') if defined $disks[$i];
}
}
push (@cmd, '-m', $mem);
push (@cmd, '-smp', $smp);
# push (@cmd, '-smp', $smp);
# in qemu 6.2.0, we need the long form to properly populate the MP tables
push (@cmd, '-smp', 'cpus=' . $smp . ',cores=1,threads=1,sockets=' . $smp);
push (@cmd, '-net', 'none');
push (@cmd, '-nographic') if $vga eq 'none';
push (@cmd, '-serial', 'stdio') if $serial && $vga ne 'none';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment