opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 09:58:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

qemu,parseUSB: minor refactor

Browse Source 
Some comments from https://github.com/containers/podman/pull/20540

[NO NEW TESTS NEEDED]

Signed-off-by: Aditya R <arajan@redhat.com>
This commit is contained in:
Aditya R
2023-11-13 21:48:09 +05:30
parent a9a74dada2
commit 33ddd79e26
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/machine/qemu/config.go
View File

@ -86,18 +86,10 @@ func parseUSBs(usbs []string) ([]machine.USBConfig, error) {
return configs, fmt.Errorf("usb: fail to parse: missing '=': %s", str) return configs, fmt.Errorf("usb: fail to parse: missing '=': %s", str)
} }
option := "" option := left[0] + "_" + right[0]
if (left[0] == "bus" && right[0] == "devnum") ||
(right[0] == "bus" && left[0] == "devnum") {
option = "bus_devnum"
}
if (left[0] == "vendor" && right[0] == "product") ||
(right[0] == "vendor" && left[0] == "product") {
option = "vendor_product"
}
switch option { switch option {
case "bus_devnum": case "bus_devnum", "devnum_bus":
bus, devnumber := left[1], right[1] bus, devnumber := left[1], right[1]
if right[0] == "bus" { if right[0] == "bus" {
bus, devnumber = devnumber, bus bus, devnumber = devnumber, bus
@ -107,7 +99,7 @@ func parseUSBs(usbs []string) ([]machine.USBConfig, error) {
Bus: bus, Bus: bus,
DevNumber: devnumber, DevNumber: devnumber,
}) })
case "vendor_product": case "vendor_product", "product_vendor":
vendorStr, productStr := left[1], right[1] vendorStr, productStr := left[1], right[1]
if right[0] == "vendor" { if right[0] == "vendor" {
vendorStr, productStr = productStr, vendorStr vendorStr, productStr = productStr, vendorStr
@ -115,12 +107,12 @@ func parseUSBs(usbs []string) ([]machine.USBConfig, error) {
vendor, err := strconv.ParseInt(vendorStr, 16, 0) vendor, err := strconv.ParseInt(vendorStr, 16, 0)
if err != nil { if err != nil {
return configs, fmt.Errorf("fail to convert vendor of %s: %s", str, err) return configs, fmt.Errorf("usb: fail to convert vendor of %s: %s", str, err)
} }
product, err := strconv.ParseInt(productStr, 16, 0) product, err := strconv.ParseInt(productStr, 16, 0)
if err != nil { if err != nil {
return configs, fmt.Errorf("fail to convert product of %s: %s", str, err) return configs, fmt.Errorf("usb: fail to convert product of %s: %s", str, err)
} }
configs = append(configs, machine.USBConfig{ configs = append(configs, machine.USBConfig{