Merge commit '02eb84d0ec97f183ac23ee939403a139e8849b1d' into upstream-merge
commita0d9c9d56c6830fc99bd1c0e9e24c34ff75c8c8d
authorAvi Kivity <avi@redhat.com>
Tue, 30 Jun 2009 09:17:09 +0000 (30 12:17 +0300)
committerAvi Kivity <avi@redhat.com>
Tue, 30 Jun 2009 09:17:09 +0000 (30 12:17 +0300)
tree104acf48497026c81b1151ccb9b3fd504b846352
parent9c983fd3ccee2783df4b9a0f5f8298f9a5dc862f
parent02eb84d0ec97f183ac23ee939403a139e8849b1d
Merge commit '02eb84d0ec97f183ac23ee939403a139e8849b1d' into upstream-merge

* commit '02eb84d0ec97f183ac23ee939403a139e8849b1d':
  qemu/pci: MSI-X support functions
  qemu/pci: check constant registers on load

Conflicts:
hw/pci.h

Signed-off-by: Avi Kivity <avi@redhat.com>
Makefile.target
hw/pci.c
hw/pci.h