diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-15 16:52:10 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-15 16:52:10 -0600 |
| commit | bdb8872cc14684557db4bef112b02eeb68f4410b (patch) | |
| tree | 44bb5c69cc0ce9f47c3f328eef379a0353ea9883 /hw/pc.c | |
| parent | 2fd3402d9242dec06bb1ca5680c1ddf421932b08 (diff) | |
| parent | 08bb4a7c9bb9c12746bce9b3a1f031dd4192afc1 (diff) | |
| download | qemu-bdb8872cc14684557db4bef112b02eeb68f4410b.zip qemu-bdb8872cc14684557db4bef112b02eeb68f4410b.tar.gz qemu-bdb8872cc14684557db4bef112b02eeb68f4410b.tar.bz2 | |
Merge remote-tracking branch 'afaerber-or/prep-up' into staging
* afaerber-or/prep-up:
pc87312: Avoid define conflict on mingw32
pc87312: Replace register_ioport_*() with MemoryRegion
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/pc.c')
0 files changed, 0 insertions, 0 deletions