From: Anthony Liguori Date: Fri, 1 Feb 2013 01:35:24 +0000 (-0600) Subject: Merge remote-tracking branch 'mst/tags/for_anthony' into staging X-Git-Tag: v1.4.0-rc0~54 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c628d74738bfdb872f771407a2790509ec4520f9;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'mst/tags/for_anthony' into staging virtio,make,pci,e1000,vfio,piix This includes my timestamp generation cleanup, Amos's and my work on virtio net commands, pci,e1000,vfio and piix fixes. Signed-off-by: Michael S. Tsirkin # gpg: Signature made Thu 31 Jan 2013 06:20:27 AM CST using RSA key ID D28D5469 # gpg: Can't check signature: public key not found # By Michael S. Tsirkin (6) and others # Via Michael S. Tsirkin * mst/tags/for_anthony: vfio-pci: Enable PCIe extended config space PIIX3: reset the VM when the Reset Control Register's RCPU bit gets set ich9: add support for pci assignment virtio-net: rename ctrl rx commands virtio-net: introduce a new macaddr control virtio-net: remove layout assumptions for ctrl vq virtio-net: revert mac on reset rules/mak: make clean should blow away timestamp files Makefile: clean timestamp generation rule rules.mak: cleanup config generation rules e1000: document ICS read behaviour --- c628d74738bfdb872f771407a2790509ec4520f9