aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '8a1c5235510da01a200693fe3cfd87acd2dc1fca'Mark McLoughlin2009-10-0816-431/+664
|\
| * Port -net tap to QemuOptsMark McLoughlin2009-10-061-90/+140
| * Port -net user to QemuOptsMark McLoughlin2009-10-061-106/+161
| * Port -net none and -net nic to QemuOptsMark McLoughlin2009-10-061-77/+160
| * Add qemu_net_optsMark McLoughlin2009-10-062-0/+14
| * Never overwrite a QemuOptMark McLoughlin2009-10-061-28/+23
| * Add qemu_opts_validate() for post parsing validationMark McLoughlin2009-10-062-0/+34
| * Make qemu_opts_parse() handle empty stringsMark McLoughlin2009-10-061-3/+1
| * Remove double error message for -device option parsingMark McLoughlin2009-10-061-3/+1
| * Remove double error message in qemu_option_set()Mark McLoughlin2009-10-061-2/+0
| * Remove bogus error message from qemu_opts_set()Mark McLoughlin2009-10-061-2/+0
| * Drop config_error(), use qemu_error() insteadMarkus Armbruster2009-10-061-72/+55
| * Don't exit() in config_error()Markus Armbruster2009-10-063-41/+55
| * Make net_client_init() consume slirp_configs even on errorMarkus Armbruster2009-10-061-5/+7
| * Use qemu_strdup() for VLANClientState string fieldsMark McLoughlin2009-10-061-7/+7
| * Move memset() from net_client_uninit() to net_client_init()Mark McLoughlin2009-10-061-1/+2
| * Make NICInfo string fields non-constMark McLoughlin2009-10-064-10/+10
| * Don't assign a static string to NICInfo::modelMark McLoughlin2009-10-061-1/+1
| * Use qemu_strdup() for NICInfo string fieldsMark McLoughlin2009-10-061-4/+4
| * Register rtc options for -setJan Kiszka2009-10-061-0/+1
| * Revert "Fix exit on 'pci_add' Monitor command"Anthony Liguori2009-10-063-16/+0
| * offer right-ctrl as a grab optionDustin Kirkland2009-10-064-7/+26
| * add host_device format description to qemu-img manpageAdrian Bridgett2009-10-061-0/+6
* | Merge commit '45a50b1668822c23afc2a89f724654e176518bc4'Mark McLoughlin2009-10-0810-274/+370
|\|
| * Reorganize option rom (+linux kernel) loading.Gerd Hoffmann2009-10-066-248/+318
| * eepro100: support 16 bit read from SCBCmd (== 2)=?UTF-8?q?Reimar=20D=C3=B6ffinger?=2009-10-061-0/+1
| * target-i386: move recently added vmstate fields at the end of the structureAurelien Jarno2009-10-051-4/+6
| * block/raw: Add create_options for host_deviceKevin Wolf2009-10-051-6/+10
| * Improve error reporting on file accessJustin M. Forbes2009-10-052-16/+16
| * Win32: Fix vnc support.Stefan Weil2009-10-051-2/+21
* | Revert "qemu/pci: reset device registers on bus reset"Avi Kivity2009-10-061-13/+0
* | Merge commit '1e7fbc6d3cfcffe1d490ab8851e712c6e98fa771'Avi Kivity2009-10-061-1/+2
|\|
| * x86: fix miss mergeJuan Quintela2009-10-051-1/+2
* | test: vmexit: inl from pmtimerMarcelo Tosatti2009-10-061-0/+13
* | test: vmexit: run parallel tests on each cpuMarcelo Tosatti2009-10-061-9/+34
* | test: add on_cpu_asyncMarcelo Tosatti2009-10-062-4/+19
* | Re-enable -Werror for kvmAvi Kivity2009-10-061-2/+0
* | Merge branch 'upstream-merge'Avi Kivity2009-10-06148-2095/+3403
|\ \
| * | Drop redundant pci_get_bus_devfn() declarationAvi Kivity2009-10-061-1/+0
| * | Merge commit '499cf1027f9387081f73767c7872c9123896817c' into upstream-mergeAvi Kivity2009-10-065-28/+9
| |\|
| | * Rename pci_create_noinit() to pci_create()Markus Armbruster2009-10-055-9/+9
| | * pci_create() is now unused, remove itMarkus Armbruster2009-10-052-19/+0
| * | Merge commit '07caea315a85ebfe90851f9c2e4ef3fdd24117b5' into upstream-mergeAvi Kivity2009-10-0627-74/+153
| |\|
| | * Fix pci_add nic not to exit on bad modelMarkus Armbruster2009-10-0515-32/+71
| | * Make it obvious that pci_nic_init() can't failMarkus Armbruster2009-10-053-21/+14
| | * Fix pci_add storage not to exit on bad first argumentMarkus Armbruster2009-10-053-3/+12
| | * Fix pci_vga_init() not to ignore bus argumentMarkus Armbruster2009-10-051-1/+1
| | * set correct CS seg limit and flags on sipiGleb Natapov2009-10-051-1/+1
| | * Set revision in eeprom correctly for 82557 versions.=?UTF-8?q?Reimar=20D=C3=B6ffinger?=2009-10-051-0/+2
| | * restore CFLAGS check for conflict and fix recursive CFLAGS issueThomas Monjalon2009-10-052-4/+4