ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-30 08:03:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qemu-usb: solely support labels in policy

Browse Source 
Remove vendor/product/bus/dev from policy parsing and as criteria to decide
whether to keep USB devices.

Issue #4492
This commit is contained in:
Alexander Boettcher 2022-04-28 11:30:01 +02:00 committed by Christian Helmuth
parent dada0dff78
commit a8402ae782
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
repos/libports/src/lib/qemu-usb/host.cc
View File

@ -210,32 +210,15 @@ struct Dev_info
{
Session_label const label;
uint32_t const vendor, product;
uint16_t const bus, dev;
Dev_info(Session_label label, uint16_t bus, uint16_t dev,
uint32_t vendor, uint32_t product)
:
label(label), vendor(vendor), product(product), bus(bus), dev(dev)
{ }
Dev_info(Session_label &label) : label(label) { }
void print(Output &out) const
{
Genode::print(out, label, " ",
Hex(bus, Hex::OMIT_PREFIX, Hex::PAD), ":",
Hex(dev, Hex::OMIT_PREFIX, Hex::PAD), " (",
"vendor=", Hex(vendor, Hex::OMIT_PREFIX), ", ",
"product=", Hex(product, Hex::OMIT_PREFIX), ")");
Genode::print(out, label);
}
bool operator != (Dev_info const &other) const
{
if (bus && dev)
return bus != other.bus || dev != other.dev;
if (vendor && product)
return vendor != other.vendor || product != other.product;
if (label.length() && other.label.length())
return label != other.label;
@ -1002,13 +985,9 @@ struct Usb_devices : List<Usb_host_device>
Xml_node devices_node(_devices_rom.local_addr<char>(), _devices_rom.size());
devices_node.for_each_sub_node("device", [&] (Xml_node const &node) {
auto const product = node.attribute_value("product_id", 0u);
auto const vendor = node.attribute_value("vendor_id", 0u);
auto const bus = node.attribute_value("bus", 0u);
auto const dev = node.attribute_value("dev", 0u);
Session_label label = node.attribute_value("label", String<160>());
Dev_info const dev_info(label, bus, dev, vendor, product);
Dev_info const dev_info(label);
if (!node.has_attribute("label")) {
error("no label found for device ", dev_info);