diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2012-07-29 17:03:19 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2012-07-29 17:05:35 +0300 |
| commit | 5e59b024351f827f903f98ae522687ea53dc4f23 (patch) | |
| tree | 4996f31e1d7d9e08c04d8bbf018752a71c6cd4c3 /hw/virtio-pci.h | |
| parent | 7162ab21fe8e82f924002951cd8e87f69358f8b5 (diff) | |
| parent | 932d4a42afa28829fadf3cbfbb0507cc09aafd8b (diff) | |
| download | focaccia-qemu-5e59b024351f827f903f98ae522687ea53dc4f23.tar.gz focaccia-qemu-5e59b024351f827f903f98ae522687ea53dc4f23.zip | |
Merge branch pci into master
Merge master and pci branch, resolve build breakage in hw/esp.c introduced by f90c2bcd. Conflicts: hw/esp.c
Diffstat (limited to 'hw/virtio-pci.h')
| -rw-r--r-- | hw/virtio-pci.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/virtio-pci.h b/hw/virtio-pci.h index 91b791ba9d..ac9d522f37 100644 --- a/hw/virtio-pci.h +++ b/hw/virtio-pci.h @@ -34,7 +34,6 @@ typedef struct { PCIDevice pci_dev; VirtIODevice *vdev; MemoryRegion bar; - MemoryRegion msix_bar; uint32_t flags; uint32_t class_code; uint32_t nvectors; |