diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2016-06-08 17:50:25 -0300 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2016-06-13 13:24:41 +0200 |
| commit | 4bcbe0b63661b1df8e78d58270574d818b387d2c (patch) | |
| tree | d99ede42b1c14764f6bbe2b3c0ddb8664e847e63 /hw/arm | |
| parent | c92cfba822245c42fec611f310ed74c1821be3d2 (diff) | |
| download | qemu-4bcbe0b63661b1df8e78d58270574d818b387d2c.tar.gz | |
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')
| -rw-r--r-- | hw/arm/nseries.c | 2 | ||||
| -rw-r--r-- | hw/arm/realview.c | 2 | ||||
| -rw-r--r-- | hw/arm/versatilepb.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index d4eb141764..fea911e3e3 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -1351,7 +1351,7 @@ static void n8x0_init(MachineState *machine, n8x0_dss_setup(s); n8x0_cbus_setup(s); n8x0_uart_setup(s); - if (usb_enabled()) { + if (machine_usb(machine)) { n8x0_usb_setup(s); } diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 7d0aa6ff4f..8eafccaf1d 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -254,7 +254,7 @@ static void realview_init(MachineState *machine, sysbus_connect_irq(busdev, 2, pic[50]); sysbus_connect_irq(busdev, 3, pic[51]); pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci"); - if (usb_enabled()) { + if (machine_usb(machine)) { pci_create_simple(pci_bus, -1, "pci-ohci"); } n = drive_get_max_bus(IF_SCSI); 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); |