diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-12-20 12:22:03 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-12-20 12:22:03 +0200 |
| commit | 5d594a6c22d4ecbcc8ebdaf3b537173116663c19 (patch) | |
| tree | 9d428505772eb0046127669ed249e0c7ec3a30d9 /hw/pci.h | |
| parent | Remove pcbios subdirectory (diff) | |
| parent | Revert "pci: interrupt disable bit support" (diff) | |
| download | qemu-kvm-5d594a6c22d4ecbcc8ebdaf3b537173116663c19.tar.gz qemu-kvm-5d594a6c22d4ecbcc8ebdaf3b537173116663c19.tar.bz2 qemu-kvm-5d594a6c22d4ecbcc8ebdaf3b537173116663c19.zip | |
Merge commit '686a3c3dc235df2492e754423799d1abe4f6d9e2' into stable-0.12-merge
* 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>
Diffstat (limited to 'hw/pci.h')
| -rw-r--r-- | hw/pci.h | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -112,7 +112,6 @@ typedef struct PCIIORegion { #define PCI_COMMAND_IO 0x1 /* Enable response in I/O space */ #define PCI_COMMAND_MEMORY 0x2 /* Enable response in Memory space */ #define PCI_COMMAND_MASTER 0x4 /* Enable bus master */ -#define PCI_COMMAND_INTX_DISABLE 0x400 /* INTx Emulation Disable */ #define PCI_STATUS 0x06 /* 16 bits */ #define PCI_STATUS_INTERRUPT 0x08 #define PCI_REVISION_ID 0x08 /* 8 bits */ |