vga: fix vram double-mapping with -vga std and -M pc-0.12
With pc-0.12, we map the video RAM both through the PCI BAR (the guest doesthis) and through a fixed mapping at 0xe0000000. The memory API doesn't allowthis double map, and aborts.
Fix by using an alias....
Merge remote-tracking branch 'afaerber-or/cocoa-for-upstream' into staging
cocoa: Suppress Cocoa frontend for -qtest
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
arch_init: Fix AltiVec build on Darwin/ppc
Commit f29a56147b66845914d0a645bf9b4c5bb9a6af57 (implement-no-user-config command-line option (v3)) introduced uses of boolin arch_init.c. Shortly before that usage is support code forAltiVec (conditional to ALTIVEC)....
Merge remote-tracking branch 'sstabellini/for_1.1_rc3' into staging
Merge remote-tracking branch 'mdroth/qga-pull-5-24-12' into staging
Merge remote-tracking branch 'kwolf/for-anthony' into staging
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
Merge remote-tracking branch 'bonzini/scsi-next' into staging
slirp: Avoid redefining MAX_TCPOPTLEN
MAX_TCPOPTLEN is being defined as 32. Darwin already has it as 40,causing a warning. The value is only used to declare an array,into which currently 4 bytes are written at most.
Therefore always override MAX_TCPOPTLEN for now....
View all revisions | View revisions
Also available in: Atom