diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-19 08:38:05 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-19 08:38:05 -0500 |
commit | 5dff24bebae5103810002ea76b1d03927e2148f2 (patch) | |
tree | d5eb86de23120163ca1b2965b119e5e8c69c8bad /default-configs | |
parent | b6c99f8a6d66c5fa01a60483d9b012eb2b0932f2 (diff) | |
parent | 22773d6066a7f01a95f78c270edf9dbd2e755ac3 (diff) |
Merge remote-tracking branch 'mst/tags/for_anthony' into staging
pci: add pci test device
This adds a new device that we can use for testing PCI PIO and MMIO, with and
without ioeventfd in different configurations. FAST_MMIO will be added if/when
kvm supports it. Also included are minor cleanups in kvm APIs that it needs.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Mon 15 Apr 2013 05:42:24 PM CDT using RSA key ID D28D5469
# gpg: Can't check signature: public key not found
# By Michael S. Tsirkin
# Via Michael S. Tsirkin
* mst/tags/for_anthony:
pci: add pci test device
kvm: support non datamatch ioeventfd
kvm: support any size for pio eventfd
kvm: remove unused APIs
Message-id: cover.1366272004.git.mst@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'default-configs')
-rw-r--r-- | default-configs/pci.mak | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/default-configs/pci.mak b/default-configs/pci.mak index f5f100ecb0..b608f31c9a 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -24,3 +24,4 @@ CONFIG_SERIAL=y CONFIG_SERIAL_PCI=y CONFIG_IPACK=y CONFIG_WDT_IB6300ESB=y +CONFIG_PCI_TESTDEV=y |