Statistics
| Branch: | Revision:

root / hw @ d72245fb

# Date Author Comment
d72245fb 07/30/2011 07:10 am Juha Riihimäki

hw/nand: Support multiple reads following READ STATUS

After receiving READ STATUS command all subsequent IO reads should return
the status register value until another command is issued.

Signed-off-by: Juha Riihimäki <>
[Riku Voipio: Fixes and restructuring patchset]...

48197dfa 07/30/2011 07:09 am Juha Riihimäki

hw/nand: Support devices wider than 8 bits

Support NAND devices which are wider than 8 bits.

Signed-off-by: Juha Riihimäki <>
[Riku Voipio: Fixes and restructuring patchset]
Signed-off-by: Riku Voipio <>
[Peter Maydell: More fixes and cleanups for upstream submission]...

ac2466cd 07/30/2011 07:01 am Andrzej Zaborowski

nand: Bump vmstate version after changing structure.

Signed-off-by: Andrzej Zaborowski <>

d5f2fd58 07/30/2011 07:00 am Juha Riihimäki

hw/nand: Support large NAND devices

Add support for NAND devices of over 1Gb.

Signed-off-by: Juha Riihimäki <>
[Riku Voipio: Fixes and restructuring patchset]
Signed-off-by: Riku Voipio <>
[Peter Maydell: More fixes and cleanups for upstream submission]...

522f253c 07/30/2011 07:00 am Peter Maydell

hw/nand: Pass block device state to init function

Pass the BlockDeviceState to the nand_init() function rather
than having it look it up via drive_get() itself.

Signed-off-by: Peter Maydell <>
Signed-off-by: Andrzej Zaborowski <>

c4f05c8c 07/30/2011 07:00 am Peter Maydell

lm832x: Take DeviceState pointer in lm832x_key_event()

Since lm832x has been qdev'ified, its users will generally
have a DeviceState pointer rather than an i2c_slave pointer,
so adjust lm832x_key_event's prototype to suit.

This allows the n810 (its only user) to actually pass a correct...

77831c20 07/30/2011 07:00 am Juha Riihimäki

hw/omap_gpio.c: Convert to qdev

Convert the OMAP GPIO module to qdev.

Signed-off-by: Juha Riihimäki <>
[Riku Voipio: Fixes and restructuring patchset]
Signed-off-by: Riku Voipio <>
[Peter Maydell: More fixes and cleanups for upstream submission]...

0a34f966 07/30/2011 07:00 am Peter Maydell

hw/omap_clk: Add the clock for the OMAP2430-specific fifth GPIO module

The OMAP2430 has a fifth GPIO module which earlier OMAP2 models lack; add
the clock definition for it.

Signed-off-by: Peter Maydell <>
Signed-off-by: Andrzej Zaborowski <>

f9049203 07/30/2011 07:00 am Juha Riihimäki

hw/omap_l4.c: Add helper function omap_l4_region_base

Add helper function omap_l4_region_base() to return the base address
of a particular region of an L4 target agent.

Signed-off-by: Juha Riihimäki <>
[Riku Voipio: Fixes and restructuring patchset]...

3046c984 07/29/2011 05:42 pm Anthony Liguori

Merge remote-tracking branch 'agraf/xen-next' into staging

e3745602 07/29/2011 05:39 pm Anthony Liguori

Merge remote-tracking branch 'kraxel/migration.2' into staging

6b8273a1 07/29/2011 05:33 pm Göran Weinholt

multiboot: Fix bss segment support

Multiboot images can specify a bss segment. The boot loader must clear
the memory of the bss and ensure that no modules or structures are
allocated inside it. Several fields are provided in the Multiboot
header that were previously not used properly. The header is now used...

33fa8234 07/29/2011 05:33 pm Dr. David Alan Gilbert

Fix last sector write on sd card

When writing the last sector of an SD card using WRITE_MULTIPLE_BLOCK
QEmu throws an error saying that we've run off the end, and leaves
itself in the wrong state.
Tested on ARM Vexpress model.

Signed-off-by: Dr. David Alan Gilbert <>...

4aa63af1 07/29/2011 04:25 pm Avi Kivity

pc: grab system_memory

While eventually this should come from the machine initialization function,
take a short cut to avoid converting all machines now.

Reviewed-by: Anthony Liguori <>
Signed-off-by: Avi Kivity <>
Signed-off-by: Anthony Liguori <>

00cb2a99 07/29/2011 04:25 pm Avi Kivity

