summaryrefslogtreecommitdiffstats
path: root/hw/pci.c
diff options
context:
space:
mode:
authorMichael S. Tsirkin2011-05-05 15:39:47 +0200
committerMichael S. Tsirkin2011-05-05 15:39:47 +0200
commit5300f1a5487f67f0bde8ee1081b799108668cb1d (patch)
tree5274ff496f2665487736a4eec23bf76601e4da44 /hw/pci.c
parentCPUPhysMemoryClient: Pass guest physical address not region offset (diff)
parentNBD: Avoid leaking a couple of strings when the NBD device is closed (diff)
downloadqemu-5300f1a5487f67f0bde8ee1081b799108668cb1d.tar.gz
qemu-5300f1a5487f67f0bde8ee1081b799108668cb1d.tar.xz
qemu-5300f1a5487f67f0bde8ee1081b799108668cb1d.zip
Merge remote branch 'origin/master' into pci
Conflicts: exec.c
Diffstat (limited to 'hw/pci.c')
0 files changed, 0 insertions, 0 deletions