aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'v0.12.4' into stable-0.12qemu-kvm-0.12.4Avi Kivity2010-05-091-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'v0.12.4': (49 commits) Update for 0.12.4 release Workaround for broken OSS_GETVERSION on FreeBSD, part two oss: fix fragment setting oss: issue OSS_GETVERSION ioctl only when needed oss: refactor code around policy setting oss: workaround for cases when OSS_GETVERSION is not defined block: Free iovec arrays allocated by multiwrite_merge() lsi: fix segfault in lsi_command_complete lsi: pass lsi_request to lsi_reselect lsi: move dma_len+dma_buf into lsi_request lsi: move current_dev into lsi_request lsi: have lsi_request for the whole life time of the request. lsi: use QTAILQ for lsi_queue tcp/mips: Change TCG_AREG0 (fp -> s0) sh_pci: fix memory and I/O access Fix incoming migration with iothread Fix SIGFPE for vnc display of width/height = 1 net: remove broken net_set_boot_mask() boot device validation qcow2: Remove request from in-flight list after error qcow2: Don't ignore immediate read/write failures ... Signed-off-by: Avi Kivity <avi@redhat.com>
| * Fix qemu -net user,hostfwd= exampleAurelien Jarno2010-02-271-1/+1
| | | | | | | | | | Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> (cherry picked from commit aa375206189b7de7c23ad9de66413fb7d4497940)
* | Merge commit 'c502715a74675b3554cf7bcd684b82c9733ecfae' into stable-0.12-mergeMarcelo Tosatti2010-02-251-4/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c502715a74675b3554cf7bcd684b82c9733ecfae': Documentation: Add missing documentation for qdev related command line options pc: add driver version compat properties scsi: device version property ide: device version property QMP: Emit asynchronous events on all QMP monitors Fix QEMU_WARN_UNUSED_RESULT Conflicts: qemu-options.hx Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * Documentation: Add missing documentation for qdev related command line optionsStefan Weil2010-01-201-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The command line options -device, -nodefaults, -readconfig, -writeconfig had entries for command line help, but documentation for texi and derived formats (man, html, info) was missing. This also required moving "@end table" to the end of qemu-options.hx again. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 3dbf2c7fc5682827be6fa436362fb5db221bd210)
* | Merge remote branch 'upstream/stable-0.12' into stable-0.12Avi Kivity2010-01-171-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/stable-0.12: (27 commits) Update version and changelog for release Update SeaBIOS to 0.5.1 Qemu's internal TFTP server breaks lock-step-iness of TFTP osdep.c: Fix accept4 fallback pc: add rombar to compat properties for pc-0.10 and pc-0.11 pci: allow loading roms via fw_cfg. roms: rework rom loading via fw fw_cfg: rom loader tweaks. roms: minor fixes and cleanups. pc: add machine type for 0.12 loader: more ignores for rom intended to be loaded by the bios vnc_refresh: return if vd->timer is NULL QMP: Don't free async event's 'data' Handle TFTP ERROR from client dmg: fix ->open failure virtio-pci: thinko fix pc-bios: Update README (SeaBIOS) vmware_vga: Check cursor dimensions passed from guest to avoid buffer overflow remove pending exception on vcpu reset. Fix CPU topology initialization ... Conflicts: hw/pc.c hw/pci.h qemu-options.hx Signed-off-by: Avi Kivity <avi@redhat.com>
| * Add missing newline at the end of options listMichael Tokarev2009-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In qemu-kvm this place looks even more "interesting": -runas user Change to user id user just before starting the VM. -readconfig <file> -writeconfig <file> read/write config file-no-kvm disable KVM hardware virtualization -no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC -no-kvm-pit disable KVM kernel mode PIT Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> (cherry picked from commit 19e65b47f60c68d7e8c96aa0a36223c5a0d3422b)
* | Merge commit 'f883e4f7b8f37b53fc54660d20fd36fbe3383f46' into stable-0.12-mergeAvi Kivity2009-12-141-3/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f883e4f7b8f37b53fc54660d20fd36fbe3383f46': (63 commits) monitor: do_info_cpus(): Use QBool monitor: Fix do_info_commands() output monitor: Fix do_info_balloon() output QDict: Introduce qdict_get_qlist() QDict: Introduce qdict_get_qbool() Makefile: move QObject objs to their own entry Introduce qemu-objects.h header file vnc: fix capslock tracking logic. QemuOpts: allow larger option values. scsi: fix drive hotplug. pci: don't hw_error() when no slot is available. pci: don't abort() when trying to hotplug with acpi off. Set default console to virtio on S390x default devices: virtio consoles. add -qmp convinience switch add new -mon switch rework -monitor handling, switch to QemuOpts un-static qemu_chr_parse_compat() default devices: drives default devices: network ... Conflicts: monitor.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * add -qmp convinience switchGerd Hoffmann2009-12-121-0/+2
| | | | | | | | | | | | | | | | Acts like -monitor but switched into qmp mode. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 6ca5582d4f06d8ff0c646b8fe3cfe721dc573597)
| * add new -mon switchGerd Hoffmann2009-12-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add -mon switch which maps pretty straight forward into the QemuOpts internal representation: -mon chardev=<name>[,mode=[control|readline]][,[no]default] Via config file: [mon] chardev = "<name>" mode = "readline" default = "on" Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 22a0e04b9bb5a02e13b3e5cf5ea8abfac5f34120)
| * default devices: add global cmd line option.Gerd Hoffmann2009-12-121-0/+5
| | | | | | | | | | | | | | | | Add global command line option to disable default devices. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit d8c208dd8a038d24ba4890156101bc679a8c8fef)
| * Revert "monitor: Command-line flag to enable control mode"Gerd Hoffmann2009-12-121-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit adcb181afe5a951c521411c7a8e9d9b791aa6742. Conflicts: monitor.h Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 4e307fc883b39c89ffc093c79eb9c9735724d227)
| * qdev: add command line option to set global defaults for properties.Gerd Hoffmann2009-12-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds infrastructure and command line option for setting global defaults for device properties, i.e. you can for example use -global virtio-blk-pci.vectors=0 to turn off msi by default for all virtio block devices. The config file syntax is: [global] driver = "virtio-blk-pci" property = "vectors" value = "0" This can also be used to set properties for devices which are not created via -device but implicitly via machine init, i.e. -global isa-fdc,driveA=<name> This patch uses the mechanism which configures properties for the compatibility machine types (pc-0.10 & friends). The command line takes precedence over the machine type values. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit d0fef6fbea36c62d29f3e3fa2214b7b52322983e)
* | Merge commit '9b57c02e3e14163b576ada77ddd1d7b346a6e421' into upstream-mergeAvi Kivity2009-12-071-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b57c02e3e14163b576ada77ddd1d7b346a6e421': QMP: Initial support QError: Add errors needed by QMP monitor: Introduce 'info commands' monitor: Rename monitor_handle_command() monitor: Introduce monitor_find_command() monitor: Introduce monitor_call_handler() monitor: Command-line flag to enable control mode monitor: Introduce MONITOR_USE_CONTROL flag monitor: do_info_balloon(): Use QError QError: Add QERR_KVM_MISSING_CAP QError: Add QERR_DEVICE_NOT_ACTIVE qdev: Use QError for 'device not found' error QError: Add QERR_DEVICE_NOT_FOUND Conflicts: monitor.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * monitor: Command-line flag to enable control modeLuiz Capitulino2009-12-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a flag called 'control' to the '-monitor' command-line option. This flag enables control mode. The syntax is: qemu [...] -monitor control,<device> Where <device> is a chardev (excluding 'vc', for obvious reasons). For example: $ qemu [...] -monitor control,tcp:localhost:4444,server Will run QEMU in control mode, waiting for a client TCP connection on localhost port 4444. NOTE: I've tried using QemuOpts for this, but turns out that it will try to parse the device part, which should be untouched. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '715a664ac4ca3b9e44ffbc0ca41ecd91fbe96656' into upstream-mergeAvi Kivity2009-11-221-4/+235
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '715a664ac4ca3b9e44ffbc0ca41ecd91fbe96656': QemuOpts: command line switches for the config file. QemuOpts: parse config from file. QemuOpts: dump config. QemuOpts: add find_list() Documentation: Add options to image format descriptions Documentation: Don't mention old qemu-img options Documentation: Move image format descriptions to own section Documentation: Add documentation for -chardev Added imlpementation for qemu_error for non-qemu executables eepro100: Improve support for different devices pci/monitor: print out bridge's filtering values and so on. pci: implement pci bridge filtering. pci: factor out pci_for_each_device(). pci: cosmetic on pci_upadte_mappings() Conflicts: qemu-options.hx Signed-off-by: Avi Kivity <avi@redhat.com>
| * QemuOpts: command line switches for the config file.Gerd Hoffmann2009-11-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds -readconfig and -writeconfig command line switches to read/write QemuOpts from config file. In theory you should be able to do: qemu < machine config cmd line switches here > -writeconfig vm.cfg qemu -readconfig vm.cfg In practice it will not work. Not all command line switches are converted to QemuOpts, so you'll have to keep the not-yet converted ones on the second line. Also there might be bugs lurking which prevent even the converted ones from working correctly. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * Documentation: Add documentation for -chardevMatthew Booth2009-11-091-4/+230
| | | | | | | | | | | | | | Adds documentation for all -chardev backends. Signed-off-by: Matthew Booth <mbooth@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit 'bb6e636443d49f7444f49ab64dc7ec6aae1493a7' into upstream-mergeMark McLoughlin2009-10-281-1/+3
|\| | | | | | | | | | | | | | | | | * commit 'bb6e636443d49f7444f49ab64dc7ec6aae1493a7': net: add a client type code net: add a vnet_hdr=on|off parameter net: refactor tap initialization Signed-off-by: Mark McLoughlin <markmc@redhat.com>
| * net: add a vnet_hdr=on|off parameterMark McLoughlin2009-10-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | This allows people to disable the IFF_VNET_HDR flag, e.g. for debugging purposes or if they know they may migrate the guest to a machine without IFF_VNET_HDR support. It also allows making the lack of IFF_VNET_HDR support an error condition, e.g. in the case where a guest is being migrated from a host which does support it. Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '38c75be3139a117b02350dbda9d48d47aa57fa3d' into upstream-mergeMark McLoughlin2009-10-281-7/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '38c75be3139a117b02350dbda9d48d47aa57fa3d': net: make tap_receive() re-use tap_receive_iov() code net: import linux tap ioctl definitions net: remove unused includes of if_tun.h and if_tap.h Revert "qcow2: Bring synchronous read/write back to life" linux-aio: Honour AsyncContext posix-aio-compat: Honour AsyncContext block: Use new AsyncContext for bdrv_read/write emulation Introduce contexts for asynchronous callbacks Split out bottom halves Conflicts: net.c Signed-off-by: Mark McLoughlin <markmc@redhat.com>
| * net: import linux tap ioctl definitionsMark McLoughlin2009-10-271-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | Making features dependent on the availability of newer versions if_tun.h is going to get seriously clumsy, so let's just import the definitions we need. It's only a small handful. If and when we're comfortable depending on 2.6.30 headers, we can remove this again. Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit 'ccb167e9d7d460a7cd09fdabd848efd3606dd27e' into upstream-mergeMarcelo Tosatti2009-10-181-32/+33
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ccb167e9d7d460a7cd09fdabd848efd3606dd27e': ksm support pcnet: Extend hardware reset qcow2: Bring synchronous read/write back to life Documentation: Move msmouse description to an appropriate place Documentation: Add missing tags to placeholders Documentation: Highlight placeholders in suboptions net: fix multiple NICs causing net opts process to stop Conflicts: exec.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * Documentation: Move msmouse description to an appropriate placeKevin Wolf2009-10-151-2/+2
| | | | | | | | | | | | | | | | | | Putting it right in the middle of the explanation for "-serial udp" probably wasn't the best idea. Patchworks-ID: 35603 Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * Documentation: Add missing tags to placeholdersKevin Wolf2009-10-151-21/+22
| | | | | | | | | | | | | | | | | | Not all placeholders in options descriptions had the @var tag on them. Add the tag so that it's clearly visible that they are placeholders. Patchworks-ID: 35602 Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * Documentation: Highlight placeholders in suboptionsKevin Wolf2009-10-151-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Currently, suboptions (i.e. something like file=file for -drive) are rendered as @code, so we're losing any @var highlighting in the man pages. Replace them by @option, so that you actually can see what is a placeholder and what is meant verbatim. Patchworks-ID: 35601 Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '5869c4d515128cd3a938a7346a8037abcc232220' into upstream-mergeMark McLoughlin2009-10-151-0/+10
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '5869c4d515128cd3a938a7346a8037abcc232220': net: add -net nic,netdev= option net: maintain a list of vlan-less clients net: handle -netdevice options net: add -netdev option net: add QemuOptsList arg to net_client_parse() net: allow clients not associated with a vlan Signed-off-by: Mark McLoughlin <markmc@redhat.com>
| * net: add -netdev optionMark McLoughlin2009-10-151-0/+10
| | | | | | | | | | | | Patchworks-ID: 35506 Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '8a1c5235510da01a200693fe3cfd87acd2dc1fca'Mark McLoughlin2009-10-081-0/+10
|\| | | | | | | | | | | | | Conflicts: net.c Signed-off-by: Mark McLoughlin <markmc@redhat.com>
| * offer right-ctrl as a grab optionDustin Kirkland2009-10-061-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for -ctrl-grab to use the right-ctrl button to grab/release the mouse in SDL. The multi-button ctrl-alt and ctrl-alt-shift grab buttons present an accessibility problem to users who cannot press more than one button at a time. https://bugs.edge.launchpad.net/ubuntu/+source/qemu-kvm/+bug/237635 Signed-off-by: Dustin Kirkland <kirkland@canonical.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '6875204c782e7c9aa5c28f96b2583fd31c50468f' into upstream-mergeAvi Kivity2009-10-051-22/+31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6875204c782e7c9aa5c28f96b2583fd31c50468f': Enable host-clock-based RTC Refactor RTC command line switches Introduce QEMU_CLOCK_HOST win32: Drop dead dyntick timer code Rename QEMU_TIMER_* to QEMU_CLOCK_* Fix exit on 'pci_add' Monitor command Correctly free nd structure do proper cpu_self check bdf: Remove last users of FALSE/TRUE Add -Wold-style-* flags slirp: It needs to use QEMU_CFLAGS not CFLAGS musicpal: Add VMState support musicpal: Make PIT emulation more robust musicpal: True reset support for audio device musicpal: True reset support for GPIO musicpal: Coding style fixes musicpal: Clean up typecasts musicpal: Rework GPIO input events musicpal: Catch null TX qeueues Conflicts: sysemu.h Signed-off-by: Avi Kivity <avi@redhat.com>
| * Enable host-clock-based RTCJan Kiszka2009-10-051-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch RTC emulations to the new host_clock instead of vm_clock by default. This has the advantage that the emulated RTC will follow automatically the host time while it might be tuned via NTP. vm_clock can still be selected by passing '-rtc clock=vm' on the command line. Note that some RTC emulations (at least M48T59) already use the host time unconditionally while others (namely MC146818) do not. This patch introduces the required infrastructure for selecting the base clock but only converts MC146818 for now. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * Refactor RTC command line switchesJan Kiszka2009-10-051-22/+25
| | | | | | | | | | | | | | | | | | | | Deprecate -localtime, -setdate and -rtc-td-hack in favor of a new unified command line switch: -rtc [base=utc|localtime|date][,driftfix=none|slew] Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '1a621c8dc9e4dcc9d385bdd2c24c5b5dbfd0ebe4' into upstream-mergeMarcelo Tosatti2009-09-141-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a621c8dc9e4dcc9d385bdd2c24c5b5dbfd0ebe4': (51 commits) ram: remove support for loading v1 move mux focus field from CharDriverState to MuxDriver monitor: fix muxing qdev: add parser for chardev properties Allow -serial chardev:<name> convert udp chardev to QemuOpts. convert mux chardev to QemuOpts. convert vc chardev to QemuOpts. convert tty + parport chardevs to QemuOpts. convert windows console chardev to QemuOpts. convert braille chardev to QemuOpts. convert msmouse chardev to QemuOpts. convert stdio chardev to QemuOpts. convert pty chardev to QemuOpts. convert unix+tcp chardevs to QemuOpts. sockets: add inet_listen_opts sockets: add inet_connect_opts sockets: add unix_*_opts for windows. sockets: add unix_listen_opts sockets: add unix_connect_opts ... Conflicts: vl.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * switch chardev to QemuOpts: infrastructure, null deviceGerd Hoffmann2009-09-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | start switching chardevs to QemuOpts. This patch adds the infrastructure and converts the null device. The patch brings two new functions: qemu_chr_open_opts() same as qemu_chr_open(), but uses QemuOpts instead of a option char string. qemu_chr_parse_compat() accepts a traditional chardev option string, returns the corresponding QemuOpts instance, to handle backward compatibility. The patch also adds a new -chardev switch which can be used to create named+unconnected chardevs, like this: -chardev null,id=test This uses the new qemu_chr_open_opts. Thus with this patch alone only the null device works. The other devices will follow ... Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit 'ddd9bbd93bb2c12ade72dff1790d6d292aac073f' into upstream-mergeAvi Kivity2009-09-091-3/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ddd9bbd93bb2c12ade72dff1790d6d292aac073f': Support for multiple -monitor devices net: Fix send queue ordering do not issue ioctl from within the io thread Delay sighandler_setup() Remove typedef for bool from eepro100.c add documentation for multi-core features piix3: use new vmstate infrastructure i440fx: use new vmstate infrastructure VMState: Fix sub-structs versioning Update SaveVM versions pci_irq_levels[] belong to PIIX3State Save irq_state into PCII440FXState Conflicts: vl.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * add documentation for multi-core featuresAndre Przywara2009-09-041-3/+11
| | | | | | | | | | | | | | | | extend QEMU's internal help and man page to cover the recently added multi-core feature. Signed-off-by: Andre Przywara <andre.przywara@amd.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '5c6c3a6c54b23caa84fb4e046e85a461612279bb' into upstream-mergeAvi Kivity2009-08-301-1/+3
|\| | | | | | | | | | | | | | | | | | | | | * commit '5c6c3a6c54b23caa84fb4e046e85a461612279bb': raw-posix: add Linux native AIO support Conflicts: Makefile qemu-options.hx Signed-off-by: Avi Kivity <avi@redhat.com>
| * raw-posix: add Linux native AIO supportChristoph Hellwig2009-08-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that do have a nicer interface to work against we can add Linux native AIO support. It's an extremly thing layer just setting up an iocb for the io_submit system call in the submission path, and registering an eventfd with the qemu poll handler to do complete the iocbs directly from there. This started out based on Anthony's earlier AIO patch, but after estimated 42,000 rewrites and just as many build system changes there's not much left of it. To enable native kernel aio use the aio=native sub-command on the drive command line. I have also added an option to qemu-io to test the aio support without needing a guest. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '0d6b0b1d8190738b820955bf749741c1ae60e7d7' into upstream-mergeAvi Kivity2009-08-241-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '0d6b0b1d8190738b820955bf749741c1ae60e7d7': Make the e1000 the default network adapter for the pc target. eliminate errors about unused results in block/vpc.c virtio-blk: add msi support. qdev/prop: convert isa-bus to helper macros. Conflicts: hw/pc.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * Make the e1000 the default network adapter for the pc target.Anthony Liguori2009-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The ne2k is an ancient card that performs pretty terribly under QEMU. In many modern OSes, there is no longer drivers available for the ne2k. Switch the default network adapter to e1000. This card is more widely suppported and performs rather well under QEMU. There may be very old OSes that had a ne2k driver but not an e1000 driver but I think this is likely the exception. I think the average user is better served with an e1000 vs ne2k. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '4a1418e07bdcfaa3177739e04707ecaec75d89e1' into upstream-mergeAvi Kivity2009-08-241-19/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4a1418e07bdcfaa3177739e04707ecaec75d89e1': Unbreak large mem support by removing kqemu Add a configure switch to enable / disable all user targets. I felt compelled to do it for symmetry, mostly it is useful to disable user targets when you don't want to build them. Migration via unix sockets. Conflicts: Makefile.target exec.c osdep.c vl.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * Unbreak large mem support by removing kqemuAnthony Liguori2009-08-241-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kqemu introduces a number of restrictions on the i386 target. The worst is that it prevents large memory from working in the default build. Furthermore, kqemu is fundamentally flawed in a number of ways. It relies on the TSC as a time source which will not be reliable on a multiple processor system in userspace. Since most modern processors are multicore, this severely limits the utility of kqemu. kvm is a viable alternative for people looking to accelerate qemu and has the benefit of being supported by the upstream Linux kernel. If someone can implement work arounds to remove the restrictions introduced by kqemu, I'm happy to avoid and/or revert this patch. N.B. kqemu will still function in the 0.11 series but this patch removes it from the 0.12 series. Paul, please Ack or Nack this patch. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit 'd058fe03e53699b5a85db1ea36edcf59273775a8' into upstream-mergeAvi Kivity2009-08-111-1/+5
|\| | | | | | | | | | | | | | | | | | | * commit 'd058fe03e53699b5a85db1ea36edcf59273775a8': QemuOpts: add -set option Conflicts: qemu-options.hx Signed-off-by: Avi Kivity <avi@redhat.com>
| * QemuOpts: add -set optionGerd Hoffmann2009-08-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | One use case will be file for drives (no filename quoting issues), i.e. -drive id=test,if=virtio -set drive.test.file=/vmdisk/test-virtio.img It will work for any other option (assuming handled by QemuOpts) though. Except for id= for obvious reasons ;). Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Message-Id:
* | Merge commit 'baef8a666c137fae513a195c8abeb80e1806d7bd' into upstream-mergeAvi Kivity2009-07-291-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'baef8a666c137fae513a195c8abeb80e1806d7bd': QEMU BOCHS bios patches to use maxcpus value. Introduce -smp , maxcpus= flag to specify maximum number of CPUS. Use Little Endian for Dirty Log Use 64bit pointer for dirty log HPET fixes for reg writes slirp: Fix guestfwd for incoming data Conflicts: pc-bios/bios.bin (dropped) Signed-off-by: Avi Kivity <avi@redhat.com>
| * Introduce -smp , maxcpus= flag to specify maximum number of CPUS.Jes Sorensen2009-07-271-1/+4
| | | | | | | | | | | | | | | | Follow on patch will use it to determine the size of the MADT and other BIOS tables. Signed-off-by: Jes Sorensen <jes@sgi.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit 'bd3c948db739a6c9c5e42ec838ef1220beea8e4e' into upstream-mergeAvi Kivity2009-07-281-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bd3c948db739a6c9c5e42ec838ef1220beea8e4e': qdev: add -device command line option. qdev: bus walker + qdev_device_add() qdev: create default bus names. qdev/pci: use qdev_prop_pci_devfn qdev/prop: add pci devfn property Add a pc-0.11 machine type and make the pc type an alias Add machine type aliases Conflicts: vl.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * qdev: add -device command line option.Gerd Hoffmann2009-07-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | The -device switch is the users frontend to the qdev_device_add function added by the previous patch. Also adds a linked list where command line options can be saved. Use it for the new -device and for the -usbdevice and -bt switches. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit 'ef2039f17d3e2226b8650b4d7692e5f458a37573' into upstream-mergeAvi Kivity2009-07-281-4/+23
|\| | | | | | | | | | | | | | | | | | | | | * commit 'ef2039f17d3e2226b8650b4d7692e5f458a37573': Regenerate BIOS and add patches for -boot option Update boot option documentation Conflicts: pc-bios/bios.bin (dropped) Signed-off-by: Avi Kivity <avi@redhat.com>
| * Update boot option documentationJan Kiszka2009-07-161-4/+23
| | | | | | | | | | Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>