diff options
| author | Eduardo Habkost | 2016-06-08 22:50:25 +0200 |
|---|---|---|
| committer | Gerd Hoffmann | 2016-06-13 13:24:41 +0200 |
| commit | 4bcbe0b63661b1df8e78d58270574d818b387d2c (patch) | |
| tree | d99ede42b1c14764f6bbe2b3c0ddb8664e847e63 /hw/arm/versatilepb.c | |
| parent | pxa2xx: Unconditionally enable USB controller (diff) | |
| download | qemu-4bcbe0b63661b1df8e78d58270574d818b387d2c.tar.gz qemu-4bcbe0b63661b1df8e78d58270574d818b387d2c.tar.xz qemu-4bcbe0b63661b1df8e78d58270574d818b387d2c.zip | |
vl: Eliminate usb_enabled()
This wrapper for machine_usb(current_machine) is not necessary,
replace all usages of usb_enabled() with machine_usb().
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Alexander Graf <agraf@suse.de>
Cc: qemu-arm@nongnu.org
Cc: qemu-ppc@nongnu.org
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-id: 1465419025-21519-3-git-send-email-ehabkost@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/arm/versatilepb.c')
| -rw-r--r-- | hw/arm/versatilepb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 20dd3561c8..8ae5392bcc 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -276,7 +276,7 @@ static void versatile_init(MachineState *machine, int board_id) pci_nic_init_nofail(nd, pci_bus, "rtl8139", NULL); } } - if (usb_enabled()) { + if (machine_usb(machine)) { pci_create_simple(pci_bus, -1, "pci-ohci"); } n = drive_get_max_bus(IF_SCSI); |