mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-12-16 17:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into pci

Browse Source 
Conflicts:
	hw/virtio-pci.c
This commit is contained in:
Michael S. Tsirkin
2011-06-14 17:51:11 +03:00
parent 35f7546206 0b862cedf3
commit befeac45d4
283 changed files with 22871 additions and 8772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hw/pci.h
View File

@@ -132,7 +132,7 @@ struct PCIDevice {
/* PCI config space */
uint8_t *config;
/* Used to enable config checks on load. Note that writeable bits are
/* Used to enable config checks on load. Note that writable bits are
* never checked even if set in cmask. */
uint8_t *cmask;