pc: convert pc_memory_init() to memory API

Reviewed-by: Anthony Liguori <>
Signed-off-by: Avi Kivity <>
Signed-off-by: Anthony Liguori <>

6bd10515 07/29/2011 04:25 pm Avi Kivity

pc: move global memory map out of pc_init1() and into its callers

Signed-off-by: Avi Kivity <>
Signed-off-by: Anthony Liguori <>

1e39101c 07/29/2011 04:25 pm Avi Kivity

pci: pass address space to pci bus when created

This is now done sloppily, via get_system_memory(). Eventually callers
will be converted to stop using that.

Reviewed-by: Anthony Liguori <>
Signed-off-by: Avi Kivity <>
Signed-off-by: Anthony Liguori <>

79ff8cb0 07/29/2011 04:25 pm Avi Kivity

pci: add MemoryRegion based BAR management API

Allow registering a BAR using a MemoryRegion. Once all users are converted,
pci_register_bar() and pci_register_bar_simple() will be removed.

Reviewed-by: Anthony Liguori <>
Signed-off-by: Avi Kivity <>...

ec3bb837 07/29/2011 04:25 pm Avi Kivity

sysbus: add MemoryRegion based memory management API

Allow registering sysbus device memory using a MemoryRegion. Once all users
are converted, sysbus_init_mmio() and sysbus_init_mmio_cb() will be removed.

Reviewed-by: Anthony Liguori <>...

6da48311 07/29/2011 04:25 pm Avi Kivity

usb-ohci: convert to MemoryRegion

Reviewed-by: Anthony Liguori <>
Signed-off-by: Avi Kivity <>
Signed-off-by: Anthony Liguori <>

3d3b8303 07/29/2011 04:25 pm wayne

showing a splash picture when start

Added options to let qemu transfer two configuration files to bios:
"bootsplash.bmp" and "etc/boot-menu-wait", which could be specified by command
-boot splash=P,splash-time=T
P is jpg/bmp file name or an absolute path, T have a max value of 0xffff, unit...
5ab28c83 07/29/2011 04:17 pm Jan Kiszka

qdev: Reset hot-plugged devices

Device models rely on the core invoking their reset handlers after init.
We do this in the cold-plug case, but so far we miss this step after
hot-plug.

Signed-off-by: Jan Kiszka <>
Signed-off-by: Anthony Liguori <>

679f4f8b 07/26/2011 08:02 am Stefano Stabellini

xen: implement unplug protocol in xen_platform

The unplug protocol is necessary to support PV drivers in the guest: the
drivers expect to be able to "unplug" emulated disks and nics before
initializing the Xen PV interfaces.
It is responsibility of the guest to make sure that the unplug is done...

59d21e53 07/26/2011 07:43 am Alexander Graf

xen: make xen_enabled even more clever

When using xen_enabled() we're currently only checking if xen is enabled
at all during the build. But what if you want to build multiple targets
out of which only one can potentially run xen code?

That means that for generic code we'll still have to fall back to the...

30ab6125 07/26/2011 07:43 am Anthony PERARD

xen: Fix xen_enabled().

Use the "host" CONFIG_ define instead of the "target" one.

Signed-off-by: Anthony PERARD <>
Acked-by: Paolo Bonzini <>
Signed-off-by: Alexander Graf <>

aad04cd0 07/24/2011 05:48 pm Blue Swirl

Fix chrdev return value conversion

6e1db57b2ac9025c2443c665a0d9e78748637b26 didn't
convert brlapi or win32 chrdevs, breaking build for those.

Fix by converting the chrdevs.

Acked-by: Kevin Wolf <>
Signed-off-by: Blue Swirl <>

17604dac 07/23/2011 07:26 pm Jan Kiszka

mc146818rtc: Handle host clock resets

Make use of the new clock reset notifier to update the RTC whenever
rtc_clock is the host clock and that happens to jump backward. This
avoids that the RTC stalls for the period the host clock was set back.

Signed-off-by: Jan Kiszka <>...

8e31bf38 07/23/2011 07:26 pm Matthew Fernandez

Correct spelling of licensed

Correct typos of "licenced" to "licensed".

Reviewed-by: Stefan Weil <>
Reviewed-by: Andreas F=E4rber <>
Signed-off-by: Matthew Fernandez <>
Signed-off-by: Anthony Liguori <>

9e8dd451 07/23/2011 07:26 pm Jan Kiszka

notifier: Pass data argument to callback

