Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/hw/pci.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'upstream/stable-0.12' into stable-0.12Avi Kivity2010-01-171-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/stable-0.12: (27 commits) Update version and changelog for release Update SeaBIOS to 0.5.1 Qemu's internal TFTP server breaks lock-step-iness of TFTP osdep.c: Fix accept4 fallback pc: add rombar to compat properties for pc-0.10 and pc-0.11 pci: allow loading roms via fw_cfg. roms: rework rom loading via fw fw_cfg: rom loader tweaks. roms: minor fixes and cleanups. pc: add machine type for 0.12 loader: more ignores for rom intended to be loaded by the bios vnc_refresh: return if vd->timer is NULL QMP: Don't free async event's 'data' Handle TFTP ERROR from client dmg: fix ->open failure virtio-pci: thinko fix pc-bios: Update README (SeaBIOS) vmware_vga: Check cursor dimensions passed from guest to avoid buffer overflow remove pending exception on vcpu reset. Fix CPU topology initialization ... Conflicts: hw/pc.c hw/pci.h qemu-options.hx Signed-off-by: Avi Kivity <avi@redhat.com>
| * pci: allow loading roms via fw_cfg.Gerd Hoffmann2010-01-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | This patch adds a pci bus property 'rombar' which specifies whenever the pci rom should be loaded via pci rom bar (default) or via fw_cfg. The later can be used for compatibility with older qemu versions where no pci rom bar is present. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 88169ddf82853ca892ce7bee279579c8a0ac03e5)
* | Merge commit '898829d5c731516c96f9e3cc3cdcbe36cd494fd4' into stable-0.12-mergeAvi Kivity2009-12-201-2/+4
|\| | | | | | | | | | | | | | | | | | | * commit '898829d5c731516c96f9e3cc3cdcbe36cd494fd4': pci romfiles: add property, add default to PCIDeviceInfo Conflicts: hw/pci.h Signed-off-by: Avi Kivity <avi@redhat.com>
| * pci romfiles: add property, add default to PCIDeviceInfoGerd Hoffmann2009-12-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | This patch adds a romfile property to the pci bus. It allows to specify a romfile to load into the rom bar of the pci device. The default value comes from a new field in PCIDeviceInfo. The property allows to change the file and also to disable the rom loading using an empty string. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 8c52c8f320b27684ec3b1a649925b75af376b1f7)
* | Merge commit '72bb3c7571226af13cfe9eec020a56add3d30a70' into stable-0.12-mergeAvi Kivity2009-12-201-0/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '72bb3c7571226af13cfe9eec020a56add3d30a70': Support PCI based option rom loading Fix backcompat for hotplug of SCSI controllers fdc: fix migration from 0.11 Revert "fdc: fix vmstate variable passed" monitor: Accept input only byte-wise Revert "kvm: x86: Save/restore exception_index" vmware: increase cursor buffer size. Conflicts: hw/pci.c hw/pci.h Signed-off-by: Avi Kivity <avi@redhat.com>
| * Support PCI based option rom loadingAnthony Liguori2009-12-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we preload option roms into the option rom space in memory. This prevents DDIM from functioning correctly which severely limits the number of roms we can support. This patch introduces a pci_add_option_rom() which registers the PCI_ROM_ADDRESS bar which points to our option rom. It also converts over the cirrus vga adapter, the rtl8139, virtio, and the e1000 to use this new mechanism. The result is that PXE boot functions even with three unique types of cards. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit c2039bd0ffce8807e0eaac55254fde790825fa92)
* | Merge commit '686a3c3dc235df2492e754423799d1abe4f6d9e2' into stable-0.12-mergeAvi Kivity2009-12-201-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '686a3c3dc235df2492e754423799d1abe4f6d9e2': Revert "pci: interrupt disable bit support" target-ppc: fix ppc32 kvm build S390: Bail out without KVM S390: Don't tell guest we're updating config space add default virtcon initialization S390: Loop through virtio console devices target-s390: Fail on unknown instructions osdep: Fix runtime failure on older Linux kernels Fix a make -j race target-alpha: Fix generic ctz64. s390: Fix buggy assignment target-mips: fix user-mode emulation startup Conflicts: hw/pci.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * Revert "pci: interrupt disable bit support"Anthony Liguori2009-12-191-1/+0
| | | | | | | | | | | | | | | | | | This reverts commit 0ea5709a32085f7d14901a09d12bd35f9b267607. Per discussion with Michael Tsirkin, this is too risky for 0.12 Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit d587e0787153f0224a6140c5015609963ceaabfb)
* | Merge commit '0ea5709a32085f7d14901a09d12bd35f9b267607' into stable-0.12-mergeAvi Kivity2009-12-141-0/+2
|\| | | | | | | | | | | | | | | | | | | | | * commit '0ea5709a32085f7d14901a09d12bd35f9b267607': pci: interrupt disable bit support pci: interrupt status bit implementation Conflicts: hw/pci.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * pci: interrupt disable bit supportMichael S. Tsirkin2009-12-071-0/+1
| | | | | | | | | | | | | | | | | | Interrupt disable bit is mandatory in PCI spec. Implement it to make devices spec compliant. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Isaku Yamahata <yamahata@valinux.co.jp> (cherry picked from commit b6981cb57be5d66b1b7cf9009a122fb3cdd4b96b)
| * pci: interrupt status bit implementationMichael S. Tsirkin2009-12-071-0/+1
| | | | | | | | | | | | | | | | | | interrupt status is a mandatory feature in PCI spec, so devices must implement it to be spec compliant. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Isaku Yamahata <yamahata@valinux.co.jp> (cherry picked from commit f9bf77dd1f838b0061172fe41709b221956da2f5)
* | Merge commit 'eea4acfa5c1ef26439a718375475fe468b7f2fba' into stable-0.12-mergeAvi Kivity2009-12-141-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'eea4acfa5c1ef26439a718375475fe468b7f2fba': pci: prepare irq code for interrupt state Conflicts: hw/pci.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * pci: prepare irq code for interrupt stateMichael S. Tsirkin2009-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This rearranges code in preparation for interrupt state implementation. Changes: - split up bus walk away from interrupt handling into a subroutine - change irq_state from an array to bitmask - verify that irq_state values are 0 or 1 on load There are no functional changes. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Isaku Yamahata <yamahata@valinux.co.jp> (cherry picked from commit d036bb215e0ac1d1fd467239f1d3b7d904cac90a)
* | Merge commit '8204a9180c5f456d30cbd29fddf734e97f7c74fa' into upstream-mergeAvi Kivity2009-12-071-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8204a9180c5f456d30cbd29fddf734e97f7c74fa': (22 commits) monitor: QError support Introduce QError utests: Add qstring_from_substr() unit-test utests: Add qstring_append_chr() unit-test QString: Introduce qstring_from_substr() QString: Introduce qstring_append_int() QString: Introduce qstring_append_chr() QJSON: Introduce qobject_from_jsonv() fix I2C slave addressing Fix qdev property type definition for isa serial/parallel devices Fix qemu_malloc/qemu_free use in rtl8139.c Fix free use in xen_backend.c Fix qemu_free use in scsi-generic.c Fix qemu_free use in nseries.c Fix qemu_free use in bt-l2cap.c Fix qemu_free use in nand.c Fix qemu_free use in baum.c Fix qemu_free use in acpi.c pci: move apb specific stuff to apb_pci.c configure: use correct cflags in compiler checks ... Conflicts: monitor.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * pci: move apb specific stuff to apb_pci.cMichael S. Tsirkin2009-12-021-0/+1
| | | | | | | | | | | | | | | | | | pci code had a TODO to move apb specific pci bridge initialization to apb_pci. Implement this and remove the TODO. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '98304c846d8866dae6322ef400ce6595b23cfc41' into upstream-mergeAvi Kivity2009-12-021-46/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '98304c846d8866dae6322ef400ce6595b23cfc41': (33 commits) msix: clear pending bit of an unused vector msix: fix reset value for enable bit msix: fix mask bit state after reset virtio: do not reset msix state on soft reset msix: add helper to unuse all msix entries pci: convert goto into scope in bridge_filter pci: pci bridge related clean up. pci: fix pci_config_get_io_base(). pci: remove magic number, 256 in pci.c pci: split up up pci_update mappings pci: clean up of pci_update_mappings() pci: remove unused constants pci: move typedef, PCIHostState, PCIExpressHost to qemu-common.h. pci: remove some unnecessary comment in pci.h pci: clean up of pci_init_wmask(). pci: kill unnecessary included in pci.c pci_host: remove unnecessary & 0xff. pci: s/pci_find_host_bus/pci_find_root_bus/g pci: remove pci_sub_bus() by open coding. pci: shorten pci_host_{conf, data}_register_xxx function a bit. ... Conflicts: hw/msix.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * pci: pci bridge related clean up.Isaku Yamahata2009-12-011-0/+1
| | | | | | | | | | | | | | | | - fix bridge prefetchable memory accesser to check 64bit or not. - use pcibus_t consistently instead mixing pcibus_t and uint64_t. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| * pci: remove unused constantsIsaku Yamahata2009-12-011-9/+0
| | | | | | | | | | | | | | | | This patch removes unused constants committed by fb23162885f7fd8cf7334bed22c25ac32c7d8b9d. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| * pci: remove some unnecessary comment in pci.hIsaku Yamahata2009-12-011-9/+2
| | | | | | | | | | | | | | | | This patch removes some comment which should go into commit log in pci.h. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| * pci: s/pci_find_host_bus/pci_find_root_bus/gIsaku Yamahata2009-12-011-1/+1
| | | | | | | | | | | | | | | | This patch renames pci_find_host_bus() to pci_find_root_bus() as suggested by "Michael S. Tsirkin" <mst@redhat.com>. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| * pci: move pci_data_{read, write}() declaration from pci.h to pci_host.hIsaku Yamahata2009-12-011-2/+0
| | | | | | | | | | | | | | | | | | | | Now pci host stuff has been moved from pci.[hc] to pci_host.[hc] so the declaration of pci_data_{read, write}() should be in pci_host.h This patch moves them from pci.h to pci_host.h for consistency. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| * pci: pci.h cleanup: move out stuff not in pci.cMichael S. Tsirkin2009-12-011-25/+0
| | | | | | | | | | | | | | | | pci.h declares some functions which aren't defined in pci.h. Clean up moving things to appropriate headers, and update all users. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* | Merge commit '715a664ac4ca3b9e44ffbc0ca41ecd91fbe96656' into upstream-mergeAvi Kivity2009-11-221-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '715a664ac4ca3b9e44ffbc0ca41ecd91fbe96656': QemuOpts: command line switches for the config file. QemuOpts: parse config from file. QemuOpts: dump config. QemuOpts: add find_list() Documentation: Add options to image format descriptions Documentation: Don't mention old qemu-img options Documentation: Move image format descriptions to own section Documentation: Add documentation for -chardev Added imlpementation for qemu_error for non-qemu executables eepro100: Improve support for different devices pci/monitor: print out bridge's filtering values and so on. pci: implement pci bridge filtering. pci: factor out pci_for_each_device(). pci: cosmetic on pci_upadte_mappings() Conflicts: qemu-options.hx Signed-off-by: Avi Kivity <avi@redhat.com>
| * pci: implement pci bridge filtering.Isaku Yamahata2009-11-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch implements pci bridge filtering. TODO: currently almost all the map funcions assumes filtered_size == size and addr & ~(size - 1) == addr. However with bridge filtering, they aren't always true. Teach them such cases, such that filtered_size < size and addr & (size - 1) != 0. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit 'fb23162885f7fd8cf7334bed22c25ac32c7d8b9d' into upstream-mergeAvi Kivity2009-11-221-0/+29
|\| | | | | | | | | | | | | | | | | | | * commit 'fb23162885f7fd8cf7334bed22c25ac32c7d8b9d': pci: initialize pci config headers depending it pci header type. pci: teach pci_default_config_write() ROM bar for normal/bridge device . Changed include order in hw/device-assignment.c. Signed-off-by: Avi Kivity <avi@redhat.com>
| * pci: initialize pci config headers depending it pci header type.Isaku Yamahata2009-11-091-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | - Only sets default subsystem id for header type 00.(normal header type) because header type 01 doesn't have subsystem id, and uses the register for other purpose. So setting default subsystem id doesn't make sense. - initialize wmask more for header type 01.(bridge header type) Without those wmasks, linux was confused not boot, and lspci was confused not to print out expected IO/memory range. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '260c0cd3d985e51b15870ff47e17b7b930efbda1' into upstream-mergeAvi Kivity2009-11-221-9/+60
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '260c0cd3d985e51b15870ff47e17b7b930efbda1': pci: use range helper functions. pci: add helper functions to check ranges overlap. pci: pcie host and mmcfg support. vmstate: introduce VMSTATE_BUFFER_UNSAFE_INFO. pci_host: change the signature of pci_data_{read, write}. pci: move pci host stuff from pci.c to pci_host.c pci: factor out the conversion logic from io port address into pci device. pci: make pci configuration transaction more accurate. pci: remove bus_num member from struct PCIBus. pci: 64bit bar support. Conflicts: hw/pci.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * pci: add helper functions to check ranges overlap.Isaku Yamahata2009-11-091-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | add helper function to check ranges overlap suggested by Michael S. Tsirkin <mst@redhat.com>. His original suggestion was to use [first, last], however I chosen to use offset, length pair, i.e. [offset, offset + length) because pci configuration space related functions all uses offset and length pair, so it helps to avoid to type constant twice. Cc: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * pci: pcie host and mmcfg support.Isaku Yamahata2009-11-091-4/+23
| | | | | | | | | | | | | | | | This patch adds common routines for pcie host bridge and pcie mmcfg. This will be used by q35 based chipset emulation. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * pci_host: change the signature of pci_data_{read, write}.Isaku Yamahata2009-11-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | change the first argument, void *opaque to PCIBus *s of the pci_data_{read, write}. They aren't used as direct callback so the argument type don't have to be void*. So change it to the right type. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * pci: make pci configuration transaction more accurate.Isaku Yamahata2009-11-091-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch sorts out/enhances pci code to track pci bus topology more accurately. - Track host bus bridge with pci domain number. Although the current qemu implementation supports only pci domian 0 yet. - Track pci bridge parent-child relationship. When looking down from pci host bus for pci sub bus, be aware of secondary bus/subordinate bus. Thus pci configuration transaction is more accurately emulated. This patch adds new member to PCIBus to track pci bus topology. Since qdev already tracks down bus relationship, those new member wouldn't be necessary. However it would be addressed later because not all the pci device isn't converted to qdev yet. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * pci: 64bit bar support.Isaku Yamahata2009-11-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | implemented pci 64bit bar support. The tricky bit is pci_update_mapping(). An OS is allowed to set the BAR such that OS can't address the area pointed by BAR. It doesn't make sense, though. In that case, don't map the BAR. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '4f8589e11558f1151d95a4a3e9fce902f042df3d' into upstream-mergeAvi Kivity2009-11-221-5/+8
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '4f8589e11558f1151d95a4a3e9fce902f042df3d': pci: typedef pcibus_t as uint64_t instead of uint32_t. pci: introduce FMT_PCIBUS for printf format for pcibus_t. pci: introduce pcibus_t to represent pci bus address/size instead of uint32_t pci_host: consolidate pci config address access. Fix up hw/device-assignment.c. Signed-off-by: Avi Kivity <avi@redhat.com>
| * pci: typedef pcibus_t as uint64_t instead of uint32_t.Isaku Yamahata2009-11-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch is preliminary for 64bit bar. For 64bit bar support, change pcibus_t which represents pci bus addr/size from uint32_t to uint64_t. And also change FMT_pcibus for printf. In pci_update_mapping() checks 32bit overflow. So the check must be updated too. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * pci: introduce FMT_PCIBUS for printf format for pcibus_t.Isaku Yamahata2009-11-091-0/+1
| | | | | | | | | | | | | | | | | | | | This patch is preliminary for 64bit BAR. Later pcibus_t will be changed from uint32_t to uint64_t. Introduce FMT_PCIBUS for printf format for pcibus_t. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * pci: introduce pcibus_t to represent pci bus address/size instead of uint32_tIsaku Yamahata2009-11-091-5/+7
| | | | | | | | | | | | | | | | | | | | | | This patch is preliminary for 64 bit BAR support. Introduce dedicated type, pcibus_t, to represent pci bus address/size instead of uint32_t. Later this type will be changed to uint64_t. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit 'b3b1169731c976dfe8dc5b4b121cfc670abc84c9' into upstream-mergeAvi Kivity2009-11-221-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b3b1169731c976dfe8dc5b4b121cfc670abc84c9': pci: make pci_bar() aware of header type 1. pci: clean up of pci_default_read_config. Conflicts: hw/pci.c (reverts 148aa7fbe6 as a side effect) Signed-off-by: Avi Kivity <avi@redhat.com>
| * pci: make pci_bar() aware of header type 1.Isaku Yamahata2009-11-091-0/+1
| | | | | | | | | | | | | | | | | | make pci_bar() aware of header type 1. When PCI_ROM_SLOT it should return PCI_ROM_ADDRESS1 (!= PCI_ROM_ADDRESS) Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '0392a017ae9b44dd5c29bf7769a96fd6806a3551' into upstream-mergeAvi Kivity2009-11-221-5/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0392a017ae9b44dd5c29bf7769a96fd6806a3551': (23 commits) pci: s/PCI_ADDRESS_SPACE_/PCI_BASE_ADDRESS_SPACE_/ to match pci_regs.h pci: clean up pci_init_wmask() pci/bridge: clean up of pci_bridge_initfn() pci: use helper functions to access pci config space. pci: helper functions to access PCIDevice::config pci: define a constant to represent a unmapped bar and use it. pci: use PCI_SLOT() and PCI_FUNC(). pci: introduce constant PCI_NUM_PINS for the number of interrupt pins, 4. pci: fix PCI_DPRINTF() wrt variadic macro. Makefile: make qemu-io dependent on config-host.h scsi: move scsi-disk.h -> scsi.h scsi: move scsi.h -> esp.h Makefile: make qemu-img dependant on config-host.h whitelist host virtio networking features qemu-img: Allow creating zero sized images tap: drain queue in tap_send() virtio-net: split the has_buffers() logic from can_receive() net/queue: queue packets even if sender doesn't supply a callback net: disable receiving if client returns zero tap: disable draining queue in one go ... Conflicts: hw/pci.h Manual fixup for hw/device-assignment.c. Signed-off-by: Avi Kivity <avi@redhat.com>
| * pci: s/PCI_ADDRESS_SPACE_/PCI_BASE_ADDRESS_SPACE_/ to match pci_regs.hIsaku Yamahata2009-11-091-4/+3
| | | | | | | | | | | | | | | | | | make constants for pci base address match pci_regs.h by renaming PCI_ADDRESS_SPACE_xxx to PCI_BASE_ADDRESS_SPACE_xxx. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * pci: helper functions to access PCIDevice::configIsaku Yamahata2009-11-091-0/+12
| | | | | | | | | | | | | | | | | | add helper functions to get/set PCIDevice::config Those will be used later. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * pci: define a constant to represent a unmapped bar and use it.Isaku Yamahata2009-11-091-0/+1
| | | | | | | | | | | | | | | | define a constant to represent a unmapped bar instead of -1 and use it. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * pci: introduce constant PCI_NUM_PINS for the number of interrupt pins, 4.Isaku Yamahata2009-11-091-1/+3
| | | | | | | | | | | | | | | | | | introduce constant PCI_NUM_PINS for the number of interrupt pins, 4. and use it. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '8a1c5235510da01a200693fe3cfd87acd2dc1fca'Mark McLoughlin2009-10-081-1/+0
|\| | | | | | | | | | | | | Conflicts: net.c Signed-off-by: Mark McLoughlin <markmc@redhat.com>
| * Revert "Fix exit on 'pci_add' Monitor command"Anthony Liguori2009-10-061-1/+0
| | | | | | | | | | | | | | | | This reverts commit 0148fde54c2478ea8a47c8dbfe4c0fb8bda4d996. As requested by Luiz. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Drop redundant pci_get_bus_devfn() declarationAvi Kivity2009-10-061-1/+0
| | | | | | | | Signed-off-by: Avi Kivity <avi@redhat.com>
* | Merge commit '499cf1027f9387081f73767c7872c9123896817c' into upstream-mergeAvi Kivity2009-10-061-2/+1
|\| | | | | | | | | | | | | | | * commit '499cf1027f9387081f73767c7872c9123896817c': Rename pci_create_noinit() to pci_create() pci_create() is now unused, remove it Signed-off-by: Avi Kivity <avi@redhat.com>
| * Rename pci_create_noinit() to pci_create()Markus Armbruster2009-10-051-1/+1
| | | | | | | | | | | | | | It's qdev_create() specialized for PCI, so name it accordingly. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * pci_create() is now unused, remove itMarkus Armbruster2009-10-051-1/+0
| | | | | | | | | | Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '07caea315a85ebfe90851f9c2e4ef3fdd24117b5' into upstream-mergeAvi Kivity2009-10-061-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '07caea315a85ebfe90851f9c2e4ef3fdd24117b5': Fix pci_add nic not to exit on bad model Make it obvious that pci_nic_init() can't fail Fix pci_add storage not to exit on bad first argument Fix pci_vga_init() not to ignore bus argument set correct CS seg limit and flags on sipi Set revision in eeprom correctly for 82557 versions. restore CFLAGS check for conflict and fix recursive CFLAGS issue virtio-pci: return error if virtio_console_init fails qdev: show name of device that fails init vnc: Set invalid buffer pointers to NULL eepro100: Don't allow guests to fail assertions qcow2: Increase maximum cluster size to 2 MB qemu/virtio-pci: remove unnecessary check Conflicts: hw/pc.c Signed-off-by: Avi Kivity <avi@redhat.com>