aboutsummaryrefslogtreecommitdiff
path: root/vl.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'v0.12.4' into stable-0.12qemu-kvm-0.12.4Avi Kivity2010-05-091-6/+20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 incoming migration with iothreadMarcelo Tosatti2010-04-141-0/+2
| | | | | | | | | | | | | | | | | | Do not allow the vcpus to execute if the vm is stopped. Fixes -incoming with CONFIG_IOTHREAD enabled. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> (cherry picked from commit c5f32c99c6855d466737daf1cd262e7e92062f87)
| * net: remove broken net_set_boot_mask() boot device validationEduardo Habkost2010-04-111-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are many problems with net_set_boot_mask(): 1) It is broken when using the device model instead of "-net nic". Example: $ qemu-system-x86_64 -device rtl8139,vlan=0,id=net0,mac=52:54:00:82:41:fd,bus=pci.0,addr=0x4 -net user,vlan=0,name=hostnet0 -vnc 0.0.0.0:0 -boot n Cannot boot from non-existent NIC $ 2) The mask was previously used to set which boot ROMs were supposed to be loaded, but this was changed long time ago. Now all ROM images are loaded, and SeaBIOS takes care of jumping to the right boot entry point depending on the boot settings. 3) Interpretation and validation of the boot parameter letters is done on the machine type code. Examples: PC accepts only a,b,c,d,n as valid boot device letters. mac99 accepts only a,b,c,d,e,f. As a side-effect of this change, qemu-kvm won't abort anymore if using "-boot n" on a machine with no network devices. Checking if the requested boot device is valid is now a task for the BIOS or the machine-type code. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Acked-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> (cherry-picked from da1fcfda59a6bcbdf58d49243fbced455f2bf78a)
| * Don't set default monitor when there is a mux'ed oneJan Kiszka2010-03-161-0/+9
| | | | | | | | | | | | | | | | This fixes eg. "-nographic -serial mon:stdio [-serial ...]". Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> (cherry picked from commit 18141ed67f5ee8c7e8e3f8bffdb24d7b8cdbc270)
| * Fix segfault with ram_size > 4095M without kvmRyan Harper2010-03-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently, x86_64-softmmu qemu segfaults when trying to use > 4095M memsize. This patch adds a simple check and error message (much like the 2047 limit on 32-bit hosts) on ram_size in the control path after we determine we're not using kvm Upstream qemu-kvm is affected if using the -no-kvm option; this patch address the segfault there as well. Signed-off-by: Ryan Harper <ryanh@us.ibm.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
| * fix undefined shifts by >32Paolo Bonzini2010-02-271-2/+2
| | | | | | | | | | | | | | | | This one is for 0.12 too. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com> (cherry picked from commit 0dfbd514460045e3af1ed6805ab97ffedbbd1ab2)
* | Merge commit '6173d56bdcb53389c54e803873e6bf8f87836a4f' into stable-0.12-mergeMarcelo Tosatti2010-02-251-2/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6173d56bdcb53389c54e803873e6bf8f87836a4f': (27 commits) Update version and change for 0.12.3 release qcow2: Fix access after end of array ide save/restore pio/atapi cmd transfer fields and io buffer net: Monitor command set_link finds only VLAN clients, fix net: info network shows only VLAN clients, fix net: net_check_clients() checks only VLAN clients, fix net: Fix bogus "Warning: vlan 0 with no nics" with -device net: net_check_clients() runs too early to see -device, fix net: Remove unused net_client_uninit() don't dereference NULL after failed strdup virtio-net: fix network stall under load json: fix PRId64 on Win32 fix inet_parse typo iothread: fix vcpu stop with smp tcg segfault due to buffer overrun in usb-serial qcow2: Fix signedness bugs Do not ignore error, if open file failed (-serial /dev/tty) pc-bios: update to newer version of (stable) seabios kvm: Fix eflags corruption in kvm mode target-mips: fix ROTR and DROTR by zero ... Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> modified: net/slirp.c
| * net: net_check_clients() runs too early to see -device, fixMarkus Armbruster2010-02-231-0/+2
| | | | | | | | | | | | | | | | Call it right after -device devices get created. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 668680f75feea79704c603b96126c0833e1ed9a9)
| * iothread: fix vcpu stop with smp tcgMarcelo Tosatti2010-02-231-2/+3
| | | | | | | | | | | | | | | | | | Round robin vcpus in tcg_cpu_next even if the vm stopped. This allows all cpus to enter stopped state. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit c37cc7b072fa4ca8d8d21ac31d26baff5f47f9f9)
* | Merge remote branch 'upstream/stable-0.12' into stable-0.12Avi Kivity2010-01-171-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Fix CPU topology initializationJiri Denemark2010-01-111-4/+4
| | | | | | | | | | | | | | | | | | Late initialization of CPU topology in CPUState prevents KVM guests to actually see the topology. Signed-off-by: Jiri Denemark <jdenemar@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 3f7638ec4093100a63b18cbacd45dcd847f7c06b)
* | Merge branch 'stable-0.12-upstream' into stable-0.12Marcelo Tosatti2009-12-291-3/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | * stable-0.12-upstream: (7 commits) Don't load options roms intended to be loaded by the bios in qemu USB: Improve usbdevice error messages cpu-all.h: fix cpu_get_real_ticks() #ifdef alpha: fix compile user_only: compile everything with -fpie fdc/sparc32: don't hang on detection under OBP scsi-disk: Inquiry with allocation length of CDB < 36 (v4) Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * USB: Improve usbdevice error messagesScott Tsai2009-12-231-3/+14
| | | | | | | | | | | | | | | | | | | | When an non-existent USB device is specified on the command line, print "qemu: could not add USB device 'X'". Likewise for the usb_{add,del} monitor commands. Signed-off-by: Scott Tsai <scottt.tw@gmail.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> (cherry picked from commit 59d1c1c2d774cccb0a88ff73501f97bea190c154)
* | Merge commit '3c547d7bb7889182d5bcecbb3edea4c71774c6a3' into stable-0.12-mergeAvi Kivity2009-12-201-28/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c547d7bb7889182d5bcecbb3edea4c71774c6a3': (23 commits) Make sure to enable dirty tracking of VBE vram mapping vmware: setup PCI BAR 2 for FIFO as per vmware spec qdev: improve property error reporting. fix vga names in default_list usb-host: check mon before using it. usb-net: use qdev for -usbdevice Check rom_load_all() return value. defaults: update device_list[] defaults: split default_drive monitor: Catch printing to non-existent monitor monitor: Avoid readline functions in QMP monitor: do_balloon(): Check for errors monitor: Use 'device' in eject QDict: Fix size update qdev: Improve uni-north device names Avoid permanently disabled QEMU monitor when UNIX migration fails Fix loading of ELF multiboot kernels Revert "Rename DriveInfo.onerror to on_write_error" (fix mismerge) qemu-io: Fix memory leak Fix thinko in linuxboot.S ... Conflicts: hw/vga.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * fix vga names in default_listGerd Hoffmann2009-12-191-2/+2
| | | | | | | | | | | | | | | | | | Fix mismerge between 64465297 and 556cd098. Cc: Markus Armbruster <armbru@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 69fd02eea61e6d9e7cd7831ef26522a5ac9e146c)
| * usb-net: use qdev for -usbdeviceGerd Hoffmann2009-12-191-18/+0
| | | | | | | | | | | | | | | | | | Rebased to master, adapted to device renaming by armbru, no other changes. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 42be86ce95db944910005aa981a8e9ae5e01b05a)
| * Check rom_load_all() return value.Gerd Hoffmann2009-12-191-1/+4
| | | | | | | | | | | | | | | | | | Check rom_load_all() return value. Also don't make option rom loading failure fatal. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 15ff7705444ab9663189946d6d648431e0649df1)
| * defaults: update device_list[]Gerd Hoffmann2009-12-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Add isa-fdc (disables default_floppy). Add ide-drive (disables default_cdrom). Also walk the -global QemuOpts, so we'll catch -global isa-fdc.drive{A,B}=<name> too. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit d8bcbabf260a4ecce73180991cad576de850b66d)
| * defaults: split default_driveGerd Hoffmann2009-12-191-3/+20
| | | | | | | | | | | | | | | | | | Split default_drive into default_{floppy,cdrom,sdcard}. Also add QEMUMachine flags to disable them per machine. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit ac33f8fad14e07fa12b74c3494339ae6882dc22f)
| * Revert "Rename DriveInfo.onerror to on_write_error" (fix mismerge)Kevin Wolf2009-12-191-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Part of the first patch of the -drive rerror series has been merged once more on top of the rest of the series. This effectively disables the rerror option and always goes with the default value. Reverting the commit re-enables the option. This reverts commit fc072ec4df0996682dfbff6c735e2bbc0d93132f. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 75f124753922451ee697defd81a80a91ce3f9888)
* | Merge commit '686a3c3dc235df2492e754423799d1abe4f6d9e2' into stable-0.12-mergeAvi Kivity2009-12-201-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '686a3c3dc235df2492e754423799d1abe4f6d9e2': Revert "pci: interrupt disable bit support" target-ppc: fix ppc32 kvm build S390: Bail out without KVM S390: Don't tell guest we're updating config space add default virtcon initialization S390: Loop through virtio console devices target-s390: Fail on unknown instructions osdep: Fix runtime failure on older Linux kernels Fix a make -j race target-alpha: Fix generic ctz64. s390: Fix buggy assignment target-mips: fix user-mode emulation startup Conflicts: hw/pci.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * add default virtcon initializationAlexander Graf2009-12-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | When going through the default devices, we don't initialize the virtio console, unless we're doing -nographic. I suppose that's just a leftover from the recent code restructuring, so let's put it in. Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> (cherry picked from commit 38536da1e3cfde355169a81a3abe3235fd13fc6a)
* | Merge commit '3be42b28c14e2826eebbced68ad3ceb92507401d' into stable-0.12-mergeAvi Kivity2009-12-141-7/+55
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '3be42b28c14e2826eebbced68ad3ceb92507401d': monitor: Convert do_info_mice() to QObject monitor: Convert do_info_uuid() to QObject monitor: Convert do_info_hpet() to QObject monitor: Convert do_info_name() to QObject Conflicts: vl.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * monitor: Convert do_info_mice() to QObjectLuiz Capitulino2009-12-121-7/+55
| | | | | | | | | | | | | | | | | | | | | | Each mouse is represented by a QDict, the returned QObject is a QList of all mice. This commit should not change user output. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit e78c48ec4e192ef1b1a210bdf5a8d253d7826c25)
* | Merge commit 'f883e4f7b8f37b53fc54660d20fd36fbe3383f46' into stable-0.12-mergeAvi Kivity2009-12-141-209/+281
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Set default console to virtio on S390xGerd Hoffmann2009-12-121-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All "normal" system emulation targets in qemu I'm aware of display output on either VGA or serial output. Our S390x virtio machine doesn't have such kind of legacy hardware. So instead we need to default to a virtio console. Add flags to QEMUMachine to indicate which kind of default devices make sense for the machine in question. Use it for S390x: enable virtcon, disable serial, parallel and vga. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 986c5f78543bdbd696664447ecdd08cf6d935370)
| * default devices: virtio consoles.Gerd Hoffmann2009-12-121-30/+35
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds a variable default_virtcon which says whenever a default virtio console should be added. It is disabled by default, followup patch will enable it for s390. It is cleared when qemu finds '-virtiocon', '-device virtio-console-s390' or '-device virtio-console-pci' on the command line. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit aee1b935c53cc747528138a85fcce8163d272598)
| * add -qmp convinience switchGerd Hoffmann2009-12-121-5/+9
| | | | | | | | | | | | | | | | 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/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * rework -monitor handling, switch to QemuOptsGerd Hoffmann2009-12-121-43/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch reworks the -monitor handling: - It adds a new "mon" QemuOpts list for the monitor(s). - It adds a monitor_parse() function to parse the -monitor switch. - It adds a mon_init function to initialize the monitor(s) from the "mon" QemuOpts list. - It winds up everything and removes the old bits. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 88589343708f10f1ded0af100b2e11eec623bae2)
| * default devices: drivesGerd Hoffmann2009-12-121-6/+10
| | | | | | | | | | | | | | | | | | | | Add a default_drive variable which specified whenever the default drives (cdrom, floppy, sd) should be created. It is cleared when the new -nodefaults switch is specified on the command line. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit aa40fc9c96474b0135d1b940611862f260aedba7)
| * default devices: networkGerd Hoffmann2009-12-121-0/+1
| | | | | | | | | | | | | | | | | | | | Add a default_net variable which specified whenever a default network should be created. It is cleared in case any -net option is specified and it is also added to the new -nodefaults switch. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit cb4522ccf67ba84d246291d9f75bd7f3df137d1a)
| * default devices: add global cmd line option.Gerd Hoffmann2009-12-121-0/+6
| | | | | | | | | | | | | | | | 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)
| * default devices: vga adapter.Gerd Hoffmann2009-12-121-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qemu creates a vga display for you in case you didn't specify one on the command line. Right now this is tied to the '-vga <type>' command line switch, which in turn causes trouble if you are creating your gfx card using '-device VGA,<props>'. This patch adds a variable default_vga which says whenever a default serial line should be added. It is enabled by default. It is cleared when qemu finds '-vga' or '-device {VGA,Cirrus VGA,QEMUware SVGA}' on the command line. '-device VGA' still doesn't work though due to a initialization order issue (vga must init before calling i440fx_init_memory_mappings). Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 64465297cd4c701942988f36f7ce707fb21cc1d8)
| * zap serial_monitor_muxGerd Hoffmann2009-12-121-34/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic in this code obviously predates the multiple monitor capability of qemu and looks increasingly silly these days. I think the intention of this piece of code is to get a reasonable default for the -nographic case: have monitor and serial line muxed on stdio. With the new default_serial and default_monitor variables we have now doing just that became much easier ;) Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit e1c09175bc00dd8dfb2ad1b26e1858dcdc109b59)
| * default devices: qemu monitor.Gerd Hoffmann2009-12-121-44/+50
| | | | | | | | | | | | | | | | | | | | | | | | This patch makes the monitor default device configuration work like the default serial and parallel port devices. It adds a variable default_monitor which says whenever a default monitor should be added. It is enabled by default. It is cleared when qemu finds '-monitor' on the command line. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit abdeed06b416eefb7eb1ec65cc1b87241cb3b6d2)
| * default devices: parallel port.Gerd Hoffmann2009-12-121-30/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qemu creates a default parallel port for you in case you didn't specify one on the command line. Right now this is tied to the '-parallel <chardev>' command line switch, which in turn causes trouble if you are creating your parallel port via '-device isa-parallel,<props>'. This patch adds a variable default_parallel which says whenever a default parallel port should be added. It is enabled by default. It is cleared when qemu finds '-parallel' or '-device isa-parallel' on the command line. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 6a5e8b0e310c483d8d14553a2b7b601d39ed8b75)
| * default devices: core code & serial lines.Gerd Hoffmann2009-12-121-41/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qemu creates a default serial line for you in case you didn't specify one on the command line. Right now this is tied to the '-serial <chardev>' command line switch, which in turn causes trouble if you are creating your serial line via '-device isa-serial,<props>'. This patch adds a variable default_serial which says whenever a default serial line should be added. It is enabled by default. It is cleared when qemu finds '-serial' or '-device isa-serial' on the command line. Part of the patch is some infrastructure for the '-device $driver' checking (default_driver_check function) which will also be used by the other patches of this series. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 998bbd74b9d813b14a3a3b5009a5d5a48c7dce51)
| * chardev: move greeting into vc backend.Gerd Hoffmann2009-12-121-24/+0
| | | | | | | | | | | | | | | | | | | | | | Make the 'vc' chardev backend print a title line with the chardev name after initialization, using CharDriverState->label. This replaces the banner printing code in vl.c. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 51bfa4d3160fe1d5c2eca381020b8b6dd69c3c80)
| * Revert "Set default console to virtio on S390x"Gerd Hoffmann2009-12-121-26/+0
| | | | | | | | | | | | | | | | This reverts commit 93d434b4aec0702b87ebf52449a3cdf2c3596825. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 014100bb73d8512fb3d62f5cb123bfb2d04f3089)
| * Revert "monitor: Command-line flag to enable control mode"Gerd Hoffmann2009-12-121-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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)
| * chardev: make chardevs specified in config file work.Gerd Hoffmann2009-12-121-3/+13
| | | | | | | | | | | | | | | | | | | | The patch decuples the -chardev switch and the actual chardev initialization. Without this patch qemu ignores chardev entries coming via -readconfig. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 1a688d3bbc2a44bfefa3f6774a11b0385dafc029)
| * qdev: add command line option to set global defaults for properties.Gerd Hoffmann2009-12-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * qdev: make compat stuff more genericGerd Hoffmann2009-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | This patch renames the compat properties into global properties and makes them more generic. The compatibility stuff is only one of multiple possible users now. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 458fb6792d834474c6b289738b6bf9601fad87ab)
* | Merge commit '749717a0ea2f60d33d01c1e37fa24dfa7250dfc0' into upstream-mergeAvi Kivity2009-12-071-0/+26
|\| | | | | | | | | | | | | | | | | | | * commit '749717a0ea2f60d33d01c1e37fa24dfa7250dfc0': Add S390 maintainer information Set default console to virtio on S390x S390 GDB stub Add S390x virtio machine description Signed-off-by: Avi Kivity <avi@redhat.com>
| * Set default console to virtio on S390xAlexander Graf2009-12-051-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All "normal" system emulation targets in qemu I'm aware of display output on either VGA or serial output. Our S390x virtio machine doesn't have such kind of legacy hardware. So instead we need to default to a virtio console. I'm not particularly proud of this patch. It would be a lot better to have something in the machine description that tells us about the default terminal. Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* | Merge commit 'd08d6f04d6eeedce5090ff66d0676162d7d8d788' into upstream-mergeAvi Kivity2009-12-071-5/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd08d6f04d6eeedce5090ff66d0676162d7d8d788': (23 commits) monitor: use qemu_gettimeofday(), not gettimeofday() win32: fix variable use before initialization monitor: rename EVENT_* to QEVENT_* to avoid conflict on mingw32 Sparc64: fix compilation with DEBUG_MMU ide: implement stub for audio control/volume read ide: Use some already defined page macros instead of constants eepro100: Improve debug messages Remove rule for config-devices.h eepro100: Allocate a larger buffer for regname() multiboot: Use signed type for negative error numbers posix-aio-compat: Fix error check qemu-img: Fix memory leak Fix compile error when LSI_DEBUG is defined Fix build for mingw32 on windows ($$ expansion) Fix build for mingw32 on windows ($@ in macro) e1000: Fix warning from code review multiboot: Fix module loading and setting of mmap. Make -kernel for linux work with bochsbios Fix recently introduced bugs in -usbdevice host Fix description of size parameter in qemu-img's help text ... Conflicts: monitor.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * monitor: rename EVENT_* to QEVENT_* to avoid conflict on mingw32Blue Swirl2009-12-041-5/+5
| | | | | | | | | | | | Partially fixes mingw32 build. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| * Rename DriveInfo.onerror to on_write_errorKevin Wolf2009-12-031-0/+4
| | | | | | | | | | | | | | | | Either rename variables and functions to refer to write errors (which is what they actually do) or introduce a parameter to distinguish reads and writes. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '40ff6d7e8dceca227e7f8a3e8e0d58b2c66d19b4' into upstream-mergeAvi Kivity2009-12-071-5/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40ff6d7e8dceca227e7f8a3e8e0d58b2c66d19b4': Don't leak file descriptors qemu-img: There is more than one host device driver qcow2: Fix some more qemu_malloc fallout qcow2: Store exact backing format length virtio-blk: Implement rerror option ide: Implement rerror option Conflicts: posix-aio-compat.c Extended qemu_set_cloexec() to compatfd.c. Signed-off-by: Avi Kivity <avi@redhat.com>