Commit 09f28e5b authored Jan 06, 2015 by Marcel Apfelbaum Committed by Alexander Graf Jan 07, 2015

hw/usb: simplified usb_enabled



The argument is not longer used and the implementation
uses now QOM instead of QemuOpts.

Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alexander Graf <agraf@suse.de>

parent 759bf45d

hw/arm/nseries.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1344,7 +1344,7 @@ static void n8x0_init(MachineState *machine,
		n8x0_dss_setup(s);
		n8x0_cbus_setup(s);
		n8x0_uart_setup(s);
		if (usb_enabled(false)) {
		if (usb_enabled()) {
		n8x0_usb_setup(s);
		}

hw/arm/pxa2xx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2143,7 +2143,7 @@ PXA2xxState pxa270_init(MemoryRegion address_space,
		s->ssp[i] = (SSIBus *)qdev_get_child_bus(dev, "ssi");
		}

		if (usb_enabled(false)) {
		if (usb_enabled()) {
		sysbus_create_simple("sysbus-ohci", 0x4c000000,
		qdev_get_gpio_in(s->pic, PXA2XX_PIC_USBH1));
		}
		@@ -2276,7 +2276,7 @@ PXA2xxState pxa255_init(MemoryRegion address_space, unsigned int sdram_size)
		s->ssp[i] = (SSIBus *)qdev_get_child_bus(dev, "ssi");
		}

		if (usb_enabled(false)) {
		if (usb_enabled()) {
		sysbus_create_simple("sysbus-ohci", 0x4c000000,
		qdev_get_gpio_in(s->pic, PXA2XX_PIC_USBH1));
		}

hw/arm/realview.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -261,7 +261,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(false)) {
		if (usb_enabled()) {
		pci_create_simple(pci_bus, -1, "pci-ohci");
		}
		n = drive_get_max_bus(IF_SCSI);

hw/arm/versatilepb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -281,7 +281,7 @@ static void versatile_init(MachineState *machine, int board_id)
		pci_nic_init_nofail(nd, pci_bus, "rtl8139", NULL);
		}
		}
		if (usb_enabled(false)) {
		if (usb_enabled()) {
		pci_create_simple(pci_bus, -1, "pci-ohci");
		}
		n = drive_get_max_bus(IF_SCSI);

hw/i386/pc_piix.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -274,7 +274,7 @@ static void pc_init1(MachineState *machine,
		pc_cmos_init(below_4g_mem_size, above_4g_mem_size, machine->boot_order,
		machine, floppy, idebus[0], idebus[1], rtc_state);

		if (pci_enabled && usb_enabled(false)) {
		if (pci_enabled && usb_enabled()) {
		pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci");
		}