usb_enabled() is just a wrapper for machine_usb(current_machine) and is not necessary, replace all usages of usb_enabled() with machine_usb().
In the case of pxa2xx, just remove usb_enabled() usage completely. Eduardo Habkost (2): pxa2xx: Unconditionally enable USB controller vl: Eliminate usb_enabled() hw/arm/nseries.c | 2 +- hw/arm/pxa2xx.c | 12 ++++-------- hw/arm/realview.c | 2 +- hw/arm/versatilepb.c | 2 +- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/prep.c | 2 +- include/sysemu/sysemu.h | 1 - vl.c | 11 +++-------- 10 files changed, 14 insertions(+), 24 deletions(-) -- 2.5.5