This allows to pass additional information to the notifier callback
which is useful if sender and receiver do not share any other distinct
data structure.

Will be used first for the clock reset notifier.

Signed-off-by: Jan Kiszka <>...

e0e8384d 07/23/2011 07:21 pm Markus Armbruster

ide: Turn properties any IDE device must have into bus properties

Signed-off-by: Markus Armbruster <>
Signed-off-by: Anthony Liguori <>

d6cca4b0 07/23/2011 07:20 pm Markus Armbruster

virtio-serial: Turn props any virtio-serial-bus device must have into bus props

Signed-off-by: Markus Armbruster <>
Signed-off-by: Anthony Liguori <>

1cc2428c 07/23/2011 07:20 pm Markus Armbruster

usb-ccid: Drop unused CCIDCardInfo callback print()

Signed-off-by: Markus Armbruster <>
Signed-off-by: Anthony Liguori <>

021a1318 07/23/2011 07:20 pm Markus Armbruster

virtio-serial: Clean up virtser_bus_dev_print() output

Old version looks like this in info qtree (last four lines):

dev: virtconsole, id "" 
dev-prop: is_console = 1
dev-prop: nr = 0
dev-prop: chardev = &lt;null&gt;...
0fe28e0d 07/23/2011 07:19 pm Richard Henderson

vga: Fix type of lfb/map_addr/end.

These addresses have been passed through pci_to_cpu_addr,
and thus need to be full target_phys_addr_t.

Acked-by: Jan Kiszka <>
Signed-off-by: Richard Henderson <>
Cc: Jan Kiszka <>...

6e1db57b 07/23/2011 07:18 pm Kevin Wolf

qemu-char: Print strerror message on failure

The only way for chardev drivers to communicate an error was to return a NULL
pointer, which resulted in an error message that said that something went
wrong, but not why.

This patch changes the interface to return 0/-errno and updates...

6141dbfe 07/23/2011 06:56 pm Paolo Bonzini

report serial devices created with -device in the PIIX4 config space

Serial and parallel devices created with -device are not reported in
the PIIX4 configuration space, and are hence not picked up by the DSDT.
This upsets Windows, which hides them altogether from the guest....

49e40b66 07/23/2011 06:56 pm Adam Lackorzynski

multiboot: Support commas in module parameters

Support commas in the parameter list of multiboot modules as well as for the
kernel command line, by using double commas (via get_opt_value()).

Signed-off-by: Adam Lackorzynski <>
Reviewed-by: Kevin Wolf <>...

6eed1856 07/23/2011 06:19 pm Jan Kiszka

net: Consistently use qemu_macaddr_default_if_unset

Drop the open-coded MAC assignment from net_init_nic and replace it with
standard qemu_macaddr_default_if_unset which is also used by qdev. That
avoid creating colliding MACs when instantiating NICs via different...

e07fc405 07/22/2011 05:24 pm Anthony Liguori

Merge remote-tracking branch 'spice/spice.v39' into staging

cfe7bb19 07/22/2011 05:23 pm Anthony Liguori

Merge remote-tracking branch 'kraxel/usb.21' into staging

bf1cd9b4 07/22/2011 05:23 pm Anthony Liguori

Merge remote-tracking branch 'kwolf/for-anthony' into staging

e7e73892 07/22/2011 02:36 pm Gerd Hoffmann

usb-hid: fixup changed tracking.

Remove leftover calls to usb_hid_changed().

Take care to update the changed flag after delivering a event via
GET_REPORT like we do when sending events via interrupt endpoint.

Signed-off-by: Gerd Hoffmann <>

0070f095 07/22/2011 02:36 pm Gerd Hoffmann

usb-uhci: fix irq handling on error.

Spec on UHCI_STS_USBERR: "If the TD on which the error interrupt
occurred also had its IOC bit set, both this bit and Bit 0 are set."

Make UHCI emulation do that.

Signed-off-by: Gerd Hoffmann <>

cd3e2409 07/20/2011 11:54 pm Hervé Poussineau

ds1225y: convert to qdev device, and use it in MIPS Jazz emulation

Signed-off-by: Hervé Poussineau <>
Signed-off-by: Blue Swirl <>

d43ed9ec 07/20/2011 11:54 pm Hervé Poussineau

ds1225y: use trace framework

Signed-off-by: Hervé Poussineau <>
Signed-off-by: Blue Swirl <>

86f25c7c 07/20/2011 11:54 pm Hervé Poussineau

