| commit | adb76372d9b324468da0bf9ca707da94c0adf209 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Fri, 21 Jan 2011 20:12:11 +0000 (21 18:12 -0200) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Fri, 21 Jan 2011 20:12:11 +0000 (21 18:12 -0200) | ||
| tree | a7d1a6870a1b08d9f5268d957917cc888379254e | treesnapshot (tar.gz zip) |
| parent | 966eb0dfc6c080e9b870615baa27925414ec7a51 | commitdiff |
| parent | 668643b025dcff72b9b18adb5df794be9e9be5dc | commitdiff |
Merge commit '668643b025dcff72b9b18adb5df794be9e9be5dc' into upstream-merge
* commit '668643b025dcff72b9b18adb5df794be9e9be5dc':
acpi_piix4: expose no_hotplug attribute via i/o port
document QEMU<->ACPIBIOS PCI hotplug interface
virtio-serial-bus: bump up control vq size to 32
ioeventfd: error handling cleanup
docs: Document virtio PCI -device ioeventfd=on|off
virtio-pci: Use ioeventfd for virtqueue notify
Conflicts:
hw/acpi_piix4.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '668643b025dcff72b9b18adb5df794be9e9be5dc':
acpi_piix4: expose no_hotplug attribute via i/o port
document QEMU<->ACPIBIOS PCI hotplug interface
virtio-serial-bus: bump up control vq size to 32
ioeventfd: error handling cleanup
docs: Document virtio PCI -device ioeventfd=on|off
virtio-pci: Use ioeventfd for virtqueue notify
Conflicts:
hw/acpi_piix4.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| hw/acpi_piix4.c | diff1 | diff2 | blobhistory |
| hw/virtio-pci.c | diff1 | diff2 | blobhistory |