camera: modified camera win32 header to build on mingw-w64

Change-Id: Ibcc63a762438f5492eb0445ce5cbca9438b8ddc4
Signed-off-by: Sungmin Ha <sungmin82.ha@samsung.com>

os-win32.h: Suppress warning -Wredundant-decls

"time.h" in some distributions aleady has gmtime_r(), localtime_r()
as a real function prototype (not a macro). So we should suppress
warning "-Wredundnat-decls" for them.

Change-Id: I8b2764d5c6d1b136b2a3dcc862d52b785d8a5855
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

configure: fixed logic when "--enable-error" is specified

If "--enable-error" is specified, "configure" had not tried to set
CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE.
To fixed this problem "configure" should skip setting "werror" only.

Change-Id: I6d204ca25d242aa8b2e9c12fd8f1f1f85dcad9f4
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

keyboard, tablet: modified device names to prevent duplication from qemu 2.4

Change-Id: I16e9a0ae6ea0bea39008b4de0b9bd15b2abf66a2
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>

Makefile: Some files should be removed when cleaning

Source files generated by moc and rcc should be removed when
user runs 'make clean'.

Change-Id: I376f21ccc3f53760ee38d445ce0d4b65c2a9731b
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

configure: "CROSS_PREFIX" is introduced for cross-compiling

If "CROSS_PREFIX" or "--cross-prefix" is provided, "emulator_configure.sh"
prepare cross-compiling environments.
Applied "--static-libgcc" and "--static-libstdc++" for static linking
compiler libraries.

Change-Id: Id095e43eb00cffdfe635d1cec404549b364c5940
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

hax: used proper format for printing special types

Change-Id: I38366f99fc6162ac41964b6186e463922d448e32
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

yagl: for cross-compiling, header name should be case-sensitive

Change-Id: I4b679792cbf374ba6cbf7d918669df4c2895c03a
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Revert "timer: fix qemu_poll_ns early timeout on windows"

This reverts commit b611841324d3d95b8f0adbaf22a27d53cd83b858.
Same commit applied in upstream in diffent way as a
commit 5a007547df76446ab891df93ebc55749716609bf.

Change-Id: I6eedc7f56f3a1f6ef79e39f1b47acf74cd6bdf92
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

acpi: avoid potential uninitialized access to cpu_hp_io_base

When building QEMU with Mingw64 toolchain I see a warning

 CC    x86_64-softmmu/hw/i386/acpi-build.o
  hw/i386/acpi-build.c: In function 'acpi_build':
  hw/i386/acpi-build.c:1138:9: warning: 'pm.cpu_hp_io_base' may be used uninitialized in this function [-Wmaybe-uninitialized]
           aml_append(crs,
           ^
  hw/i386/acpi-build.c:1666:16: note: 'pm.cpu_hp_io_base' was declared here
       AcpiPmInfo pm;
                  ^

In acpi_get_pm_info() some of the fields are pre-initialized
to 0, but this one was missed.

Change-Id: If97318a12da70f9c5dc951e938897d21d57a2d77
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>

hax: some API that HAX used are modified

Change-Id: I81c401172ce9b00d29d5dd565dced1130fa88dbd
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

configure: removed default x11_libs value

"x11_libs" should be filled by proving process.

Change-Id: Ie17768d8163e8d7b82e792a74eee81ffbfd34c40
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

configure: updated flag macosx-version-min to 10.7

Since QEMU 2.3, it needs __thread supported compiler.
So, we should update flag macosx-version-min to 10.7 because MacOS
version under 10.6 did not support __thread specifier.

Some APIs that is used by VIGS/YaGL and coreaudio are deprecated
on MacOS 10.7. So, for now, we passed "-Wno-error=deprecated-declarations"
to compiler.

Change-Id: I6f6efce061a3758330e6d0f1eb3c0823e1d5a8d6
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

merge: git auto-merge had missed ram_size setting

Change-Id: I86c5283d67f2c038b0a19c8c5cac7063ddc28dd0
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

ecs: "ecs_mon" complied with the qemu 2.4

Change-Id: Ic826653f27797a067e38e4e1ce4014ac8a3c547a
Signed-off-by: ChulHo Song <ch81.song@samsung.com>

qmp: modify return type

- primitive type is not supported as return value.
  so make structure.
- remove unused command

Change-Id: I5e0a309f2cd31623bff89b9c45a067bec90139c4
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>

upstream: winwave backend is deprecated in Windows

Change-Id: I9202609e95f538fba0714f7d22c17cea47e74902
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

build: Qt5 frontend needs X11 on linux

Change-Id: I486107e9462cae57948ffc3d0dbb4779a7185f5a
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

upstream: virtio device used 'realize' instead of 'init'

Virtio device should use 'realize'ed initialization.
Removed duplicate properties.

Change-Id: I019185bed12f6c9cdacb72864191f7f667d6784f
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

upstream: PC board is updated

Change-Id: I46932542a3f57c80db52e3a89adc1e52093de6a4
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

upstream: some API was renamed and renewed

Change-Id: I6ec4c1eb026574b8a2ac96bdb128e84145aa16af
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

console: ENODEV needs "errno.h"

Change-Id: I82de49377e569492cfa428d80dfcbd5666476a1f
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

configure: quorum is deprecated

Change-Id: Icb61917b9702b59dc480994f42ef7bc3cb0f3ba3
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

smm: hax can not support SMM

Change-Id: Iec531e74c02741f6be5a263e5ff6f241bdc40d26
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

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>

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>

package: version up

version update to 2.2.44

Change-Id: I0fe6bfe3fa882fa07961dd38062b428d3f49c5f6
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

Merge branch 'tizen_2.4_develop' into tizen_3.0_develop

Change-Id: I6753087cb299be5eb2b17c2ed256786021a4a27d
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

menu: get drive/swap image path from emul_state

Change-Id: I5365501c148a0f0fda26ecc3d4244673be4786f0
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

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>

emul_state: freed memories those are allocated in runtime

Change-Id: I5546cd3f680dc5b253a05235228ed60fbd6f00e5
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

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>

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>

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>

package: version up

2.2.43

Change-Id: I0fa742321175c3a74d4529ad8a871937f947b7dd
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

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>

configure: we can specify WINVER on mingw now

Change-Id: I8f1ee0b2d4486c784c86c4eb20a40f54bbeadd8c
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

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>

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>

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>

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>

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>

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>

menu: disable Telnet Port table item on Detailed Info dialog

Change-Id: I6ea4d7a2194d9008a4fbf309cf37074a76033313
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

emul_state: provide RAM size using ram_size global variable

Change-Id: I41b775176d1fc8d0f75d9490dc48c9ba23c7ecfc
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

configure: cleaned-up "configure" file

Change-Id: I01598f239ca61655f7deddfcba8e5124ab219ffa

Makefile: removed "check-*" build scripts

Change-Id: Ie06812e07a41c29cd767c38e6b2217558b377921
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

nfc: changed pthread_mutex to qemu_mutex

Change-Id: If84dad8e9c092983cc14fc2c181e1d2bcee87d68
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>

evdi: changed pthread_mutex to qemu_mutex

Change-Id: If6423e9ceda8b1a9184aaaf3534cf6dae0639aa3
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>

Update version for v2.4.0 release

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Merge branch 'tizen_2.4_develop' into tizen_3.0_develop

Change-Id: Ibe175099ae8f1db0d5b48bb61e13efc72340282a
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

menu: enable DPI information on Detailed Info dialog

Change-Id: Iac6747b33a6a27ccc571a71b90186a1340e24706
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

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>

qt5: introduced pixel density for informing hw spec

Change-Id: I593a033512c37c2cd87a217515b7ca3614e8390b
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

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>

qt5: respect QemuConsole and DisplaySurface

Change-Id: I5ae832a2ab72ab3f49aa791ba557430d2a2ab7c6
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

emul_state: cleaned-up display resolution state management

Change-Id: Ic8a8169e8e7e8f328488d2a67d149f0ded2d338a
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

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>

spice: added explicitly spice macro

Change-Id: I0189099061e300292477bd94227e3843c8615990
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>

build: package version up (2.2.42)

Change-Id: Idaf3594fa3091f8d5eb55a56c47b03c56dc3e0ba
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>

ui: add "profile" parameter for control panel

Change-Id: I13baa938e26de52b6afe54e7774318c7563ae9dd
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>

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>

package: version up

2.2.41

Change-Id: I0b59f073f0ba22f29f6d90f1aae30d718874362c
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

build: removed supplements support in Makefile

Change-Id: I318fe9b1033ab5fd43fa3ee46290c6c7bc6c2f75
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

device_hotplug: supported various image type sdcard

Change-Id: I73a55db82a84a5eadf973e59a5cb86e85c6801f3
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

error_handler: removed deprecated functions

Change-Id: I7c4889f6d81c944589fc34f29bed278501358bc2
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

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>

build: align the build scripts' tabs to spaces

Change-Id: Idabd044189eaf9790ec20cbcf9714fcf127a38eb
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

Update version for v2.4.0-rc4 release

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

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>

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>

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>

package: version up

version update to 2.2.42

Change-Id: I794da1d545e68d04ccbeca316db2c9d5d4cdc701
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

controller: schedules controller object for deletion

use deleteLater() on close event handler

Change-Id: Ic9bd78f3e333174a3e9d580108ab2a35ac68cd9b
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

build: fixed dest dir of emulator binary on DIBS

Change-Id: I4a9d55ceee3bf9f15426827bb0f1c59c040cd21d
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

emulator: shutdown_qemu_gracefully() moved to emulator.c

Change-Id: Ic9c1e92e24709896eea96f203f49f714e4ebdd93
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

package: version up

version update to 2.2.41

Change-Id: Id90f8c255d42e4883d8e6baf515cc4861ddba21a
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

package: modify platform version 2.4 -> 3.0

Change-Id: I087532655c4d05507b85f5c7bb0bdb866dde5db2
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

configure: add "-mwindows" when qt is enabled on windows

Change-Id: I5ba4f0ce3f115c55cd9e0747326099a97eab1395
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

skin: add wearableO-360x360-2btn skin resource for QT GUI

Change-Id: Ia318bfe3c0787280a5a01f016cea75a36c612a7d
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

skin: add wearableO-360x360-2btn skin resource for SWT GUI

Change-Id: Ic5cf78e319a1c311170b711d016083fa6d2dd8d3
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

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>

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>

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>

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>

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>

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>

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

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>

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>

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>

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>

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>

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>

emulator: cleaned common codes up

Change-Id: Ia6b6ba6094233d743ab15f6d2257e14f489e31d0
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

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>

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>

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>

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>

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>