motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 15:53:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch pci into master

Browse source 
Merge master and pci branch, resolve build breakage in hw/esp.c
introduced by f90c2bcd.

Conflicts:
	hw/esp.c
This commit is contained in:
Michael S. Tsirkin 2012-07-29 17:03:19 +03:00
commit 5e59b02435
33 changed files with 338 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hw/pci_internals.h
View file

@ -22,6 +22,7 @@ struct PCIBus {
uint8_t devfn_min;
pci_set_irq_fn set_irq;
pci_map_irq_fn map_irq;
pci_route_irq_fn route_intx_to_irq;
pci_hotplug_fn hotplug;
DeviceState *hotplug_qdev;
void *irq_opaque;