syeon.hwang [Thu, 8 Mar 2012 05:11:49 +0000 (14:11 +0900)]
Merge branch 'master' of git://172.21.111.188/emulator
Son Hyunjun [Thu, 8 Mar 2012 05:11:02 +0000 (14:11 +0900)]
add maru_pm
Son Hyunjun [Thu, 8 Mar 2012 05:02:20 +0000 (14:02 +0900)]
add include <stdint.h>
syeon.hwang [Thu, 8 Mar 2012 05:01:19 +0000 (14:01 +0900)]
Merge branch 'master' of git://172.21.111.188/emulator
Son Hyunjun [Thu, 8 Mar 2012 05:00:22 +0000 (14:00 +0900)]
Merge branch 'master' of git://172.21.111.188/emulator
Son Hyunjun [Thu, 8 Mar 2012 05:00:14 +0000 (14:00 +0900)]
modify boilerplate and add include <pthread.h>
syeon.hwang [Thu, 8 Mar 2012 04:59:01 +0000 (13:59 +0900)]
Merge branch 'master' of git://172.21.111.188/emulator
syeon.hwang [Thu, 8 Mar 2012 04:58:56 +0000 (13:58 +0900)]
Fix Makefile problem and add property
Kitae Kim [Thu, 8 Mar 2012 04:52:05 +0000 (13:52 +0900)]
[Title] Rename PixelFormat type to FFmpeg_PixelFormat in FFmpeg library to compile qemu and update FFmpeg libraries.
[Type]
[Module] emulator / codec
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
munkyu.im [Thu, 8 Mar 2012 03:14:58 +0000 (12:14 +0900)]
[Title]add sdb function in vl.c
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
Son Hyunjun [Thu, 8 Mar 2012 03:02:40 +0000 (12:02 +0900)]
fix compile error and warning
Son Hyunjun [Thu, 8 Mar 2012 02:22:44 +0000 (11:22 +0900)]
Revert "fix compile error overlay"
This reverts commit
9f2d86fbd4c3b306113ba5fd6633898ce02bc242.
munkyu.im [Thu, 8 Mar 2012 02:17:22 +0000 (11:17 +0900)]
Merge branch 'master' of git://172.21.111.188/emulator
munkyu.im [Thu, 8 Mar 2012 02:16:53 +0000 (11:16 +0900)]
[Title]add sdb
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
munkyu.im [Thu, 8 Mar 2012 01:33:57 +0000 (10:33 +0900)]
Revert "[Title]add sdb"
This reverts commit
0c240e599bb38ef08c32eba040039e2b0ef8f9f1.
Son Hyunjun [Thu, 8 Mar 2012 01:27:37 +0000 (10:27 +0900)]
fix compile error overlay
Kitae Kim [Wed, 7 Mar 2012 14:09:31 +0000 (23:09 +0900)]
Merge branch 'master' of git://172.21.111.188/emulator
Kitae Kim [Wed, 7 Mar 2012 09:31:59 +0000 (18:31 +0900)]
Revert "[Title] Modify Codec module because memory APIs have been updated on QEMU 1.0"
This reverts commit
af599b344c5903f753e0ba07f0ea1084f14aa7a4.
Conflicts:
configure
syeon.hwang [Wed, 7 Mar 2012 09:31:00 +0000 (18:31 +0900)]
Merge branch 'master' of git://172.21.111.188/emulator
syeon.hwang [Wed, 7 Mar 2012 09:30:50 +0000 (18:30 +0900)]
Add include path (SRC_PATH/hw)
Son Hyunjun [Wed, 7 Mar 2012 09:27:15 +0000 (18:27 +0900)]
Merge branch 'master' of git://172.21.111.188/emulator
Son Hyunjun [Wed, 7 Mar 2012 09:26:50 +0000 (18:26 +0900)]
Revert "merge vga.c"
This reverts commit
6333ace05f19b9b5373744ec9f572fb9a59ba84d.
sangjin3.kim [Wed, 7 Mar 2012 09:25:04 +0000 (18:25 +0900)]
[Title] include file changed.
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
sangjin3.kim [Wed, 7 Mar 2012 09:16:55 +0000 (18:16 +0900)]
[Title] opengl build script moved from Makefile.target to tizen/src/Makefile.tizen
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
sangjin3.kim [Wed, 7 Mar 2012 09:10:11 +0000 (18:10 +0900)]
[Title] opengl
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
syeon.hwang [Wed, 7 Mar 2012 08:35:22 +0000 (17:35 +0900)]
Merge branch 'master' of git://172.21.111.188/emulator
syeon.hwang [Wed, 7 Mar 2012 08:35:14 +0000 (17:35 +0900)]
Add initial maru make system
munkyu.im [Wed, 7 Mar 2012 07:00:21 +0000 (16:00 +0900)]
Merge branch 'master' of git://172.21.111.188/emulator
munkyu.im [Wed, 7 Mar 2012 06:59:04 +0000 (15:59 +0900)]
[Title]convert utf8 to cp949 (CreateFile)
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
giwoong.kim [Wed, 7 Mar 2012 05:35:06 +0000 (14:35 +0900)]
[Title] call maruskin_sdl_init
[Type]
[Module]
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
giwoong.kim [Wed, 7 Mar 2012 05:30:09 +0000 (14:30 +0900)]
[Title] added main
[Type]
[Module]
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
munkyu.im [Wed, 7 Mar 2012 05:18:28 +0000 (14:18 +0900)]
[Title]add sdb
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
giwoong.kim [Wed, 7 Mar 2012 02:44:43 +0000 (11:44 +0900)]
[Title] dos2unix
[Type]
[Module]
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
giwoong.kim [Wed, 7 Mar 2012 01:31:51 +0000 (10:31 +0900)]
[Title] added header file
[Type]
[Module]
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
giwoong.kim [Tue, 6 Mar 2012 05:16:47 +0000 (14:16 +0900)]
[Title] added maruskin_client file
[Type]
[Module]
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
giwoong.kim [Tue, 6 Mar 2012 02:39:37 +0000 (11:39 +0900)]
[Title] added maruskin_sdl file
[Type]
[Module]
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
Son Hyunjun [Mon, 5 Mar 2012 14:15:18 +0000 (23:15 +0900)]
add hardkey event
Son Hyunjun [Mon, 5 Mar 2012 13:57:59 +0000 (22:57 +0900)]
add protocol and operation
giwoong.kim [Mon, 5 Mar 2012 13:03:33 +0000 (22:03 +0900)]
[Title] added maru_touchscreen file
[Type]
[Module]
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
Son Hyunjun [Mon, 5 Mar 2012 12:39:32 +0000 (21:39 +0900)]
rename enum
Son Hyunjun [Mon, 5 Mar 2012 12:38:15 +0000 (21:38 +0900)]
add protocol enum
Son Hyunjun [Mon, 5 Mar 2012 12:30:39 +0000 (21:30 +0900)]
modification skin server
Son Hyunjun [Mon, 5 Mar 2012 11:41:38 +0000 (20:41 +0900)]
modify code formatting
Jinhyung Jo [Mon, 5 Mar 2012 10:54:18 +0000 (19:54 +0900)]
[Title] add camera sources
[Type] Feature
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
Son Hyunjun [Mon, 5 Mar 2012 10:45:10 +0000 (19:45 +0900)]
modification skin_server
Son Hyunjun [Mon, 5 Mar 2012 10:38:04 +0000 (19:38 +0900)]
modification skin_server
Son Hyunjun [Mon, 5 Mar 2012 10:32:37 +0000 (19:32 +0900)]
modification skin_server
Son Hyunjun [Mon, 5 Mar 2012 08:52:49 +0000 (17:52 +0900)]
modify skin server
Son Hyunjun [Mon, 5 Mar 2012 08:02:22 +0000 (17:02 +0900)]
merge vga.c
Son Hyunjun [Mon, 5 Mar 2012 07:41:43 +0000 (16:41 +0900)]
Merge branch 'master' of git://172.21.111.188/emulator
Son Hyunjun [Mon, 5 Mar 2012 07:40:46 +0000 (16:40 +0900)]
merge maru_hw, skin server
Kitae Kim [Mon, 5 Mar 2012 07:27:46 +0000 (16:27 +0900)]
[Title] Add FFmpeg source and binaries to build qemu.
[Type]
[Module] emulator / codec
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
sangjin3.kim [Mon, 5 Mar 2012 06:02:45 +0000 (15:02 +0900)]
[Title] opengl-es acceleration server and client
[Type] Enhancement
[Module] opengl
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
Kitae Kim [Fri, 2 Mar 2012 05:47:01 +0000 (14:47 +0900)]
[Title] Modify Codec module because memory APIs have been updated on QEMU 1.0
[Type] enhancement
[Module] emulator / codec
[Priority] Major
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
Yeongkyoon Lee [Fri, 2 Mar 2012 05:36:27 +0000 (14:36 +0900)]
[Title] Add QEMU TCG ld/st optimization
[Type] Enhancement
[Module] QEMU TCG
[Priority] Major
[CQ#]
[Redmine#]
[Problem] Slow performance of TCG qemu_ld/st IRs
[Cause]
[Solution] Optimization of x86 code generation for qemu_ld/st IRs
[TestCase] CoreMark, Tizen
syeon.hwang [Tue, 28 Feb 2012 11:03:32 +0000 (20:03 +0900)]
modify submodule for new java project structures
syeon.hwang [Tue, 28 Feb 2012 10:09:10 +0000 (19:09 +0900)]
[Title] Add skin submodule and prepare some directory
[Type]
[Module] Emulator/
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
syeon.hwang [Tue, 28 Feb 2012 08:48:39 +0000 (17:48 +0900)]
[Title] New emulator project based on QEMU 1.0.1
[Type]
[Module] Emulator/
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
Justin M. Forbes [Thu, 2 Feb 2012 22:44:08 +0000 (16:44 -0600)]
Version 1.0.1
Signed-off-by: Justin M. Forbes <jforbes@redhat.com>
Justin M. Forbes [Wed, 1 Feb 2012 17:25:23 +0000 (11:25 -0600)]
Merge branch 's390-1.0' of git://repo.or.cz/qemu/agraf
Justin M. Forbes [Wed, 1 Feb 2012 17:24:47 +0000 (11:24 -0600)]
Merge branch 'ppc-1.0' of git://repo.or.cz/qemu/agraf
Anthony Liguori [Mon, 23 Jan 2012 13:30:43 +0000 (07:30 -0600)]
e1000: bounds packet size against buffer size
Otherwise we can write beyond the buffer and corrupt memory. This is tracked
as CVE-2012-0029.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Christian Borntraeger [Sun, 20 Nov 2011 23:12:03 +0000 (23:12 +0000)]
s390: fix cpu hotplug / cpu activity on interrupts
The add_del/running_cpu code and env->halted are tracking stopped cpus.
Sleeping cpus (idle and enabled for interrupts) are waiting inside the
kernel.
No interrupt besides the restart can move a cpu from stopped to
operational. This is already handled over there. So lets just remove
the bogus wakup from the common interrupt delivery, otherwise any
interrupt will wake up a cpu, even if this cpu is stopped (Thus leading
to strange hangs on sigp restart)
This fixes
echo 0 > /sys/devices/system/cpu/cpu0/online
echo 1 > /sys/devices/system/cpu/cpu0/online
in the guest
Signed-off-by: Christian Borntraeger<borntraeger@de.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
(cherry picked from commit
93116ac0cf9734e7b28886aedf03848b37d6785e)
Alexander Graf [Fri, 18 Nov 2011 15:45:54 +0000 (16:45 +0100)]
s390x: add TR function for EXECUTE
Newer gcc versions (or glibc?) also generate code that tries to EXECUTE
the TR opcode. Implement it so that we don't break valid guests.
Reported-by: Andreas Faerber <afaerber@suse.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
David Gibson [Wed, 11 Jan 2012 19:46:27 +0000 (19:46 +0000)]
pseries: Don't try to munmap() a malloc()ed TCE table
For the pseries machine, TCE (IOMMU) tables can either be directly
malloc()ed in qemu or, when running on a KVM which supports it, mmap()ed
from a KVM ioctl. The latter option is used when available, because it
allows the (frequent bottlenext) H_PUT_TCE hypercall to be KVM accelerated.
However, even when KVM is persent, TCE acceleration is not always possible.
Only KVM HV supports this ioctl(), not KVM PR, or the kernel could run out
of contiguous memory to allocate the new table. In this case we need to
fall back on the malloc()ed table.
When a device is removed, and we need to remove the TCE table, we need to
either munmap() or free() the table as appropriate for how it was
allocated. The code is supposed to do that, but we buggily fail to
initialize the tcet->fd variable in the malloc() case, which is used as a
flag to determine which is the right choice.
This patch fixes the bug, and cleans up error messages relating to this
path while we're at it.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
David Gibson [Tue, 13 Dec 2011 04:24:34 +0000 (15:24 +1100)]
pseries: Populate "/chosen/linux,stdout-path" in the FDT
There is a device tree property "/chosen/linux,stdout-path" which indicates
which device should be used as stdout - ie. "the console".
Currently we don't specify anything, which means both firmware and Linux
choose something arbitrarily. Use the routine we added in the last patch
to pick a default vty and specify it as stdout.
Currently SLOF doesn't use the property, but we are hoping to update it
to do so.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
(cherry picked from commit
68f3a94c64bbaaf8c7f2daa70de1b5d87a432f86)
David Gibson [Mon, 12 Dec 2011 18:24:33 +0000 (18:24 +0000)]
pseries: Add a routine to find a stable "default" vty and use it
In vty_lookup() we have a special case for supporting early debug in
the kernel. This accepts reg == 0 as a special case to mean "any vty".
We implement this by searching the vtys on the bus and returning the
first we find. This means that the vty we chose depends on the order
the vtys are specified on the QEMU command line - because that determines
the order of the vtys on the bus.
We'd rather the command line order was irrelevant, so instead return
the vty with the lowest reg value. This is still a guess as to what the
user really means, but it is at least stable WRT command line ordering.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
[agraf] fix braces
(cherry picked from commit
98331f8ad6a3e2cfbb402d72e6be47eac7706251)
David Gibson [Mon, 12 Dec 2011 18:24:32 +0000 (18:24 +0000)]
pseries: Emit device tree nodes in reg order
Although in theory the device tree has no inherent ordering, in practice
the order of nodes in the device tree does effect the order that devices
are detected by software.
Currently the ordering is determined by the order the devices appear on
the QEMU command line. Although that does give the user control over the
ordering, it is fragile, especially when the user does not generate the
command line manually - eg. when using libvirt etc.
So order the device tree based on the reg value, ie. the address of on
the VIO bus of the devices. This gives us a sane and stable ordering.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
[agraf] add braces
(cherry picked from commit
05c194384f836240ea4c2da5fa3be43a54bff021)
Liu Yu-B13201 [Mon, 28 Nov 2011 20:41:18 +0000 (20:41 +0000)]
kvm-ppc: halt secondary cpus when guest reset
When guest reset, we need to halt secondary cpus until guest kick them.
This already works for tcg. The patch add the support for kvm.
Signed-off-by: Liu Yu <yu.liu@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
[agraf: remove in-kernel irqchip code]
(cherry picked from commit
157feeadbaec09fe4dca539a24f6f6d327d6eeb6)
David Gibson [Mon, 28 Nov 2011 20:21:39 +0000 (20:21 +0000)]
pseries: Fix array overrun bug in PCI code
spapr_populate_pci_devices() containd a loop with PCI_NUM_REGIONS (7)
iterations. However this overruns the 'bars' global array, which only has
6 elements. In fact we only want to run this loop for things listed in the
bars array, so this patch corrects the loop bounds to reflect that.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
(cherry picked from commit
135712de61dfa22368e98914d65b8b0860ec8505)
Alexander Graf [Fri, 18 Nov 2011 15:41:59 +0000 (16:41 +0100)]
console: Fix segfault on screendump without VGA adapter
When trying to create a screen dump without having any VGA adapter
inside the guest, QEMU segfaults.
This is because it's trying to switch back to the "previous" screen
it was on before dumping the VGA screen. Unfortunately, in my case
there simply is no previous screen so it accesses a NULL pointer.
Fix it by checking if previous_active_console is actually available.
This is 1.0 material.
Signed-off-by: Alexander Graf <agraf@suse.de>
Justin M. Forbes [Tue, 10 Jan 2012 20:41:17 +0000 (14:41 -0600)]
Merge branch 'master' of ssh://git.qemu.org/pub/git/qemu-stable-1.0
Josh Durgin [Wed, 7 Dec 2011 01:05:10 +0000 (17:05 -0800)]
rbd: always set out parameter in qemu_rbd_snap_list
The caller expects psn_tab to be NULL when there are no snapshots or
an error occurs. This results in calling g_free on an invalid address.
Reported-by: Oliver Francke <Oliver@filoo.de>
Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Kevin Wolf [Wed, 7 Dec 2011 12:57:13 +0000 (13:57 +0100)]
Documentation: Add qemu-img -t parameter in man page
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Kevin Wolf [Wed, 7 Dec 2011 11:42:10 +0000 (12:42 +0100)]
qemu-img rebase: Fix for undersized backing files
Backing files may be smaller than the corresponding COW file. When
reading directly from the backing file, qemu-img rebase must consider
this and assume zero sectors after the end of backing files.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Avi Kivity [Mon, 5 Dec 2011 17:20:12 +0000 (19:20 +0200)]
coroutine: switch per-thread free pool to a global pool
ucontext-based coroutines use a free pool to reduce allocations and
deallocations of coroutine objects. The pool is per-thread, presumably
to improve locality. However, as coroutines are usually allocated in
a vcpu thread and freed in the I/O thread, the pool accounting gets
screwed up and we end allocating and freeing a coroutine for every I/O
request. This is expensive since large objects are allocated via the
kernel, and are not cached by the C runtime.
Fix by switching to a global pool. This is safe since we're protected
by the global mutex.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Paolo Bonzini [Fri, 25 Nov 2011 11:06:22 +0000 (12:06 +0100)]
qiov: prevent double free or use-after-free
qemu_iovec_destroy does not clear the QEMUIOVector fully, and the data
could thus be used after free or freed again. While I do not know any
example in the tree, I observed this using virtio-scsi (and SCSI
scatter/gather) when canceling DMA requests.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Alexander Graf [Mon, 12 Dec 2011 21:36:01 +0000 (22:36 +0100)]
PPC: Fix linker scripts on ppc hosts
When compiling qemu statically with multilib on PPC, we hit the
same issue that commit
845f2c2812d9ed24b36c02a3d06ee83aeafe8b49
is fixing. Do the same here.
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
(cherry picked from commit
665a04ae1cbfa8004a38cf0fe99ba799c978a1fe)
Aurelien Jarno [Sat, 7 Jan 2012 14:20:12 +0000 (15:20 +0100)]
target-sh4: ignore ocbp and ocbwb instructions
ocbp and ocbwb controls the writeback of a cache line to memory. They
are supposed to do nothing in case of a cache miss. Given QEMU only
partially emulate caches, it is safe to ignore these instructions.
This fixes a kernel oops when trying to access an rtl8139 NIC with
recent versions.
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
(cherry picked from commit
0cdb95549fedc73e13c147ab9dcabcc303426a07)
Andriy Gapon [Thu, 22 Dec 2011 09:34:30 +0000 (11:34 +0200)]
usb-ohci: td.cbp incorrectly updated near page end
The current code that updates the cbp value after a transfer looks like this:
td.cbp += ret;
if ((td.cbp & 0xfff) + ret > 0xfff) {
<handle page overflow>
because the 'ret' value is effectively added twice the check may fire too early
when the overflow hasn't happened yet.
Below is one of the possible changes that correct the behavior:
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Gerd Hoffmann [Thu, 5 Jan 2012 14:49:18 +0000 (15:49 +0100)]
usb-host: properly release port on unplug & exit
Factor out port release into a separate function. Call release function
in exit notifier too. Add explicit call the USBDEVFS_RELEASE_PORT
ioctl, just closing the hub file handle seems not to be enougth. Make
sure we release the port before resetting the device, otherwise host
drivers will not re-attach.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Gerd Hoffmann [Wed, 4 Jan 2012 17:13:54 +0000 (18:13 +0100)]
usb-storage: cancel I/O on reset
When resetting the usb-storage device we'll have to carefully cancel
and clear any requests which might be in flight, otherwise we'll confuse
the state machine.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Cao,Bing Bu [Tue, 13 Dec 2011 01:22:20 +0000 (09:22 +0800)]
Fix parse of usb device description with multiple configurations
Changed From V1:
Use DPRINTF instead of fprintf,because it is not an error.
When testing ipod on QEMU by He Jie Xu<xuhj@linux.vnet.ibm.com>,qemu made a assertion.
We found that the ipod with 2 configurations,and the usb-linux did not parse the descriptor correctly.
The descr_len returned is the total length of the all configurations,not one configuration.
The older version will through the other configurations instead of skip,continue parsing the descriptor of interfaces/endpoints in other configurations,then went wrong.
This patch will put the configuration descriptor parse in loop outside and dispel the other configurations not requested.
Signed-off-by: Cao,Bing Bu <mars@linux.vnet.ibm.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Anthony Liguori [Sun, 18 Dec 2011 19:07:03 +0000 (13:07 -0600)]
pc: fix event_idx compatibility for virtio devices
event_idx was introduced in 0.15 and must be disabled for all virtio-pci devices
(including virtio-balloon-pci).
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Anthony Liguori [Sun, 18 Dec 2011 18:59:12 +0000 (12:59 -0600)]
pc: add pc-0.15
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Stefan Sandstrom [Mon, 12 Dec 2011 10:38:31 +0000 (11:38 +0100)]
cris: Handle conditional stores on CRISv10
Signed-off-by: Stefan Sandstrom <Stefan.Sandstrom@axis.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Brad [Tue, 29 Nov 2011 00:53:49 +0000 (19:53 -0500)]
configure: Enable build by default PIE / read-only relocation sections on OpenBSD amd64/i386.
Enable build by default PIE / read-only relocation sections for the QEMU
binaries on OpenBSD amd64/i386.
Signed-off-by: Brad Smith <brad@comstyle.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Andreas Gustafsson [Sun, 11 Dec 2011 20:46:32 +0000 (00:46 +0400)]
target-i386: fix cmpxchg instruction emulation
When the i386 cmpxchg instruction is executed with a memory operand
and the comparison result is "unequal", do the memory write before
changing the accumulator instead of the other way around, because
otherwise the new accumulator value will incorrectly be used in the
comparison when the instruction is restarted after a page fault.
This bug was originally reported on 2010-04-25 as
https://bugs.launchpad.net/qemu/+bug/569760
Signed-off-by: Andreas Gustafsson <gson@gson.org>
Aneesh Kumar K.V [Wed, 21 Dec 2011 07:07:23 +0000 (12:37 +0530)]
hw/9pfs: Use the correct signed type for different variables
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Stefan Hajnoczi [Wed, 21 Dec 2011 07:07:22 +0000 (12:37 +0530)]
hw/9pfs: replace iovec manipulation with QEMUIOVector
The v9fs_read() and v9fs_write() functions rely on iovec[] manipulation
code should be replaced with QEMUIOVector to avoid duplicating code.
In the future it may be possible to make the code even more concise by
using QEMUIOVector consistently across virtio and 9pfs.
The "v" format specifier for pdu_marshal() and pdu_unmarshal() is
dropped since it does not actually pack/unpack anything. The specifier
was also not implemented to update the offset variable and could only be
used at the end of a format string, another sign that this shouldn't
really be a format specifier. Instead, see the new
v9fs_init_qiov_from_pdu() function.
This change avoids a possible iovec[] buffer overflow when indirect
vrings are used since the number of vectors is now limited by the
underlying VirtQueueElement and cannot be out-of-bounds.
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Aneesh Kumar K.V [Sun, 4 Dec 2011 17:05:28 +0000 (22:35 +0530)]
hw/9pfs: Use the correct file descriptor in Fsdriver Callback
Fsdriver callback that operate on file descriptor need to
differentiate between directory fd and file fd.
Based on the original patch from Sassan Panahinejad <sassan@sassan.me.uk>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Aneesh Kumar K.V [Sun, 4 Dec 2011 17:05:28 +0000 (22:35 +0530)]
hw/9pfs: Add qdev.reset callback for virtio-9p-pci device
Add the device reset callback
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Deepak C Shetty [Sun, 4 Dec 2011 17:05:28 +0000 (22:35 +0530)]
hw/9pfs: Reset server state during TVERSION
As per the 9p rfc, during TVERSION its necessary to clean all the active
fids, so that we start the session from a clean state. Its also needed in
scenarios where the guest is booting off 9p, and boot fails, and client
restarts, without any knowledge of the past, it will issue a TVERSION again
so this ensures that we always start from a clean state.
Signed-off-by: Deepak C Shetty <deepakcs@linux.vnet.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Aneesh Kumar K.V [Sun, 4 Dec 2011 17:05:28 +0000 (22:35 +0530)]
hw/9pfs: use migration blockers to prevent live migration when virtfs export path is mounted
Now when you try to migrate with VirtFS export path mounted, you get a proper QMP error:
(qemu) migrate tcp:localhost:4444
Migration is disabled when VirtFS export path '/tmp/' is mounted in the guest using mount_tag 'v_tmp'
(qemu)
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Aneesh Kumar K.V [Sun, 4 Dec 2011 17:05:27 +0000 (22:35 +0530)]
hw/9pfs: Improve portability to older systems
handle fs driver require a set of newly added syscalls. Don't
Compile handle FS driver if those syscalls are not available.
Instead of adding #ifdef for all those syscalls we check for
open by handle syscall. If that is available then rest of the
syscalls used by the driver should be available.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Andreas Färber [Wed, 30 Nov 2011 15:26:21 +0000 (16:26 +0100)]
exec.c: Fix subpage memory access to RAM MemoryRegion
Commit
95c318f5e1f88d7e5bcc6deac17330fd4806a2d3 (Fix segfault in mmio
subpage handling code.) prevented a segfault by making all subpage
registrations over an existing memory page perform an unassigned access.
Symptoms were writes not taking effect and reads returning zero.
Very small page sizes are not currently supported either,
so subpage memory areas cannot fully be avoided.
Therefore change the previous fix to use a new IO_MEM_SUBPAGE_RAM
instead of IO_MEM_UNASSIGNED. Suggested by Avi.
Reviewed-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Cc: Avi Kivity <avi@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Stefan Weil [Tue, 29 Nov 2011 05:34:48 +0000 (06:34 +0100)]
malta: Fix regression (i8259 interrupts did not work)
Commit
5632ae46d5bda798e971dae48ebb318ac2c3686a passes the address
of i8259 to qemu_irq_proxy. i8259 is an auto variable with undefined
value outside of mips_malta_init.
This made the interrupt proxy unusable: either QEMU crashes, or
the interrupt handler was not called.
Ethernet for example no longer worked with MIPS Malta.
v2:
While v1 used a static variable for i8259, this patch introduces
a qdev for the malta machine. i8259 is now part of the device status.
This is a minimal qdev implementation to keep the patch small.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
(cherry picked from commit
e9b40fd34ceb23461083d505a444a389c094455b)
Anthony Liguori [Thu, 1 Dec 2011 20:04:21 +0000 (14:04 -0600)]
Update version for 1.0 release
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Michael Roth [Tue, 29 Nov 2011 22:47:49 +0000 (16:47 -0600)]
Makefile: use full path for qapi-generated directory
Generally $(BUILD_DIR) == $(CURDIR), but that isn't necessarilly the
case, so use $(BUILD_DIR)/qapi-generated for generated files to
avoid potentionally sticking generating files in odd places outside
the build's include paths.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Michael Roth [Tue, 29 Nov 2011 22:47:48 +0000 (16:47 -0600)]
qapi: fix guardname generation
Fix a bug in handling dotted paths, and exclude directory prefixes
from generated guardnames to avoid odd/pseudo-random guardnames in
generated headers.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>