Skip to content

GitLab

B
build-system
Commit 9e21cb73 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Fixed Core 2 as Core 2 Duo

parent 3df9d962
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 12 deletions
common.xml
View file @ 9e21cb73
...@@ -236,14 +236,14 @@ ...@@ -236,14 +236,14 @@
</exec> </exec>
</target> </target>
<target name="run-system-core2"> <target name="run-system-core2duo">
<exec executable="qemu-system-x86_64"> <exec executable="qemu-system-x86_64">
<env key="QEMU_AUDIO_DRV" value="none"/> <env key="QEMU_AUDIO_DRV" value="none"/>
<arg line=" -kernel ${builddir}/boot/vmlinuz -cpu core2duo ${ENABLE_KVM_X86} -m 1024 -M pc -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/> <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu core2duo ${ENABLE_KVM_X86} -m 1024 -M pc -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
</exec> </exec>
</target> </target>
<target name="run-system-with-secondary-core2"> <target name="run-system-with-secondary-core2duo">
<exec executable="qemu-system-x86_64"> <exec executable="qemu-system-x86_64">
<env key="QEMU_AUDIO_DRV" value="none"/> <env key="QEMU_AUDIO_DRV" value="none"/>
<arg line=" -kernel ${builddir}/boot/vmlinuz -cpu core2duo ${ENABLE_KVM_X86} -m 1024 -M pc -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/> <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu core2duo ${ENABLE_KVM_X86} -m 1024 -M pc -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
......
machines/P4-630/definition.xml
View file @ 9e21cb73
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
<property name="RUNTIME_WATCHDOG" value="16s"/> <property name="RUNTIME_WATCHDOG" value="16s"/>
<target name="run-system-p4-630"> <target name="run-system-p4-630">
<antcall target="run-system-core2"/> <antcall target="run-system-core2duo"/>
</target> </target>
<target name="run-system-with-secondary-p4-630"> <target name="run-system-with-secondary-p4-630">
<antcall target="run-system-with-secondary-core2"/> <antcall target="run-system-with-secondary-core2duo"/>
</target> </target>
</project> </project>
machines/QEMU-CORE2DUO/definition.xml
View file @ 9e21cb73
...@@ -16,12 +16,4 @@ ...@@ -16,12 +16,4 @@
<property name="SHUTDOWN_WATCHDOG" value="16s"/> <property name="SHUTDOWN_WATCHDOG" value="16s"/>
<property name="RUNTIME_WATCHDOG" value="16s"/> <property name="RUNTIME_WATCHDOG" value="16s"/>
<target name="run-system-core2duo">
<antcall target="run-system-core2"/>
</target>
<target name="run-system-with-secondary-core2duo">
<antcall target="run-system-with-secondary-core2"/>
</target>
</project> </project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment