From: Avi Kivity <[email protected]>

* 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 <[email protected]>
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to