]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72e5b27 9ee59f3)
Merge remote-tracking branch 'kraxel/testdev.1' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 4 Jan 2013 19:25:07 +0000 (13:25 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 4 Jan 2013 19:25:07 +0000 (13:25 -0600)
* kraxel/testdev.1:
  pc: remove bochs bios debug ports
  hw: Add test device for unittests execution
  add isa-debug-exit device.
  switch debugcon to memory api

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
1  2 
hw/pc.c patch | diff1 | diff2 | blob | history

diff --cc hw/pc.c
Simple merge
Qemu copy for testing