parent
c39a342fe5
commit
cb5b688eb9
|
@ -220,14 +220,6 @@ As illustrated by this example, the use of the nested configuration feature
|
||||||
enables the construction of arbitrarily complex component trees via a single
|
enables the construction of arbitrarily complex component trees via a single
|
||||||
configuration file.
|
configuration file.
|
||||||
|
|
||||||
Alternatively to specifying all nested configurations in a single config file,
|
|
||||||
any sub configuration can be placed in a separate file specified via the
|
|
||||||
'configfile' node. For example:
|
|
||||||
! <start name="nitpicker">
|
|
||||||
! <resource name="RAM" quantum="1M"/>
|
|
||||||
! <configfile name="nitpicker.config"/>
|
|
||||||
! </start>
|
|
||||||
|
|
||||||
|
|
||||||
Assigning subsystems to CPUs
|
Assigning subsystems to CPUs
|
||||||
============================
|
============================
|
||||||
|
|
|
@ -174,12 +174,6 @@
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
</xs:element> <!-- "exit" -->
|
</xs:element> <!-- "exit" -->
|
||||||
|
|
||||||
<xs:element name="configfile">
|
|
||||||
<xs:complexType>
|
|
||||||
<xs:attribute name="name" type="xs:string" />
|
|
||||||
</xs:complexType>
|
|
||||||
</xs:element> <!-- "configfile" -->
|
|
||||||
|
|
||||||
<xs:element name="provides">
|
<xs:element name="provides">
|
||||||
<xs:complexType>
|
<xs:complexType>
|
||||||
<xs:choice maxOccurs="unbounded">
|
<xs:choice maxOccurs="unbounded">
|
||||||
|
|
|
@ -458,29 +458,7 @@ Sandbox::Child::resolve_session_request(Service::Name const &service_name,
|
||||||
Session::Diag{false} };
|
Session::Diag{false} };
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* \deprecated the support for the <configfile> tag will
|
* If there is no inline '<config>', we apply the regular session
|
||||||
* be removed
|
|
||||||
*/
|
|
||||||
if (_start_node->xml().has_sub_node("configfile")) {
|
|
||||||
|
|
||||||
typedef String<50> Name;
|
|
||||||
Name const rom =
|
|
||||||
_start_node->xml().sub_node("configfile")
|
|
||||||
.attribute_value("name", Name());
|
|
||||||
|
|
||||||
/* prevent infinite recursion */
|
|
||||||
if (rom == "config") {
|
|
||||||
error("configfile must not be named 'config'");
|
|
||||||
throw Service_denied();
|
|
||||||
}
|
|
||||||
|
|
||||||
return resolve_session_request(service_name,
|
|
||||||
prefixed_label(name(), rom));
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If there is neither an inline '<config>' nor a
|
|
||||||
* '<configfile>' node present, we apply the regular session
|
|
||||||
* routing to the "config" ROM request.
|
* routing to the "config" ROM request.
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue