Enable 32-bit Virtualbox scenarios for hw_x86_64_muen
* Announce VM service * Disable USB uhci and ehci as only xhci is supported on hw_x86_64_muen Issue #2016
This commit is contained in:
parent
63591160df
commit
4c5694184c
|
@ -62,8 +62,11 @@ if {[have_include "power_on/qemu"]} {
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
# Tested for nova.
|
# Tested for nova and hw_x86_64_muen.
|
||||||
assert_spec nova
|
if {(![have_spec nova] && ![have_spec hw_x86_64_muen])} {
|
||||||
|
puts "Platform is unsupported."
|
||||||
|
exit 0
|
||||||
|
}
|
||||||
|
|
||||||
set flavor "win7"
|
set flavor "win7"
|
||||||
set vdi_image "${flavor}.vdi"
|
set vdi_image "${flavor}.vdi"
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
# Tested for nova.
|
# Tested for nova and hw_x86_64_muen.
|
||||||
assert_spec nova
|
if {(![have_spec nova] && ![have_spec hw_x86_64_muen])} {
|
||||||
|
puts "Platform is unsupported."
|
||||||
|
exit 0
|
||||||
|
}
|
||||||
|
|
||||||
if {[have_include "power_on/qemu"]} {
|
if {[have_include "power_on/qemu"]} {
|
||||||
puts "\nRun script does not support Qemu.\n"
|
puts "\nRun script does not support Qemu.\n"
|
||||||
exit 0
|
exit 0
|
||||||
|
|
|
@ -37,7 +37,12 @@ set config {
|
||||||
<service name="PD"/>
|
<service name="PD"/>
|
||||||
<service name="RM"/>
|
<service name="RM"/>
|
||||||
<service name="CPU"/>
|
<service name="CPU"/>
|
||||||
<service name="LOG"/>
|
<service name="LOG"/>}
|
||||||
|
|
||||||
|
append_if [have_spec muen] config {
|
||||||
|
<service name="VM"/>}
|
||||||
|
|
||||||
|
append config {
|
||||||
</parent-provides>
|
</parent-provides>
|
||||||
<default-route>
|
<default-route>
|
||||||
<any-service> <parent/> <any-child/> </any-service>
|
<any-service> <parent/> <any-child/> </any-service>
|
||||||
|
@ -58,8 +63,15 @@ append_if [expr $use_ps2] config {
|
||||||
append_if [expr $use_usb] config {
|
append_if [expr $use_usb] config {
|
||||||
<start name="usb_drv" priority="-1">
|
<start name="usb_drv" priority="-1">
|
||||||
<resource name="RAM" quantum="7M"/>
|
<resource name="RAM" quantum="7M"/>
|
||||||
<provides><service name="Input"/></provides>
|
<provides><service name="Input"/></provides>}
|
||||||
<config uhci="yes" ehci="yes" xhci="yes">
|
|
||||||
|
append_if [expr $use_usb && ![have_spec hw_x86_64_muen]] config {
|
||||||
|
<config uhci="yes" ehci="yes" xhci="yes">}
|
||||||
|
|
||||||
|
append_if [expr $use_usb && [have_spec hw_x86_64_muen]] config {
|
||||||
|
<config uhci="no" ehci="no" xhci="yes">}
|
||||||
|
|
||||||
|
append_if [expr $use_usb] config {
|
||||||
<hid/>
|
<hid/>
|
||||||
</config>
|
</config>
|
||||||
</start>}
|
</start>}
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
assert_spec nova
|
if {(![have_spec nova] && ![have_spec hw_x86_64_muen])} {
|
||||||
|
puts "Platform is unsupported."
|
||||||
|
exit 0
|
||||||
|
}
|
||||||
|
|
||||||
if {[have_include "power_on/qemu"]} {
|
if {[have_include "power_on/qemu"]} {
|
||||||
puts "\nRun script does not support Qemu.\n"
|
puts "\nRun script does not support Qemu.\n"
|
||||||
|
@ -6,7 +9,7 @@ if {[have_include "power_on/qemu"]} {
|
||||||
}
|
}
|
||||||
|
|
||||||
append build_components {
|
append build_components {
|
||||||
core init virtualbox
|
core init virtualbox
|
||||||
server/part_blk
|
server/part_blk
|
||||||
server/rump_fs
|
server/rump_fs
|
||||||
server/fs_rom
|
server/fs_rom
|
||||||
|
@ -42,7 +45,12 @@ set config {
|
||||||
<service name="PD"/>
|
<service name="PD"/>
|
||||||
<service name="RM"/>
|
<service name="RM"/>
|
||||||
<service name="CPU"/>
|
<service name="CPU"/>
|
||||||
<service name="LOG"/>
|
<service name="LOG"/>}
|
||||||
|
|
||||||
|
append_if [have_spec muen] config {
|
||||||
|
<service name="VM"/>}
|
||||||
|
|
||||||
|
append config {
|
||||||
</parent-provides>
|
</parent-provides>
|
||||||
<default-route>
|
<default-route>
|
||||||
<any-service> <parent/> <any-child/> </any-service>
|
<any-service> <parent/> <any-child/> </any-service>
|
||||||
|
@ -116,8 +124,15 @@ append_if [expr $use_usb] config {
|
||||||
<provides><service name="File_system"/></provides>
|
<provides><service name="File_system"/></provides>
|
||||||
<config verbose="yes">
|
<config verbose="yes">
|
||||||
<content>
|
<content>
|
||||||
<inline name="usb_drv.config">
|
<inline name="usb_drv.config">}
|
||||||
<config uhci="yes" ehci="yes" xhci="yes">
|
|
||||||
|
append_if [expr $use_usb && ![have_spec hw_x86_64_muen]] config {
|
||||||
|
<config uhci="yes" ehci="yes" xhci="yes">}
|
||||||
|
|
||||||
|
append_if [expr $use_usb && [have_spec hw_x86_64_muen]] config {
|
||||||
|
<config uhci="no" ehci="no" xhci="yes">}
|
||||||
|
|
||||||
|
append_if [expr $use_usb] config {
|
||||||
<hid/>
|
<hid/>
|
||||||
<raw>
|
<raw>
|
||||||
<report devices="yes"/>
|
<report devices="yes"/>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user