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/ppc | |
| parent | c92cfba822245c42fec611f310ed74c1821be3d2 (diff) | |
| download | qemu-4bcbe0b63661b1df8e78d58270574d818b387d2c.zip qemu-4bcbe0b63661b1df8e78d58270574d818b387d2c.tar.gz qemu-4bcbe0b63661b1df8e78d58270574d818b387d2c.tar.bz2 | |
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/ppc')
| -rw-r--r-- | hw/ppc/mac_oldworld.c | 2 | ||||
| -rw-r--r-- | hw/ppc/prep.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index a9bb1c2..4479487 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -309,7 +309,7 @@ static void ppc_heathrow_init(MachineState *machine) dev = qdev_create(adb_bus, TYPE_ADB_MOUSE); qdev_init_nofail(dev); - if (usb_enabled()) { + if (machine_usb(machine)) { pci_create_simple(pci_bus, -1, "pci-ohci"); } diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 07ffe72..054af1e 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -649,7 +649,7 @@ static void ppc_prep_init(MachineState *machine) memory_region_add_subregion(sysmem, 0xFEFF0000, xcsr); #endif - if (usb_enabled()) { + if (machine_usb(machine)) { pci_create_simple(pci_bus, -1, "pci-ohci"); } |