ds1225y: Remove protection stuff, which doesn't belong to this device

Signed-off-by: Hervé Poussineau <>
Signed-off-by: Blue Swirl <>

b7ce1b27 07/20/2011 03:49 pm Gerd Hoffmann

ahci doesn't support migration

Signed-off-by: Gerd Hoffmann <>

9490fb06 07/20/2011 03:49 pm Gerd Hoffmann

ehci doesn't support migration

Signed-off-by: Gerd Hoffmann <>

f54b6563 07/20/2011 03:49 pm Gerd Hoffmann

usb storage: first migration support bits.

Tag vmstate as unmigratable for the time being,
to be removed when mgration support is finished.

Signed-off-by: Gerd Hoffmann <>

ccce9fd2 07/20/2011 03:49 pm Gerd Hoffmann

usb-wacom doesn't support migration

Signed-off-by: Gerd Hoffmann <>

2474e505 07/20/2011 03:49 pm Gerd Hoffmann

usb-bt doesn't support migration

Signed-off-by: Gerd Hoffmann <>

4ab0ba9e 07/20/2011 03:49 pm Gerd Hoffmann

usb-net doesn't support migration

Signed-off-by: Gerd Hoffmann <>

98e51ec9 07/20/2011 03:49 pm Gerd Hoffmann

usb-serial doesn't support migration

Signed-off-by: Gerd Hoffmann <>

8927cfbb 07/20/2011 11:08 am Yonit Halperin

qxl: upon reset, if spice worker is stopped, the command rings can be not empty

Spice worker does no longer process commands when it is stopped.
Otherwise, it might crash during migration when attempting to process
commands while the guest is not completely loaded....

2837c8ea 07/20/2011 10:23 am Gerd Hoffmann

vmstate: add no_migrate flag to VMStateDescription

This allows to easily tag devices as non-migratable,
so any attempt to migrate a virtual machine with the
device in question active will make migration fail.

Signed-off-by: Gerd Hoffmann <>

653c1c3f 07/19/2011 04:39 pm Hannes Reinecke

scsi-disk: Fixup debugging statement

A debugging statement wasn't converted to the new interface.

Signed-off-by: Hannes Reinecke <>
Acked-by: Paolo Bonzini <>
Signed-off-by: Kevin Wolf <>

3e1c0c9a 07/19/2011 04:39 pm Hannes Reinecke

scsi-disk: Mask out serial number EVPD

If the serial number is not set we should mask it out in the
list of supported VPD pages and mark it as not supported.

Signed-off-by: Hannes Reinecke <>
Acked-by: Paolo Bonzini <>
Signed-off-by: Kevin Wolf <>

c5bf71a9 07/19/2011 04:38 pm Hannes Reinecke

scsi: Add 'hba_private' to SCSIRequest

'tag' is just an abstraction to identify the command
from the driver. So we should make that explicit by
replacing 'tag' with a driver-defined pointer 'hba_private'.
This saves the lookup for driver handling several commands...

03ff0958 07/19/2011 04:04 pm Anthony Liguori

Merge remote-tracking branch 'agraf/xen-next' into staging

b4dabf95 07/19/2011 04:03 pm Anthony Liguori

Merge remote-tracking branch 'kraxel/usb.19' into staging

de20fbca 07/19/2011 04:02 pm Anthony Liguori

Merge remote-tracking branch 'spice/spice.v38' into staging

67345294 07/19/2011 03:43 pm Anthony Liguori

Merge remote-tracking branch 'mst/for_anthony' into staging

348e7b8d 07/18/2011 05:06 pm Hannes Reinecke

iov: Update parameter usage in iov_(to|from)_buf()

iov_to_buf() has an 'offset' parameter, iov_from_buf() hasn't.
This patch adds the missing parameter to iov_from_buf().
It also renames the 'offset' parameter to 'iov_off' to
emphasize it's the offset into the iovec and not the buffer....

95c9cde2 07/18/2011 01:00 pm Amit Shah

virtio-serial-bus: Fix trailing \n in error_report string

Markus fixed offenders in the file but one instance sneaked in via
another patch. Fix it.

Signed-off-by: Amit Shah <>

0219d732 07/18/2011 01:00 pm Amit Shah

virtio-console: Prevent abort()s in case of host chardev close

A host chardev could close just before the guest sends some data to be
written. This will cause an -EPIPE error. This shouldn't be propagated
to virtio-serial-bus.

Ideally we should close the port once -EPIPE is received, but since the...

