aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-03-22vmmouse: Register vmstate via qdevJan Kiszka1-1/+1
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2011-03-22vmmouse: Fix initializationJan Kiszka1-0/+1
Latest refactorings left vmmouse nonfunctional behind. Fix it by adding the required device initialization. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2011-03-22vmmouse: Fix typo preventing x86-64 buildJan Kiszka1-1/+1
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2011-03-22fix applesmc REV keyRené Rebe1-1/+1
Fix applesmc REV key string literal hex encoding. Signed-off-by: René Rebe <rene@exactcode.de> Acked-by: Alexander Graf <agraf@suse.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2011-03-22enable kvm for ppc(32) on ppc64René Rebe1-0/+2
ppc64 is backward compatible, likewise. Signed-off-by: René Rebe <rene@exactcode.de> Acked-by: Alexander Graf <agraf@suse.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2011-03-22target-ppc: add support for 6 SPE instructionsFabien Chouteau1-4/+198
Add support for 6 SPE instructions: evmra, evmwsmi{a{a}}, evmwumi{a{a}} Signed-off-by: Fabien Chouteau <chouteau@adacore.com> Reviewed-by: Nathan Froyd <froydnj@codesourcery.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2011-03-22pc-bios: update linuxboot.bin and multiboot.binAurelien Jarno2-0/+0
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2011-03-22fix linuxboot.bin and multiboot.bin to not hijack int19Gleb Natapov3-15/+29
Currently linuxboot.bin and multiboot.bin option roms override int19 vector to intercept boot process. No sane option rom should do that. Provide bev entry instead that will be called by BIOS if option rom is selected for booting. Signed-off-by: Gleb Natapov <gleb@redhat.com> Acked-by: Alexander Graf <agraf@suse.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2011-03-21Merge remote branch 'qemu-kvm/uq/master' into stagingAnthony Liguori24-566/+618
2011-03-21seabios: update to latest gitAnthony Liguori2-0/+0
- cc97564 Add config option to permit running option roms with bad checksums. - 424f217 Add config option to disable MTRR initialization. - fb2f10d Prep version for next release. - f18b09b Update version to 0.6.2 - 20fcf9b lets pretend that RTC can be used to wakeup from S4 - 1efb10b Expand user configurable parameters in Kconfig. - 3dba4c2 Support non-local build directory - allow "make OUT=abc/" to work. - 42d9771 The vgabios build must depend on autoconf.h. - 32aa9f3 fix parallel compilation of SeaBIOS - 713be89 Start using Kconfig to configure SeaBIOS settings. - b623e7c Change kconfig to emit disabled symbols in autoconf.h. - 0da7bfd Build changes for Linux kconfig code to work in seabios dir structure. - a4c5daf Initial commit of Kconfig build tool. - 4d0c592 Minor boot fixes. - 812478e Minor comment / code layout improvement to romlayout.S. - 6fc7cf1 Fix to prevent infinite loop in build_pci_path(). - f5154e2 support T13 EDD3.0 spec - d08eb9c Add ability to track PCI paths and add to build_pci_path(). - 89a1efd Move the CBFS payload setup to later in the boot. - 9e881a3 Extract space trimming code from ATA and use in USB and bootorder code. - 3c241ed seabios: acpi: add _RMV control method for PCI devices - c2002a1 Add support for finding the boot priority of USB drives. - a5f2b91 Extend 'usb_pipe' to track the controller and ports of each device. - 8bf5503 Add functions for boot device path parsing. - c4bd3b9 Use bootprio_find_named_rom() for ramdisk and cbfs payload priorities. - ca2bc1c Remove drive->desc field. - f13a180 Minor reorganization of some of the boot_xxx code in boot.c. - 3da2c1c Move IPL.fw_bootorder to static variables in boot.c. - 7bb1584 Move IPL.bev to static variables in boot.c - baaadb6 Move IPL.checkfloppysig to a global (CheckFloppySig) in boot.c. - a0842f8 Remove Drives global struct in favor of independent global variables. - ecbcf77 Don't access drive_g->desc from boot_cdrom(). - 551caa2 Simplify keyboard reading code in the interactive boot menu. - 697e63c Call setup_translation() from map_hd_drive(). - 3c5e0e1 Rename add_ordered_drive() to add_drive() and use in map_hd_drive(). - 031ef55 Add stubs to permit devices to specify their boot priority. - 72eee3e Simplify boot ordering by building an inclusive boot list. - ce24be5 Populate drive_g->desc prior to calling add_bcv_internal(). - 74fd942 pciinit: fix off-by-one - 311f887 Minor build fixes. - bca3a87 Track the source of each optionrom deployed. - c6629e0 Support qemu based romfile wrappers called out of order. - d1a1746 Breakup boot_setup() bootorder code into its own function. - f9b0930 Add romfile_loadfile() helper function. - b9a7591 Read bootorder file into memory. - 2e109a6 Add strchr() function. - 1703ea2 Add romfile_name() function. - b674152 Add BAID for ahci cdrom. - f77e179 Provide full EDD 3.0 info for virtio disk - 67863be Enhance layoutrom.py to work around a binutils quirk. - 4c90a20 Create separate IPL entry for each CD/DVD - 0e6f636 ahci: set controller id - 1e924bb ahci: fix off-by-one in port count - 7eb0222 ahci: enable io/mem/dma - c19fc71 ahci: set dma feature flag - 80c2b6e Check if capability enabled in XXX_cmd_data functions. - f3fe3aa Require a "_cfuncXX_" symbol prefix for inter-mode c function references. - d52fdf6 add ahci support - 54fa8ec ata: make helpers available - 0a80608 util: add memset_fl() - f1f18eb pci: add helper functions for mmio bar access from real mode. - af9629b Enhance call32() to pass a parameter to called function. - 4057f98 Don't pass return address to transition(32,16,16big) on stack. - e2623fc pciinit: use pci_region functions. - 58a38e8 pci: introduce pci_region to manage pci io/memory/prefmemory regions. - 6d5a217 mark irq9 active high in DSDT - 9433098 Report meaningful error if pyserial not present in tools/readserial.py - 94dc9c4 Show size of non-relocatable runtime code during build. - 4d96edc Cleanup - it's no longer necessary to manually reset global variables. - a899945 Allow rom to grow to 256K. - 4a446d7 Fix typo preventing relocated space from being used for option roms. - 0f67397 fix virtio-blk failure after reboot - d4bded4 Add a debug method to AML code. - 2f96800 Warn that ohci bulk is not supported. - e826465 Enable optionroms to use freed space due to CONFIG_RELOCATE_INIT. - 7f55fd3 Move the 32bit init code to high memory at runtime. - 025cabd Move init code from _start() to post(). - 12fa24a Add memalign_tmp() helper function. - 244caf8 Try to hard-reboot on rerun of post even on emulators. - 5bd01de Don't do shadow copying of optionroms when CONFIG_OPTIONROMS_DEPLOYED. - adaf373 Try to hard-reboot processor on rerun of post under coreboot. - 402fd9c Enhance build to emit relocation information. - d1b4f96 Separate out init code from the rest of the 32bit flat code. - 1a4885e Modify tools/layoutrom.py to use classes instead of tuples. - 6c2e781 Use str.startswith() in python scripts. - d9c916e Prep version for next release. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2011-03-21Fix migration uint8 arrys handledJuan Quintela1-0/+2
commit 82fa39b75181b730d6d4d09f443bd26bcfcd045c only contains half of the fix. It forgots the save state fix for UINT8 indexes. Anthony, please apply, without this migration using hpet is broken. (only current user). Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2011-03-21softfloat: Drop [s]bits{8, 16, 32, 64} types in favor of [u]int{8, 16, 32, 64}_tAndreas Färber5-432/+417
They are defined with the same semantics as the POSIX types, so prefer those for consistency. Suggested by Peter Maydell. Cc: Peter Maydell <peter.maydell@linaro.org> Cc: Aurelien Jarno <aurelien@aurel32.net> Signed-off-by: Andreas Färber <andreas.faerber@web.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2011-03-21softfloat: Resolve type mismatches between declaration and implementationAndreas Färber1-34/+34
The original SoftFloat 2.0b library avoided the use of custom integer types in its public headers. This requires the definitions of int{8,16,32,64} to match the assumptions in the declarations. This breaks on BeOS R5 and Haiku/x86, where int32 is defined in {be,os}/support/SupportDefs.h in terms of a long rather than an int. Spotted by Michael Lotz. Since QEMU already breaks this distinction by defining those types just above, do use them for consistency and to allow #ifndef'ing them out as done for [u]int16 on AIX. Cc: Michael Lotz <mmlr@mlotz.ch> Cc: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Andreas Färber <andreas.faerber@web.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2011-03-21softfloat: Prepend QEMU-style header with derivation noticeAndreas Färber4-0/+21
The SoftFloat license requires "prominent notice that the work is derivative". Having added features like improved 16-bit support for arm already, add such a notice to the sources. softfloat-native.[ch] are not under the SoftFloat license and thus are not changed. Cc: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Andreas Färber <andreas.faerber@web.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2011-03-21e1000: Fix multi-descriptor packet checksum offloadStefan Hajnoczi1-1/+3
The PCI/PCI-X Family of Gigabit Ethernet Controllers Software Developer’s Manual states the following about the POPTS field: Provides a number of options which control the handling of this packet. This field is ignored except on the first data descriptor of a packet. The current implementation always loads the field and its checksum offload flags. This patch uses only the first descriptor's POPTS field in order to comply with the specification. When Solaris sends multi-descriptor packets it fills in POPTS for the first descriptor only. Therefore this patch is necessary in order to perform checksum offload correctly for multi-descriptor packets. Reported-by: Daniel Pecka <dpecka@techniservit.cz> Reported-by: Gabriele A. Trombetti <gabriele.trombetti@itb.cnr.it> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2011-03-21Merge branch 'for-anthony' of git://github.com/bonzini/qemuAurelien Jarno79-351/+364
* 'for-anthony' of git://github.com/bonzini/qemu: remove qemu_get_clock add a generic scaling mechanism for timers change all other clock references to use nanosecond resolution accessors change all rt_clock references to use millisecond resolution accessors add more helper functions with explicit milli/nanosecond resolution
2011-03-21Merge branch 'for-anthony' of git://repo.or.cz/qemu/kevinAurelien Jarno10-69/+339
* 'for-anthony' of git://repo.or.cz/qemu/kevin: Add qcow2 documentation hw/xen_disk: aio_inflight not released in handling ioreq when nr_segments==0 Improve error handling in do_snapshot_blkdev() Fix ATA SMART and CHECK POWER MODE Don't allow multiwrites against a block device without underlying medium tools: Use real async.c instead of stubs Add error message for loading snapshot without VM state block/qcow: Don't ignore immediate read/write and other failures block/vdi: Don't ignore immediate read/write failures
2011-03-21rbd: don't link with -lcryptoAurelien Jarno1-1/+1
rbd support tries to both link with -lrados and -lcrypto. While the first one is of course necessary, the second is not necessary (only librados ifself needs to link with libcrypto). This fixes a licensing issue: qemu as a whole is GPL v2, and thus can't be linked with OpenSSL without an exception in the license, which seems difficult to get given the number of persons involved. Cc: Christian Brunner <chb@muc.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2011-03-21hw/arm_sysctl.c: Add the Versatile Express system registersPeter Maydell1-1/+63
Add support for the Versatile Express SYS_CFG registers, which provide a generic means of reading or writing configuration information from various parts of the board. We only implement shutdown and reset. Also make the RESETCTL register RAZ/WI on Versatile Express rather than reset the board. Other system registers are generally the same as Versatile and Realview. This includes a VMState version number bump for arm_sysctl, since we have new register state to preserve. It also adds sys_mci to the VMState while we're bumping the version number (an accidental omission from commit b50ff6f5). Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2011-03-21remove qemu_get_clockPaolo Bonzini2-18/+0
These patches are already not doing a great service to out-of-tree modifications to QEMU. However, at least we can warn them by getting rid of the old confusing functions, or otherwise causing compilation errors. This patch removes qemu_get_clock; the previous one changed qemu_new_timer's signature. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2011-03-21add a generic scaling mechanism for timersPaolo Bonzini2-13/+21
This enables rt_clock timers to use nanosecond resolution, just by using the _ns functions; there is really no reason to forbid that. Migrated timers are all using vm_clock (of course; but I checked that anyway) so the timers in the savevm files are already in nanosecond resolution. So this patch makes no change to the migration format. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2011-03-21change all other clock references to use nanosecond resolution accessorsPaolo Bonzini68-268/+268
This was done with: sed -i 's/qemu_get_clock\>/qemu_get_clock_ns/' \ $(git grep -l 'qemu_get_clock\>' ) sed -i 's/qemu_new_timer\>/qemu_new_timer_ns/' \ $(git grep -l 'qemu_new_timer\>' ) after checking that get_clock and new_timer never occur twice on the same line. There were no missed occurrences; however, even if there had been, they would have been caught by the compiler. There was exactly one false positive in qemu_run_timers: - current_time = qemu_get_clock (clock); + current_time = qemu_get_clock_ns (clock); which is of course not in this patch. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2011-03-21change all rt_clock references to use millisecond resolution accessorsPaolo Bonzini14-56/+56
This was done with: sed -i '/get_clock\>.*rt_clock/s/get_clock\>/get_clock_ms/' \ $(git grep -l 'get_clock\>.*rt_clock' ) sed -i '/new_timer\>.*rt_clock/s/new_timer\>/new_timer_ms/' \ $(git grep -l 'new_timer\>.*rt_clock' ) after checking that get_clock and new_timer never occur twice on the same line. There were no missed occurrences; however, even if there had been, they would have been caught by the compiler. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2011-03-21add more helper functions with explicit milli/nanosecond resolutionPaolo Bonzini1-0/+23
The code doesn't make much sense right now, but it will as soon as timers will be able to scale their resolution arbitrarily. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2011-03-20Fix conversions from pointer to int and vice versaStefan Weil4-10/+10
Here the int values fds[0], sigfd, s, sock and fd are converted to void pointers which are later converted back to an int value. These conversions should always use intptr_t instead of unsigned long. They are needed for environments where sizeof(long) != sizeof(void *). Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2011-03-19petalogix_ml605_mmu: remove unused variableBlue Swirl1-3/+2
Remove a write-only variable, spotted by GCC 4.6.0: /src/qemu/hw/petalogix_ml605_mmu.c: In function 'petalogix_ml605_init': /src/qemu/hw/petalogix_ml605_mmu.c:153:11: error: variable 'serial' set but not used [-Werror=unused-but-set-variable] Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2011-03-19qemu-thread: delete unused functionsBlue Swirl2-40/+0
qemu_mutex_timedlock() and qemu_cond_timedwait() are no longer used. Remove them and their helper timespec_add_ms(). Reported-by: François Revol <revol@free.fr> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2011-03-19w32: Add missing functions qemu_mutex_destroy, qemu_cond_destroyStefan Weil1-0/+21
These functions were missing in commit 9257d46d55f1fe4e8209be9a6870e339ac3266fe. Both functions are needed for compilations with configuration --enable-vnc-thread. Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Blue Swirl <blauwirbel@gmail.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2011-03-19i8254: Fix migration from older versionsJan Kiszka1-0/+2
qdev conversion broke migration as the previous version used vmstate instance IDs derived from the iobase. Fix it by registering a legacy alias. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2011-03-16Expose thread_id in info cpusJan Kiszka8-0/+29
Based on patch by Glauber Costa: To allow management applications like libvirt to apply CPU affinities to the VCPU threads, expose their ID via info cpus. This patch provides the pre-existing and used interface from qemu-kvm. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-03-16kvm: x86: Push kvm_arch_debug to kvm_arch_handle_exitJan Kiszka3-22/+16
There are no generic bits remaining in the handling of KVM_EXIT_DEBUG. So push its logic completely into arch hands, i.e. only x86 so far. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-03-16kvm: x86: Reorder functions in kvm.cJan Kiszka1-54/+54
Required for next patch which will access guest debug services from kvm_arch_handle_exit. No functional changes. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-03-16kvm: Align kvm_arch_handle_exit to kvm_cpu_exec changesJan Kiszka4-13/+13
Make the return code of kvm_arch_handle_exit directly usable for kvm_cpu_exec. This is straightforward for x86 and ppc, just s390 would require more work. Avoid this for now by pushing the return code translation logic into s390's kvm_arch_handle_exit. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> CC: Alexander Graf <agraf@suse.de> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-03-16kvm: Rework inner loop of kvm_cpu_execJan Kiszka1-12/+14
Let kvm_cpu_exec return EXCP_* values consistently and generate those codes already inside its inner loop. This means we will now re-enter the kernel while ret == 0. Update kvm_handle_internal_error accordingly, but keep kvm_arch_handle_exit untouched, it will be converted in a separate step. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-03-16kvm: Reorder error handling of KVM_RUNJan Kiszka1-6/+5
Test for general errors first as this is the slower path. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-03-16kvm: Keep KVM_RUN return value in separate variableJan Kiszka1-5/+5
Avoid using 'ret' both for the return value of KVM_RUN as well as the code kvm_cpu_exec is supposed to return. Both have no direct relation. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-03-16kvm: Consider EXIT_DEBUG unknown without CAP_SET_GUEST_DEBUGJan Kiszka1-2/+2
Without KVM_CAP_SET_GUEST_DEBUG, we neither motivate the kernel to report KVM_EXIT_DEBUG nor do we expect such exits. So fall through to the arch code which will simply report an unknown exit reason. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-03-16kvm: x86: Synchronize PAT MSR with the kernelJan Kiszka1-0/+5
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-03-16x86: Save/restore PAT MSRJan Kiszka1-0/+2
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-03-16x86: Properly reset PAT MSRJan Kiszka3-3/+7
Conforming to the Intel spec, set the power-on value of PAT also on reset, but save it across INIT. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-03-16kvm: Mark VCPU state dirty on creationJan Kiszka1-0/+1
This avoids that early cpu_synchronize_state calls try to retrieve an uninitialized state from the kernel. That even causes a deadlock if io-thread is enabled. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-03-16kvm: x86: Do not leave halt if interrupts are disabledJan Kiszka1-1/+3
When an external interrupt is pending but IF is cleared, we must not leave the halt state prematurely. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-03-16kvm: Add in-kernel irqchip awareness to cpu_thread_is_idleJan Kiszka1-1/+2
With in-kernel irqchip support enabled, the vcpu threads sleep in kernel space while halted. Account for this difference in cpu_thread_is_idle. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-03-16microblaze: Add PetaLogix ml605 MMU little-endian ref designMichal Simek5-1/+308
Add the first Microblaze little endian platform. Platform uses uart16550, axi ethernet, timer, intc. Signed-off-by: Michal Simek <monstr@monstr.eu> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@petalogix.com>
2011-03-16xilinx: Add AXIENET & DMA modelsEdgar E. Iglesias4-0/+1448
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@petalogix.com>
2011-03-16microblaze: Compile uart 16550 serial driverMichal Simek2-0/+2
Upcomming little endian platform will use 16550 serial driver. Signed-off-by: Michal Simek <monstr@monstr.eu> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@petalogix.com>
2011-03-16Add qcow2 documentationKevin Wolf1-0/+260
This adds a description of the qcow2 file format to the docs/ directory. Besides documenting what's there, which is never wrong, the document should provide a good basis for the discussion of format extensions (called "qcow3" in previous discussions) Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
2011-03-15win32: implement missing timersubBlue Swirl2-5/+20
Implement and wrap timersub() for Win32. Acked-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2011-03-15simpletrace: Move st_init() error reportingStefan Hajnoczi3-8/+9
User emulator builds do not have error_report() so it should not be used by simpletrace.c. In fact, error reporting inside simpletrace.c is inappropriate and should be done by the caller instead. This patch moves st_init() error reporting out to its caller, vl.c:main(). Reported-by: Blue Swirl <blauwirbel@gmail.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2011-03-15s390: Detect invalid invocations of qemu_ram_free/remapJan Kiszka1-0/+4
This both detects invalid invocations of qemu_ram_free and qemu_ram_remap when mem_path is non-NULL and fixes a build error on s390 ("'area' may be used uninitialized in this function"). Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> CC: Alexander Graf <agraf@suse.de> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>