| commit | 7aba6619cd9c92544cdcab0fbeef2c72ed81d557 | |
| author | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 09:06:04 +0000 (30 12:06 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 09:06:04 +0000 (30 12:06 +0300) | ||
| tree | ad1bf5aced2f244931a27dcbbbc074a29ac91d96 | treesnapshot (tar.gz zip) |
| parent | e4318a961365f47e6b60b6f0a46d9cdfaa0b4272 | commitdiff |
| parent | b7ee1603c16c1feb0d439d2ddf6cf824119d0aab | commitdiff |
Merge commit 'b7ee1603c16c1feb0d439d2ddf6cf824119d0aab' into upstream-merge
* commit 'b7ee1603c16c1feb0d439d2ddf6cf824119d0aab':
qemu/pci: make default_write_config use mask table
Conflicts:
hw/pci.c
hw/pci.h
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'b7ee1603c16c1feb0d439d2ddf6cf824119d0aab':
qemu/pci: make default_write_config use mask table
Conflicts:
hw/pci.c
hw/pci.h
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/pci.c | diff1 | diff2 | blobhistory |
| hw/pci.h | diff1 | diff2 | blobhistory |