49e3fdd7 07/18/2011 01:00 pm Amit Shah

virtio-serial-bus: Add trace events

Add some trace events for messages passed between the guest and host.

Signed-off-by: Amit Shah <>

d02e4fa4 07/18/2011 01:00 pm Amit Shah

virtio-console: Add some trace events

Add some trace events for messages passed between the char layer and the
virtio-serial bus.

Signed-off-by: Amit Shah <>

33d5ad53 07/17/2011 06:47 pm Michael S. Tsirkin

pci_ids: tweak names to match linux/pci_ids.h

Sync xen names to ones used by linux. Add
xen platform device id as well.

Signed-off-by: Michael S. Tsirkin <>

ce4fd422 07/17/2011 06:47 pm Anthony PERARD

hw/piix_pci.c: Fix PIIX3-xen to initialize ids

Signed-off-by: Anthony PERARD <>
Signed-off-by: Michael S. Tsirkin <>

0d2b962d 07/17/2011 06:47 pm Michael S. Tsirkin

xen: move to new pci initializers

move ids to pci info structure

Signed-off-by: Michael S. Tsirkin <>

c8eac1cf 07/17/2011 06:47 pm Michael S. Tsirkin

virtio: fix indirect descriptor buffer overflow

We were previously allowing arbitrarily-long indirect descriptors, which
could lead to a buffer overflow in qemu-kvm process.

CVE-2011-2212

Signed-off-by: Michael S. Tsirkin <>

c1be973a 07/17/2011 06:47 pm Michael S. Tsirkin

vhost: fix double free on device stop

vhost dev stop failed to clear the log field.
Typically not an issue as dev start overwrites this field,
but if logging gets disabled before the following start,
it doesn't so this causes a double free.

Signed-off-by: Michael S. Tsirkin <>

5e6b701a 07/17/2011 02:54 am Stefano Stabellini

xen_console: fix memory leak

con_init leaks the string "type", fix it.

Signed-off-by: Stefano Stabellini <>
Signed-off-by: Alexander Graf <>

37cdfcf1 07/17/2011 02:54 am Stefano Stabellini

xen: add vkbd support for PV on HVM guests

Register the vkbd backend even when running as device emulator for HVM
guests: it is useful because it doesn't need a frequent timer like usb.

Check whether the XenInput DisplayState has been set in the initialise...

5ea3c2b4 07/17/2011 02:54 am Stefano Stabellini

xen_disk: cope with missing xenstore "params" node

When disk is a cdrom and the drive is empty the "params" node in
xenstore might be missing completely: cope with it instead of
segfaulting.

Updated in v2:

- actually removed the strchr(blkdev->params, ':') that caused the...

7cef3f4f 07/17/2011 02:54 am Stefano Stabellini

xen_disk: treat "aio" as "raw"

Sometimes the toolstack uses "aio" without an additional format
identifier, in such cases use "raw".

Updated in v2:

- fix code style.

Signed-off-by: Stefano Stabellini <>
Signed-off-by: Alexander Graf <>

0f51726a 07/17/2011 02:54 am Stefano Stabellini

xen_console: support the new extended xenstore protocol

Since CS 21994 on xen-unstable.hg and CS
466608f3a32e1f9808acdf832a5843af37e5fcec on qemu-xen-unstable.git, few
changes have been introduced to the PV console xenstore protocol, as
described by the document docs/misc/console.txt under xen-unstable.hg....

25a11813 07/17/2011 02:54 am Alexander Graf

xen_console: fall back to qemu serial device

The new xen_console protocol changed the default xen_console output device
from whatever Qemu chose to whatever xenstore choses and "pty" as fallback.

This is not how Qemu works. It has its own serial redirection semantics. So...

868bb33f 07/17/2011 02:54 am Jan Kiszka

xen: Fold CONFIG_XEN_MAPCACHE into CONFIG_XEN

Xen won't be enabled if there is no backend support available for the
host. And that also means the map cache will work. So drop the separate
config switch and move the required stubs over to xen-stub.c.

Signed-off-by: Jan Kiszka <>...

429bef69 07/13/2011 12:29 am Hervé Poussineau

esp: cancel current request only if some request is in flight

This bug was introduced in 94d3f98a3f3caddd7875f9a11776daeb84962a7b:
scsi_cancel_io was checking if some request was pending before trying
to cancel it, while scsi_req_cancel always cancels the request....

06c46bba 07/12/2011 11:00 pm Alexander Graf

