SeokYeon Hwang [Mon, 24 Aug 2015 11:52:09 +0000 (20:52 +0900)]
upstream: some API was renamed and renewed
Change-Id: I6ec4c1eb026574b8a2ac96bdb128e84145aa16af
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Mon, 24 Aug 2015 11:53:19 +0000 (20:53 +0900)]
console: ENODEV needs "errno.h"
Change-Id: I82de49377e569492cfa428d80dfcbd5666476a1f
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Mon, 24 Aug 2015 04:28:42 +0000 (13:28 +0900)]
configure: quorum is deprecated
Change-Id: Icb61917b9702b59dc480994f42ef7bc3cb0f3ba3
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Mon, 24 Aug 2015 04:27:58 +0000 (13:27 +0900)]
smm: hax can not support SMM
Change-Id: Iec531e74c02741f6be5a263e5ff6f241bdc40d26
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Mon, 24 Aug 2015 04:27:10 +0000 (13:27 +0900)]
Merge tag 'v2.4.0' into tizen_3.0_qemu_2.4
v2.4.0 release
Change-Id: Icc7e11d212e4628dc751ca77e17716c7253984e5
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Sooyoung Ha [Thu, 20 Aug 2015 06:00:16 +0000 (15:00 +0900)]
build: reduce the configuring count on dibs build
When we build qemu on dibs, we used to run emulator_configure.sh script
twice on clean phase and on build phase. But the configure spends too
much time, especially on windows, so I remove the configuring on build
phase and do 'make clean' instead of 'make distclean' on clean phase.
Change-Id: I9cc9ea9d3f0dd06ec0084debd06af39f109c1d82
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
Sooyoung Ha [Wed, 19 Aug 2015 12:45:38 +0000 (21:45 +0900)]
package: version up
version update to 2.2.44
Change-Id: I0fe6bfe3fa882fa07961dd38062b428d3f49c5f6
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
SeokYeon Hwang [Wed, 19 Aug 2015 07:32:14 +0000 (16:32 +0900)]
Merge branch 'tizen_2.4_develop' into tizen_3.0_develop
Change-Id: I6753087cb299be5eb2b17c2ed256786021a4a27d
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Wed, 19 Aug 2015 02:56:38 +0000 (11:56 +0900)]
menu: get drive/swap image path from emul_state
Change-Id: I5365501c148a0f0fda26ecc3d4244673be4786f0
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
SeokYeon Hwang [Tue, 18 Aug 2015 09:01:58 +0000 (18:01 +0900)]
emul_state: introduced get_swap_image_file()
Introduced get_swap_image_file() that provide swap image file name.
Change-Id: I5fa9bb4140fbcbd19361fdd57492dfb2c20d1d87
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Tue, 18 Aug 2015 07:29:09 +0000 (16:29 +0900)]
emul_state: freed memories those are allocated in runtime
Change-Id: I5546cd3f680dc5b253a05235228ed60fbd6f00e5
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Mon, 17 Aug 2015 06:42:15 +0000 (15:42 +0900)]
emul_state: divided up log path
"emulator log path" and "kernel log path" can be different.
So we divided up log path and dealed with log file instead of log path.
Change-Id: I23b28d6132790b4774291810e09f95cdb5f4a633
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Tue, 18 Aug 2015 06:35:45 +0000 (15:35 +0900)]
menu: controller shortcut info updating
update controller shortcut information of Detailed Info dialog
when controller type has been changed.
Change-Id: I084dc087faa0caf5e431b3a0762ea782231af380
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
GiWoong Kim [Mon, 17 Aug 2015 09:39:17 +0000 (18:39 +0900)]
shortcut: refactoring for context menu shortcut
- remove unnecessary shortcut map and menu item parser
from KeyboardShortcut class
- menu shortcut informations are collected directly
by Detailed Info dialog
- use a icon text for Detailed Info menu name
Change-Id: Id1300fa3f82c4ab583cf60a7155ede882a69f718
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
GiWoong Kim [Thu, 13 Aug 2015 08:33:48 +0000 (17:33 +0900)]
package: version up
2.2.43
Change-Id: I0fa742321175c3a74d4529ad8a871937f947b7dd
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
SeokYeon Hwang [Wed, 12 Aug 2015 07:50:07 +0000 (16:50 +0900)]
emul_state: cleaned-up bin path and log path
"bin_path" is stored in global variale.
"get_log_redirection_path()" provide *real* redirection path
that is aquired by system runtime information.
(In Windows, it works on WINVER > 0x600 - vista or newer - only.
Otherwise, it still provide assembled log path using legacy method.)
Change-Id: I24e04d3238a6a6727b025f51250d8646674b9662
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Sat, 15 Aug 2015 05:14:22 +0000 (14:14 +0900)]
configure: we can specify WINVER on mingw now
Change-Id: I8f1ee0b2d4486c784c86c4eb20a40f54bbeadd8c
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Mon, 17 Aug 2015 02:30:24 +0000 (11:30 +0900)]
menu: fixed some dangerous implicit conversion
Fixed function prototype that use object copy in arguments.
Fixed dangerous implicit conversion that can lead object copy.
Prevent memory leaks.
Change-Id: I6864d900ceb0a71917a2682faaa1bcb1bf708704
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
sungmin ha [Fri, 7 Aug 2015 12:00:31 +0000 (21:00 +0900)]
touch: modified device checking method
Change-Id: I675616d088e65bb9da6107127f93d28575cd3477
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Sooyoung Ha [Thu, 13 Aug 2015 07:57:15 +0000 (16:57 +0900)]
virtfs: remove redundant maru defines
The virtfs option doesn't be used anymore. So I remove the maru defines
in the virtfs-option case.
While modifying this, I modify the method about getting the default
file sharing path for detailed info and remove the setter function.
Change-Id: Icaafe4d38751305457f5683d91e8a7b39eac6643
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Thu, 13 Aug 2015 08:39:11 +0000 (17:39 +0900)]
menu: detailed info dialog source code refactoring
remove a manual resizing
modified some variable and function names
declare new functions for widgets
and set fixed size for About dialog
Change-Id: Ifef06bae4d17e35eede846c74f2ba4eb6f6760fa
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
SeokYeon Hwang [Wed, 12 Aug 2015 05:30:40 +0000 (14:30 +0900)]
error_handler: do not print backtrace when early normal exit
Backtrace is very messy when exit with printing help, ...
Change-Id: I6e18db754105aae051e4ec624c62aee9f874b59c
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Tue, 11 Aug 2015 11:06:30 +0000 (20:06 +0900)]
ui: some minor modifications
remove button type mismatching between dialog and slot
clean up some text and path resources
add some log and etc
Change-Id: Ie195bd859994c60b90d6fd5257e719ac1f5641ad
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
GiWoong Kim [Mon, 10 Aug 2015 09:25:53 +0000 (18:25 +0900)]
menu: disable Telnet Port table item on Detailed Info dialog
Change-Id: I6ea4d7a2194d9008a4fbf309cf37074a76033313
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
SeokYeon Hwang [Wed, 12 Aug 2015 05:33:14 +0000 (14:33 +0900)]
emul_state: provide RAM size using ram_size global variable
Change-Id: I41b775176d1fc8d0f75d9490dc48c9ba23c7ecfc
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Tue, 11 Aug 2015 07:50:05 +0000 (16:50 +0900)]
configure: cleaned-up "configure" file
Change-Id: I01598f239ca61655f7deddfcba8e5124ab219ffa
SeokYeon Hwang [Tue, 11 Aug 2015 07:38:21 +0000 (16:38 +0900)]
Makefile: removed "check-*" build scripts
Change-Id: Ie06812e07a41c29cd767c38e6b2217558b377921
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Jinhyung Choi [Fri, 7 Aug 2015 13:08:24 +0000 (22:08 +0900)]
nfc: changed pthread_mutex to qemu_mutex
Change-Id: If84dad8e9c092983cc14fc2c181e1d2bcee87d68
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
Jinhyung Choi [Fri, 7 Aug 2015 13:08:05 +0000 (22:08 +0900)]
evdi: changed pthread_mutex to qemu_mutex
Change-Id: If6423e9ceda8b1a9184aaaf3534cf6dae0639aa3
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
Peter Maydell [Tue, 11 Aug 2015 14:30:34 +0000 (15:30 +0100)]
Update version for v2.4.0 release
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
SeokYeon Hwang [Tue, 11 Aug 2015 07:30:22 +0000 (16:30 +0900)]
Merge branch 'tizen_2.4_develop' into tizen_3.0_develop
Change-Id: Ibe175099ae8f1db0d5b48bb61e13efc72340282a
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Tue, 11 Aug 2015 05:38:11 +0000 (14:38 +0900)]
menu: enable DPI information on Detailed Info dialog
Change-Id: Iac6747b33a6a27ccc571a71b90186a1340e24706
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
SeokYeon Hwang [Mon, 10 Aug 2015 03:58:35 +0000 (12:58 +0900)]
UI: massive refactoring about UI/Display components
Detached QT UI from skin/display completely.
Did not built skin/display when JAVA UI is disabled.
Fixed some of badly header inclusion chains.
Change-Id: I260876aadbed75154055ec19d5f384c884854ef5
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Sun, 9 Aug 2015 08:11:12 +0000 (17:11 +0900)]
qt5: introduced pixel density for informing hw spec
Change-Id: I593a033512c37c2cd87a217515b7ca3614e8390b
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Sun, 9 Aug 2015 07:50:34 +0000 (16:50 +0900)]
qt5: detached from maru_display
Detached initializing logic from maru_display to prepare
removing JAVA UI.
Change-Id: I7e281be5ca9e231dd505f3e077095836fdcc34c8
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Sun, 9 Aug 2015 06:58:58 +0000 (15:58 +0900)]
qt5: respect QemuConsole and DisplaySurface
Change-Id: I5ae832a2ab72ab3f49aa791ba557430d2a2ab7c6
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Sun, 9 Aug 2015 05:26:15 +0000 (14:26 +0900)]
emul_state: cleaned-up display resolution state management
Change-Id: Ic8a8169e8e7e8f328488d2a67d149f0ded2d338a
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Fri, 7 Aug 2015 06:48:34 +0000 (15:48 +0900)]
ui: followed mandatory design guide
- add minimize button to Screen Shot window
- replace close message box's icon and buttons
Change-Id: I9493ebfae843f50518ac508e42cdc1856a90a3f4
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
sungmin ha [Thu, 6 Aug 2015 04:17:36 +0000 (13:17 +0900)]
spice: added explicitly spice macro
Change-Id: I0189099061e300292477bd94227e3843c8615990
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>
Jinhyung Choi [Fri, 7 Aug 2015 04:09:54 +0000 (13:09 +0900)]
build: package version up (2.2.42)
Change-Id: Idaf3594fa3091f8d5eb55a56c47b03c56dc3e0ba
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
Jinhyung Choi [Fri, 7 Aug 2015 06:14:06 +0000 (15:14 +0900)]
ui: add "profile" parameter for control panel
Change-Id: I13baa938e26de52b6afe54e7774318c7563ae9dd
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
Jinhyung Choi [Fri, 7 Aug 2015 04:06:55 +0000 (13:06 +0900)]
menu: changed ecp jar path for launching
For the extension purpose,
the ecp jar path is changed to point common directory in platforms.
Change-Id: I9f412550e2f66b40383fc883906ccc18fba8a04d
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
GiWoong Kim [Thu, 6 Aug 2015 09:33:47 +0000 (18:33 +0900)]
package: version up
2.2.41
Change-Id: I0b59f073f0ba22f29f6d90f1aae30d718874362c
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
SeokYeon Hwang [Wed, 5 Aug 2015 06:56:15 +0000 (15:56 +0900)]
build: removed supplements support in Makefile
Change-Id: I318fe9b1033ab5fd43fa3ee46290c6c7bc6c2f75
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Thu, 6 Aug 2015 07:03:46 +0000 (16:03 +0900)]
device_hotplug: supported various image type sdcard
Change-Id: I73a55db82a84a5eadf973e59a5cb86e85c6801f3
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Thu, 6 Aug 2015 04:22:42 +0000 (13:22 +0900)]
error_handler: removed deprecated functions
Change-Id: I7c4889f6d81c944589fc34f29bed278501358bc2
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Wed, 5 Aug 2015 11:17:04 +0000 (20:17 +0900)]
ui: clean up some text resources
- maru_strings.h -> ui_strings.h
- move src/ui/uistrings.h to src/ui/resource/ui_strings.h
- added some defines
Change-Id: I8ce4061b42014fffc4ebc9d679024c3c3ce7518d
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
Sooyoung Ha [Wed, 5 Aug 2015 05:52:16 +0000 (14:52 +0900)]
build: align the build scripts' tabs to spaces
Change-Id: Idabd044189eaf9790ec20cbcf9714fcf127a38eb
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
Peter Maydell [Wed, 5 Aug 2015 16:02:58 +0000 (17:02 +0100)]
Update version for v2.4.0-rc4 release
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Peter Maydell [Wed, 5 Aug 2015 15:02:00 +0000 (16:02 +0100)]
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio fix for 2.4
Fixes migration in virtio 1 mode.
We still have a known bug with memory hotplug, it doesn't
look like we can fix that in time for 2.4.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Wed 05 Aug 2015 15:57:39 BST using RSA key ID
D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
* remotes/mst/tags/for_upstream:
virtio: fix 1.0 virtqueue migration
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Sascha Silbe [Tue, 4 Aug 2015 14:48:25 +0000 (16:48 +0200)]
block: don't register quorum driver if SHA256 support is unavailable
Commit
488981a4 [block: convert quorum blockdrv to use crypto APIs]
broke qemu-iotest 041 on hosts with GnuTLS < 2.10.0. It converted a
compile-time check to a run-time check at device open time. The result
is that we now advertise a feature (the quorum block driver) that will
never work (on those hosts). There's no way (short of parsing
human-readable error messages) for qemu-iotests or any other API
consumer to recognise that the quorum block driver isn't _actually_
available and shouldn't be used or tested.
Move the run-time check to bdrv_quorum_init() to avoid registering the
quorum block driver if we know it cannot work. This way API consumers
can recognise it's unavailable.
Fixes:
488981a4af396551a3178d032cc2b41d9553ada2
Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-id:
1438699705-21761-1-git-send-email-silbe@linux.vnet.ibm.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Jason Wang [Wed, 5 Aug 2015 09:50:07 +0000 (17:50 +0800)]
virtio: fix 1.0 virtqueue migration
1.0 does not requires physically-contiguous pages layout for a
virtqueue. So we could not infer avail and used from desc. This means
we need to migrate vring.avail and vring.used when host support virtio
1.0. This fixes malfunction of virtio 1.0 device after migration.
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Sooyoung Ha [Wed, 5 Aug 2015 10:02:29 +0000 (19:02 +0900)]
package: version up
version update to 2.2.42
Change-Id: I794da1d545e68d04ccbeca316db2c9d5d4cdc701
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
GiWoong Kim [Wed, 5 Aug 2015 09:03:17 +0000 (18:03 +0900)]
controller: schedules controller object for deletion
use deleteLater() on close event handler
Change-Id: Ic9bd78f3e333174a3e9d580108ab2a35ac68cd9b
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
SeokYeon Hwang [Wed, 5 Aug 2015 07:22:22 +0000 (16:22 +0900)]
build: fixed dest dir of emulator binary on DIBS
Change-Id: I4a9d55ceee3bf9f15426827bb0f1c59c040cd21d
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Mon, 3 Aug 2015 08:01:34 +0000 (17:01 +0900)]
emulator: shutdown_qemu_gracefully() moved to emulator.c
Change-Id: Ic9c1e92e24709896eea96f203f49f714e4ebdd93
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Sooyoung Ha [Wed, 5 Aug 2015 05:45:59 +0000 (14:45 +0900)]
package: version up
version update to 2.2.41
Change-Id: Id90f8c255d42e4883d8e6baf515cc4861ddba21a
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
Sooyoung Ha [Mon, 3 Aug 2015 06:01:55 +0000 (15:01 +0900)]
package: modify platform version 2.4 -> 3.0
Change-Id: I087532655c4d05507b85f5c7bb0bdb866dde5db2
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
SeokYeon Hwang [Wed, 5 Aug 2015 05:05:10 +0000 (14:05 +0900)]
configure: add "-mwindows" when qt is enabled on windows
Change-Id: I5ba4f0ce3f115c55cd9e0747326099a97eab1395
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Tue, 4 Aug 2015 10:01:58 +0000 (19:01 +0900)]
skin: add wearableO-360x360-2btn skin resource for QT GUI
Change-Id: Ia318bfe3c0787280a5a01f016cea75a36c612a7d
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
GiWoong Kim [Tue, 4 Aug 2015 07:46:14 +0000 (16:46 +0900)]
skin: add wearableO-360x360-2btn skin resource for SWT GUI
Change-Id: Ic5cf78e319a1c311170b711d016083fa6d2dd8d3
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
Peter Maydell [Tue, 4 Aug 2015 15:51:24 +0000 (16:51 +0100)]
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
X86 queue, 2015-08-04
# gpg: Signature made Tue 04 Aug 2015 16:49:42 BST using RSA key ID
984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/x86-pull-request:
target-i386: fix IvyBridge xlevel in PC_COMPAT_2_3
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Radim Krčmář [Tue, 4 Aug 2015 14:17:21 +0000 (16:17 +0200)]
target-i386: fix IvyBridge xlevel in PC_COMPAT_2_3
Previous patch changed xlevel and missed the compatibility code.
Fixes:
3046bb5debc8 ("target-i386: emulate CPUID level of real hardware")
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Peter Maydell [Tue, 4 Aug 2015 11:57:06 +0000 (12:57 +0100)]
Merge remote-tracking branch 'remotes/lalrae/tags/mips-
20150804' into staging
MIPS patches 2015-08-04
Changes:
* fix semihosting for microMIPS R6
* fix an abort when booting mips64 kernel with --enable-tcg-debug
# gpg: Signature made Tue 04 Aug 2015 12:32:17 BST using RSA key ID
0B29DA6B
# gpg: Good signature from "Leon Alrae <leon.alrae@imgtec.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DD3 2F98 5495 9D66 35D4 4FC0 5211 8E3C 0B29 DA6B
* remotes/lalrae/tags/mips-
20150804:
target-mips: Copy restrictions from ext/ins to dext/dins
target-mips: fix semihosting for microMIPS R6
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Richard Henderson [Mon, 3 Aug 2015 19:35:53 +0000 (12:35 -0700)]
target-mips: Copy restrictions from ext/ins to dext/dins
The checks in dins is required to avoid triggering an assertion
in tcg_gen_deposit_tl. The check in dext is just for completeness.
Fold the other D cases in via fallthru.
In this case the errant dins appears to be data, not code, as
translation failed to stop after a break insn.
Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Reviewed-by: Leon Alrae <leon.alrae@imgtec.com>
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
Leon Alrae [Mon, 3 Aug 2015 12:01:19 +0000 (13:01 +0100)]
target-mips: fix semihosting for microMIPS R6
In semihosting mode the SDBBP 1 instructions should trigger UHI syscall,
but in QEMU this does not happen for recently added microMIPS R6.
Consequently bare metal microMIPS R6 programs supporting UHI will not run.
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Jinhyung Jo [Tue, 4 Aug 2015 04:58:06 +0000 (13:58 +0900)]
maru-camera: Removed unnecessary memory copy
In the Win32 Module, converted directly image into the device memory
instead of using a temporary buffer.
Change-Id: If2f765d7a7d826adffb369e2a382bc991b0afc3d
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
SeokYeon Hwang [Tue, 4 Aug 2015 07:31:33 +0000 (16:31 +0900)]
Merge branch 'tizen_2.4_develop' into tizen_3.0_develop
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Conflicts:
tizen/src/emul_state.h
tizen/src/emulator_legacy.c
Change-Id: I6779e7658b6f5e4d22c48c63712c0c1de1fdd138
jinhyung.jo [Mon, 3 Aug 2015 02:35:48 +0000 (11:35 +0900)]
maru-camera: Changed the framework used in OS X.
The QuikTime Kit(QTKit) framework has been deprecated in OS X v10.9.
So changed to the AVFoundation available in OS X v10.7 and later.
Change-Id: I29c9111063028c0cfbbf15eefef07b8d9bf1b4d6
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Jihye Won [Mon, 3 Aug 2015 08:26:17 +0000 (17:26 +0900)]
ui: add mouseDoubleClickEvent handler.
- The docking controller can not be floating state
when a user clicked once or double-clicked.
Change-Id: I68b3bf9261b354b518a2298235b841e14e79824f
Signed-off-by: Jihye Won <jihye.won1@samsung.com>
GiWoong Kim [Fri, 31 Jul 2015 08:25:57 +0000 (17:25 +0900)]
ui: clean up some source code
- add getter/setter for hardwarekey class
- extract texts from context menu
Change-Id: I7f3c8ee6599d7a6d01191746677cba0e9fd6e5a6
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
SeokYeon Hwang [Mon, 3 Aug 2015 07:55:49 +0000 (16:55 +0900)]
emulator: removed unused variables
Removed unused variables.
Removed unused QEMU arguments.
Cleaned some logics up related with JAVA UI.
Change-Id: I6304a747f4b8c1d83964b872162dc0b7cda93109
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Mon, 3 Aug 2015 01:32:20 +0000 (10:32 +0900)]
java_skin: fixed bug when treating simple message
If message contains '=', it can not be showed fully since '=' is splitted out.
So, for representing whole message, "key" is determined startsWith(),
and "value" splitted just once by '='.
Change-Id: I74a9450b9524f1bfc6a6fa9aa231bab8943d8610
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Sat, 1 Aug 2015 12:13:43 +0000 (21:13 +0900)]
emulator: introduced new error report architecture
User can see all errors reported by error_report().
Removed most emulator specified codes.
Renamed some source files.
Removed redudant header includes.
Change-Id: I61f92f4e32763eaa1e3ed20c77259dd8b034d497
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Sat, 1 Aug 2015 08:02:37 +0000 (17:02 +0900)]
emulator: cleaned common codes up
Change-Id: Ia6b6ba6094233d743ab15f6d2257e14f489e31d0
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Jihye Won [Fri, 31 Jul 2015 05:15:03 +0000 (14:15 +0900)]
Makefile: changed DIBS_SWT_PATH
- fix the bug to build qemu in dibs.
- changed DIBS_SWT_PATH due to
including swt.jar in 2.4-emulator-lib-dev
Change-Id: Ib6b2feeb98a36a168e32e42a93afd97042404e1b
Signed-off-by: Jihye Won <jihye.won1@samsung.com>
Peter Maydell [Mon, 3 Aug 2015 17:52:55 +0000 (18:52 +0100)]
Merge remote-tracking branch 'remotes/sstabellini/tags/cve-2015-5166-tag' into staging
cve-2015-5166
# gpg: Signature made Mon 03 Aug 2015 15:27:44 BST using RSA key ID
70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
* remotes/sstabellini/tags/cve-2015-5166-tag:
Fix release_drive on unplugged devices (pci_piix3_xen_ide_unplug)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Peter Maydell [Mon, 3 Aug 2015 16:33:35 +0000 (17:33 +0100)]
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-migration-2.4-tag' into staging
xen-migration-2.4
# gpg: Signature made Mon 03 Aug 2015 17:18:36 BST using RSA key ID
70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
* remotes/sstabellini/tags/xen-migration-2.4-tag:
migration: Fix regression for xenfv and pc,accel=xen machine.
migration: Fix global state with Xen.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Anthony PERARD [Mon, 3 Aug 2015 14:29:21 +0000 (15:29 +0100)]
migration: Fix regression for xenfv and pc,accel=xen machine.
This fix migration from the same QEMU version and from previous QEMU
version.
>From the global state section, we don't need runstate with Xen. Right now,
the way the Xen toolstack knows when QEMU is ready is when QEMU reach
"running" runstate.
The configuration section and the section footers are not going to be
present in previous version of QEMU with xenfv machine, so we skip them.
The Xen toolstack libxenlight does not specify a particular version of the
'pc' machine, so migration from older version of QEMU used by Xen to newer
one would break due to missing "configuration" section and section footers.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Anthony PERARD [Mon, 3 Aug 2015 14:29:19 +0000 (15:29 +0100)]
migration: Fix global state with Xen.
When doing migration via the QMP command xen_save_devices_state, the
current runstate is not store into the global state section. Also the
current runstate is not the one we want on the receiver side.
During migration, the Xen toolstack paused QEMU before save the devices
state. Also, the toolstack expect QEMU to autostart when the migration is
finished.
So this patch store "running" as it's current runstate.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Andreas Färber [Fri, 24 Jul 2015 14:47:37 +0000 (16:47 +0200)]
configure: Drop vnc-ws feature from help text
Commit 8e9b0d2 (ui: convert VNC websockets to use crypto APIs) dropped
the --enable-vnc-ws option but forgot to update the help text. Fix this.
Cc: Daniel P. Berrange <berrange@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Message-id:
1437749257-3313-1-git-send-email-afaerber@suse.de
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Stefano Stabellini [Mon, 3 Aug 2015 13:56:57 +0000 (13:56 +0000)]
Fix release_drive on unplugged devices (pci_piix3_xen_ide_unplug)
pci_piix3_xen_ide_unplug should completely unhook the unplugged
IDEDevice from the corresponding BlockBackend, otherwise the next call
to release_drive will try to detach the drive again.
Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Peter Maydell [Mon, 3 Aug 2015 12:09:10 +0000 (13:09 +0100)]
Merge remote-tracking branch 'remotes/stefanha/tags/rtl8139-cplus-tx-input-validation-pull-request' into staging
Pull request
# gpg: Signature made Mon Aug 3 13:08:25 2015 BST using RSA key ID
81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/rtl8139-cplus-tx-input-validation-pull-request:
rtl8139: check TCP Data Offset field (CVE-2015-5165)
rtl8139: skip offload on short TCP header (CVE-2015-5165)
rtl8139: check IP Total Length field (CVE-2015-5165)
rtl8139: check IP Header Length field (CVE-2015-5165)
rtl8139: skip offload on short Ethernet/IP header (CVE-2015-5165)
rtl8139: drop tautologous if (ip) {...} statement (CVE-2015-5165)
rtl8139: avoid nested ifs in IP header parsing (CVE-2015-5165)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Stefan Hajnoczi [Wed, 15 Jul 2015 16:39:29 +0000 (17:39 +0100)]
rtl8139: check TCP Data Offset field (CVE-2015-5165)
The TCP Data Offset field contains the length of the header. Make sure
it is valid and does not exceed the IP data length.
Reported-by: 朱东海(启路) <donghai.zdh@alibaba-inc.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Stefan Hajnoczi [Wed, 15 Jul 2015 16:36:15 +0000 (17:36 +0100)]
rtl8139: skip offload on short TCP header (CVE-2015-5165)
TCP Large Segment Offload accesses the TCP header in the packet. If the
packet is too short we must not attempt to access header fields:
tcp_header *p_tcp_hdr = (tcp_header*)(eth_payload_data + hlen);
int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr);
Reported-by: 朱东海(启路) <donghai.zdh@alibaba-inc.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Stefan Hajnoczi [Wed, 15 Jul 2015 16:34:40 +0000 (17:34 +0100)]
rtl8139: check IP Total Length field (CVE-2015-5165)
The IP Total Length field includes the IP header and data. Make sure it
is valid and does not exceed the Ethernet payload size.
Reported-by: 朱东海(启路) <donghai.zdh@alibaba-inc.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Stefan Hajnoczi [Wed, 15 Jul 2015 16:32:32 +0000 (17:32 +0100)]
rtl8139: check IP Header Length field (CVE-2015-5165)
The IP Header Length field was only checked in the IP checksum case, but
is used in other cases too.
Reported-by: 朱东海(启路) <donghai.zdh@alibaba-inc.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Stefan Hajnoczi [Wed, 15 Jul 2015 13:30:37 +0000 (14:30 +0100)]
rtl8139: skip offload on short Ethernet/IP header (CVE-2015-5165)
Transmit offload features access Ethernet and IP headers the packet. If
the packet is too short we must not attempt to access header fields:
int proto = be16_to_cpu(*(uint16_t *)(saved_buffer + 12));
...
eth_payload_data = saved_buffer + ETH_HLEN;
...
ip = (ip_header*)eth_payload_data;
if (IP_HEADER_VERSION(ip) != IP_HEADER_VERSION_4) {
Reported-by: 朱东海(启路) <donghai.zdh@alibaba-inc.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Stefan Hajnoczi [Wed, 15 Jul 2015 16:17:28 +0000 (17:17 +0100)]
rtl8139: drop tautologous if (ip) {...} statement (CVE-2015-5165)
The previous patch stopped using the ip pointer as an indicator that the
IP header is present. When we reach the if (ip) {...} statement we know
ip is always non-NULL.
Remove the if statement to reduce nesting.
Reported-by: 朱东海(启路) <donghai.zdh@alibaba-inc.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Stefan Hajnoczi [Wed, 15 Jul 2015 16:13:32 +0000 (17:13 +0100)]
rtl8139: avoid nested ifs in IP header parsing (CVE-2015-5165)
Transmit offload needs to parse packet headers. If header fields have
unexpected values the offload processing is skipped.
The code currently uses nested ifs because there is relatively little
input validation. The next patches will add missing input validation
and a goto label is more appropriate to avoid deep if statement nesting.
Reported-by: 朱东海(启路) <donghai.zdh@alibaba-inc.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Peter Maydell [Mon, 3 Aug 2015 10:44:07 +0000 (11:44 +0100)]
Merge remote-tracking branch 'remotes/aurel/tags/pull-tcg-mips-s390-
20150803' into staging
TCG MIPS and S390 fixes for 2.4.
# gpg: Signature made Mon Aug 3 09:09:59 2015 BST using RSA key ID
1DDD8C9B
# gpg: Good signature from "Aurelien Jarno <aurelien@aurel32.net>"
# gpg: aka "Aurelien Jarno <aurelien@jarno.fr>"
# gpg: aka "Aurelien Jarno <aurel32@debian.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 7746 2642 A9EF 94FD 0F77 196D BA9C 7806 1DDD 8C9B
* remotes/aurel/tags/pull-tcg-mips-s390-
20150803:
tcg/mips: fix add2
tcg/s390x: Mask TCGMemOp appropriately for indexing
tcg/mips: Mask TCGMemOp appropriately for indexing
tcg/mips: fix TLB loading for BE host with 32-bit guests
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Peter Maydell [Mon, 3 Aug 2015 09:44:23 +0000 (10:44 +0100)]
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Fri Jul 31 23:24:06 2015 BST using RSA key ID
AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB
# Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E
* remotes/jnsnow/tags/ide-pull-request:
ahci: fix ICC mask definition
macio: re-add TRIM support
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
SeokYeon Hwang [Fri, 31 Jul 2015 07:51:02 +0000 (16:51 +0900)]
sdb: removed redundant inbound funtion calls
Change-Id: I0b92232270167bf0aa30a8e5ff4f679b3641d465
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Fri, 31 Jul 2015 05:54:25 +0000 (14:54 +0900)]
emulator: cleaned some start-up logics up
Change-Id: I8cf17778ceddacf7f1b5ca6acc1aa5b894b99f2a
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Fri, 31 Jul 2015 05:29:16 +0000 (14:29 +0900)]
emulator: introduced "--qemu" argument
"--qemu" can be used by expert users. All args followed by "--qemu"
are passed to qemu directly.
So, we can use "help" using additional args "--qemu -help".
Change-Id: Ia2ae1a28a49b8d109906d0e240272bc50789fba2
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Aurelien Jarno [Fri, 31 Jul 2015 14:38:25 +0000 (16:38 +0200)]
tcg/mips: fix add2
The add2 code in the tcg_out_addsub2 function doesn't take into account
the case where rl == al == bl. In that case we can't compute the carry
after the addition. As it corresponds to a multiplication by 2, the
carry bit is the bit 31.
While this is a corner case, this prevents x86-64 guests to boot on a
MIPS host.
Cc: qemu-stable@nongnu.org
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Aurelien Jarno [Thu, 30 Jul 2015 20:13:26 +0000 (22:13 +0200)]
tcg/s390x: Mask TCGMemOp appropriately for indexing
Commit
2b7ec66f fixed TCGMemOp masking following the MO_AMASK addition,
but two cases were forgotten in the TCG S390 backend.
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Aurelien Jarno [Thu, 30 Jul 2015 20:11:51 +0000 (22:11 +0200)]
tcg/mips: Mask TCGMemOp appropriately for indexing
Commit
2b7ec66f fixed TCGMemOp masking following the MO_AMASK addition,
but two cases were forgotten in the TCG MIPS backend.
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Aurelien Jarno [Thu, 30 Jul 2015 21:39:34 +0000 (23:39 +0200)]
tcg/mips: fix TLB loading for BE host with 32-bit guests
For 32-bit guest, we load a 32-bit address from the TLB, so there is no
need to compensate for the low or high part. This fixes 32-bit guests on
big-endian hosts.
Cc: qemu-stable@nongnu.org
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
John Snow [Tue, 21 Jul 2015 18:02:01 +0000 (14:02 -0400)]
ahci: fix ICC mask definition
There are likely others that could be updated, but we'll
go with a light touch for 2.4 for now.
Without the Unsigned specifier, this shifts bits into the
signed bit, which makes clang unhappy and could cause
unwanted behavior.
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id:
1437501721-24495-1-git-send-email-jsnow@redhat.com