spapr: use specific endian ld/st_phys

Signed-off-by: Alexander Graf <>
Signed-off-by: Blue Swirl <>

04bc74ed 07/12/2011 11:00 pm Alexander Graf

s390-virtio: use specific endian ld/st_phys

Signed-off-by: Alexander Graf <>
Signed-off-by: Blue Swirl <>

db663d0f 07/12/2011 11:00 pm Alexander Graf

ppc405_uc: use specific endian ld/st_phys

Signed-off-by: Alexander Graf <>
Signed-off-by: Blue Swirl <>

75b0646f 07/12/2011 11:00 pm Alexander Graf

pl080: use specific endian ld/st_phys

Signed-off-by: Alexander Graf <>
Signed-off-by: Blue Swirl <>

ae5d3eb4 07/12/2011 11:00 pm Alexander Graf

msix: use specific endian ld/st_phys

Signed-off-by: Alexander Graf <>
Signed-off-by: Blue Swirl <>

c5d29d2f 07/12/2011 11:00 pm Alexander Graf

msi: use specific endian ld/st_phys

Signed-off-by: Alexander Graf <>
Signed-off-by: Blue Swirl <>

6c7796e5 07/12/2011 11:00 pm Alexander Graf

intel-hda: use specific endian ld/st_phys

Signed-off-by: Alexander Graf <>
Signed-off-by: Blue Swirl <>

8517263f 07/12/2011 11:00 pm Alexander Graf

hpet: use specific endian ld/st_phys

Signed-off-by: Alexander Graf <>
Signed-off-by: Blue Swirl <>

eb3b58f9 07/08/2011 12:26 pm Jes Sorensen

usb_register_port(): do not set port->opaque and port->index twice

Signed-off-by: Jes Sorensen <>
Signed-off-by: Gerd Hoffmann <>

dd850cf2 07/08/2011 12:26 pm Gerd Hoffmann

usb: fixup bluetooth descriptors

Commit 4696425cd05c7baa0a4b469d43ba4b8488bcfc0f changes some
endpoints from isocrounous to interrupt by mistake. Fix it.

Signed-off-by: Gerd Hoffmann <>

6c238527 07/08/2011 12:26 pm Gerd Hoffmann

usb-hub: remove unused descriptor arrays

Somehow they where left over when converting the hub
to the new usb descriptor infrastructure ...

Signed-off-by: Gerd Hoffmann <>

3dc345d5 07/08/2011 12:26 pm Gerd Hoffmann

usb-ohci: raise interrupt on attach

Got lost in commit 618c169b577db64ac6589ad48825d2e11760d1a6,
add it back in. Also fix codestyle while we are at it.

Signed-off-by: Gerd Hoffmann <>

fbd97532 07/05/2011 04:09 pm Hans de Goede

usb-ehci: Fix handling of PED and PEDC port status bits

The PED bit should only be set for highspeed devices and the PEDC bit
should not be set on "normal" PED bit changes, only on io errors.

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>

a0a3167a 07/05/2011 04:09 pm Hans de Goede

usb-ehci: Add support for registering companion controllers

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>

35e4977f 07/05/2011 04:09 pm Hans de Goede

usb-uhci: Add support for being a companion controller

To use as a companion controller set the masterbus property.

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>

9c9fc334 07/05/2011 04:09 pm Hans de Goede

usb-ohci: Add support for being a companion controller

To use as a companion controller, use pci-ohci as device and set the
masterbus and num-ports properties, ie:

-device usb-ehci,addr=0b.1,multifunction=on,id=ehci0
-device pci-ohci,addr=0b.0,multifunction=on,masterbus=ehci0.0,num-ports=4...

f9ebf5e5 07/05/2011 04:09 pm Gerd Hoffmann

pci: add ich9 usb controller ids

Signed-off-by: Gerd Hoffmann <>

1b5a7570 07/05/2011 04:09 pm Gerd Hoffmann

uhci: add ich9 controllers

Add ich9 controllers, Factor out properties to a separate
struct and reference it to reduce duplication.

Signed-off-by: Gerd Hoffmann <>

5cc194ca 07/05/2011 04:09 pm Gerd Hoffmann

ehci: fix port count.

The ICH4 EHCI controller which we emulate has six ports not four.

Signed-off-by: Gerd Hoffmann <>

3028376e 07/05/2011 04:09 pm Gerd Hoffmann

ehci: add ich9 controller.

Signed-off-by: Gerd Hoffmann <>