sdk/emulator/qemu.git
10 years agodisplay: add draw_image to maru_sdl 69/20169/1
GiWoong Kim [Thu, 24 Apr 2014 08:05:46 +0000 (17:05 +0900)]
display: add draw_image to maru_sdl

On Windows, the display off guide image can be rubbed out
from display surface when emulator window comes from outside
of host monitor bounds by dragging. So, to prevent this,
display should not stop the updating while window dragging.

Change-Id: If7de4b484014a9ac2b3476e2f548954117a15b8f
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
(cherry picked from commit 924bba3123c788a034578b691cfd8f25e85798e9)

10 years agoaudio/intel-hda: support FIFORDY 15/20115/1
Stanislav Vorobiov [Fri, 25 Apr 2014 08:39:33 +0000 (12:39 +0400)]
audio/intel-hda: support FIFORDY

linux kernel 3.12 has changed intel-hda
driver to always check for FIFORDY, this
causes long hangs in guest since QEMU
always has this bit set to 0. We now simply set
it to 1 always, since we're synchronous anyway
and always ready to receive the stream

Change-Id: I5bb3f36094e6c8b23a0338f31ff949d863c378ec
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
(cherry picked from commit 62c37a816010779308706bf69bfd897aedbdbf6d)

10 years agoMerge "build: some warnings treated as error on windows" into tizen_qemu_2.0
SeokYeon Hwang [Fri, 25 Apr 2014 02:02:56 +0000 (19:02 -0700)]
Merge "build: some warnings treated as error on windows" into tizen_qemu_2.0

10 years agoMerge "build: remove "implicit declaration of function" warnings" into tizen_qemu_2.0
SeokYeon Hwang [Fri, 25 Apr 2014 02:02:45 +0000 (19:02 -0700)]
Merge "build: remove "implicit declaration of function" warnings" into tizen_qemu_2.0

10 years agoMerge "hax: modify some codes for QEMU 2.0" into tizen_qemu_2.0
SeokYeon Hwang [Fri, 25 Apr 2014 02:02:35 +0000 (19:02 -0700)]
Merge "hax: modify some codes for QEMU 2.0" into tizen_qemu_2.0

10 years agobuild: fix invalid merge
SeokYeon Hwang [Thu, 24 Apr 2014 12:29:02 +0000 (21:29 +0900)]
build: fix invalid merge

Change-Id: I201f1ed69be602742e988ae8be513f2ff7ff96a5
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
10 years agoMerge "evdi,nfc: add checking if initialized" into tizen_qemu_2.0
SeokYeon Hwang [Thu, 24 Apr 2014 12:17:31 +0000 (05:17 -0700)]
Merge "evdi,nfc: add checking if initialized" into tizen_qemu_2.0

10 years agomaru: Change the device initialization routine.
jinhyung.jo [Wed, 16 Apr 2014 06:50:26 +0000 (15:50 +0900)]
maru: Change the device initialization routine.

Brightness, overlay and camera device can be added by option instead of forced initializing.
Remove unneccessary code, used to check devices(virtgl & camera)

Change-Id: Ie5cd5520ca17b7920342f6b2ae21e4c1f685c5e1
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
10 years agobrillcodec: remove init function
Kitae Kim [Mon, 14 Apr 2014 08:43:56 +0000 (17:43 +0900)]
brillcodec: remove init function

init fucntion of this device is called when qemu launched with codec-pci parameter.

Change-Id: I2cb155c5807d4f5e2637d756b18514d9dc2d70fa
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
Conflicts:
tizen/src/hw/maru_brill_codec.c

10 years agohwkey: Device init check routine was added. 12/20012/2
sungmin ha [Wed, 16 Apr 2014 10:09:30 +0000 (19:09 +0900)]
hwkey: Device init check routine was added.

Change-Id: Icc246b14dacb59d55a466ea6a5c282720f77fe07
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>
10 years agoemulator: modified touchscreen option
GiWoong Kim [Wed, 16 Apr 2014 11:58:01 +0000 (20:58 +0900)]
emulator: modified touchscreen option

added max_point deivce option for virtio touchscreen
remove -max-touch-point option

Change-Id: I32ff1b18d39c6c05364a5723ab68a0b9887fa047
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
Conflicts:
tizen/src/hw/maru_virtio_touchscreen.h

10 years agoevdi,nfc: add checking if initialized 11/20011/1
Munkyu Im [Thu, 17 Apr 2014 06:35:29 +0000 (15:35 +0900)]
evdi,nfc: add checking if initialized

It returns false if device is not initialized.

Change-Id: I1e96d6ebb9e14b11217232c129598767394ffd5e
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
(cherry picked from commit f48ac4136b3603f392ac2489afe5687440d371a0)

10 years agobuild: some warnings treated as error on windows 10/20010/1
SeokYeon Hwang [Thu, 24 Apr 2014 11:59:49 +0000 (20:59 +0900)]
build: some warnings treated as error on windows

Add next compiler options.
-Werror=implicit-function-declaration
-Werror=implicit-int

Change-Id: If6011e64b0844c92d80442f1e07adde77c2b4fa7
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
10 years agoMerge "build: add --disable-gtk option" into tizen_qemu_2.0
SeokYeon Hwang [Thu, 24 Apr 2014 11:31:59 +0000 (04:31 -0700)]
Merge "build: add --disable-gtk option" into tizen_qemu_2.0

10 years agobuild: remove "implicit declaration of function" warnings 09/20009/1
SeokYeon Hwang [Thu, 24 Apr 2014 11:27:02 +0000 (20:27 +0900)]
build: remove "implicit declaration of function" warnings

Change-Id: Iab0442523bad977a72834947753e9c47ba52f54f
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
10 years agohax: modify some codes for QEMU 2.0 89/19989/2
SeokYeon Hwang [Thu, 24 Apr 2014 07:47:57 +0000 (16:47 +0900)]
hax: modify some codes for QEMU 2.0

Change-Id: Ia434e1c4182dc817adf22c8f8d5b7044da0365f1
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
10 years agoemulator: clean-up "emulator.c" for "envp" 88/19988/1
SeokYeon Hwang [Thu, 24 Apr 2014 07:46:09 +0000 (16:46 +0900)]
emulator: clean-up "emulator.c" for "envp"

Change-Id: I8b5f97f2bb51d1e37164856589d2193ef5244738
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
10 years agoRevert "hax: modify some codes for QEMU 2.0"
SeokYeon Hwang [Thu, 24 Apr 2014 05:43:27 +0000 (14:43 +0900)]
Revert "hax: modify some codes for QEMU 2.0"

This reverts commit 92d5793f73c463576a17d6a281cf7b3c8804aea0.

10 years agoRevert "hax: fix compilation error"
SeokYeon Hwang [Thu, 24 Apr 2014 05:43:17 +0000 (14:43 +0900)]
Revert "hax: fix compilation error"

This reverts commit 3b574fcb46f69fc747426050746e31e43228f2e6.

10 years agobuild: add --disable-gtk option 73/19973/1
Kitae Kim [Thu, 24 Apr 2014 02:17:09 +0000 (11:17 +0900)]
build: add --disable-gtk option

Change-Id: I1651303404594c814adea5718c223270f5b73ac5
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
10 years agoMerge "booting: bypassing envp args from emulator main to qemu main" into tizen_qemu_2.0
SeokYeon Hwang [Thu, 24 Apr 2014 01:22:05 +0000 (18:22 -0700)]
Merge "booting: bypassing envp args from emulator main to qemu main" into tizen_qemu_2.0

10 years agoMerge "build: add CURL_LIBS in Makefile" into tizen_qemu_2.0
SeokYeon Hwang [Thu, 24 Apr 2014 01:17:00 +0000 (18:17 -0700)]
Merge "build: add CURL_LIBS in Makefile" into tizen_qemu_2.0

10 years agoMerge "misc: removed white space." into tizen_qemu_2.0
SeokYeon Hwang [Thu, 24 Apr 2014 01:16:34 +0000 (18:16 -0700)]
Merge "misc: removed white space." into tizen_qemu_2.0

10 years agomisc: removed white space. 71/19971/1
Jinhyung Choi [Thu, 24 Apr 2014 00:51:55 +0000 (09:51 +0900)]
misc: removed white space.

Change-Id: I7df994a0ac7383208e9648c790d5c1301305dfe3
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>
10 years agobuild: add CURL_LIBS in Makefile 50/19950/1
Kitae Kim [Wed, 23 Apr 2014 11:39:02 +0000 (20:39 +0900)]
build: add CURL_LIBS in Makefile

As CURL_LIBS variable has been created since qemu_2.0,
curl link has to be included in the Makefile to avoid link error.

Change-Id: I08df3015cc57fea44613f5e4b08eec42beefdda6
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
10 years agohax: fix compilation error 49/19949/1
Kitae Kim [Wed, 23 Apr 2014 11:36:17 +0000 (20:36 +0900)]
hax: fix compilation error

Remove spaces after back-slash on CPU_COMMON macro.

Change-Id: If9a9e16acda24d5bd8309662baa5e7f2f2ab71eb
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
10 years agobooting: bypassing envp args from emulator main to qemu main 47/19947/1
Jinhyung Choi [Wed, 23 Apr 2014 10:15:31 +0000 (19:15 +0900)]
booting: bypassing envp args from emulator main to qemu main

Change-Id: I5b55105531b21b28853faf4e4717b81efeb5e342
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>
10 years agohax: modify some codes for QEMU 2.0 44/19944/1
SeokYeon Hwang [Wed, 23 Apr 2014 09:37:56 +0000 (18:37 +0900)]
hax: modify some codes for QEMU 2.0

Change-Id: I512d7d7d4b2eca10e887edef41ae63c974a1c1f6
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
10 years agomaru_camera: Modified camera sources 34/19934/1
jinhyung.jo [Wed, 23 Apr 2014 06:43:53 +0000 (15:43 +0900)]
maru_camera: Modified camera sources

Add thread names and remove a wrong property.

Change-Id: I4c2ccde03980db5351d42e7b976809ac426c5375
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
10 years agoVirtGL: convert init/exit functions to realize/unrealize 32/19932/1
jinhyung.jo [Wed, 23 Apr 2014 06:40:28 +0000 (15:40 +0900)]
VirtGL: convert init/exit functions to realize/unrealize

Change-Id: I7f175f12dcd80ec023f40c48bb1c0d9b804fe137
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
10 years agonfc: Modify virtio init parameter 21/19921/1
Munkyu Im [Wed, 23 Apr 2014 06:05:39 +0000 (15:05 +0900)]
nfc: Modify virtio init parameter

Change-Id: I523c79cdb9159892902e7ca09f4962bb7c32f4d5
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
10 years agoMerge "device: changed class initialization for sensor, power, and jack devices"...
SeokYeon Hwang [Wed, 23 Apr 2014 06:00:08 +0000 (23:00 -0700)]
Merge "device: changed class initialization for sensor, power, and jack devices" into tizen_qemu_2.0

10 years agodevice: changed class initialization for sensor, power, and jack devices 20/19920/1
Jinhyung Choi [Wed, 23 Apr 2014 05:53:08 +0000 (14:53 +0900)]
device: changed class initialization for sensor, power, and jack devices

Change-Id: I831c88556f8e401b2d739fe9a06820f3b7ef04c6
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>
10 years agobuild: fix compilation error
SeokYeon Hwang [Wed, 23 Apr 2014 05:55:02 +0000 (14:55 +0900)]
build: fix compilation error

Change-Id: Ia499d29f24fbd8adec94d6cc72f04873fdf4a92e
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
10 years agonfc: Modify virtio device init/exit 17/19917/4
Munkyu Im [Wed, 23 Apr 2014 05:29:30 +0000 (14:29 +0900)]
nfc: Modify virtio device init/exit

Applied for qemu 2.0

Change-Id: Ia2b15b1941574741cd4e44ec035c3f6f27f57e89
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
10 years agoevdi: Modify virtio device init/exit 16/19916/2
Munkyu Im [Wed, 23 Apr 2014 05:29:03 +0000 (14:29 +0900)]
evdi: Modify virtio device init/exit

Applied for qemu 2.0

Change-Id: Ieecd65a91c1a5c03da6942ee0a2dc213bb7b759b
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
10 years agoesm: modify virtio device class init 15/19915/1
SeokYeon Hwang [Wed, 23 Apr 2014 04:54:24 +0000 (13:54 +0900)]
esm: modify virtio device class init

Change-Id: I493d7c89f1aefc5add3347195cdb5a0273e29e5c
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
10 years agoMerge "hwkey, keyboard: modified virtio device class init and exit" into tizen_qemu_2.0
SeokYeon Hwang [Wed, 23 Apr 2014 04:44:11 +0000 (21:44 -0700)]
Merge "hwkey, keyboard: modified virtio device class init and exit" into tizen_qemu_2.0

10 years agoMerge changes Ia3069af2,Id0e126b1 into tizen_qemu_2.0
SeokYeon Hwang [Wed, 23 Apr 2014 04:44:00 +0000 (21:44 -0700)]
Merge changes Ia3069af2,Id0e126b1 into tizen_qemu_2.0

* changes:
  communication: set skin server thread name
  touch: modified virtio device class init

10 years agocommunication: set skin server thread name 07/19907/1
GiWoong Kim [Wed, 23 Apr 2014 04:30:06 +0000 (13:30 +0900)]
communication: set skin server thread name

Change-Id: Ia3069af2638f6738ca34e1958a5ba128f4ab48e6
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
10 years agohwkey, keyboard: modified virtio device class init and exit 06/19906/1
sungmin ha [Wed, 23 Apr 2014 04:24:54 +0000 (13:24 +0900)]
hwkey, keyboard: modified virtio device class init and exit

Change-Id: Ia6aaaa06ca5cfb4e6e097de95d149f735e6e5e8a
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>
10 years agotouch: modified virtio device class init 05/19905/1
GiWoong Kim [Wed, 23 Apr 2014 04:10:56 +0000 (13:10 +0900)]
touch: modified virtio device class init

convert init to realize

Change-Id: Id0e126b133cb8db37a29b9acd80813c4c4729b35
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
10 years agobrillcodec: fix compilation error. 04/19904/1
Kitae Kim [Wed, 23 Apr 2014 02:21:09 +0000 (11:21 +0900)]
brillcodec: fix compilation error.

qemu_thread_create prototype is changed on 2.0 version

Change-Id: Id9776bc747c3bb645583bd2405db4e2d7bc11536
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
10 years agobuild: fix compilation error
SeokYeon Hwang [Wed, 23 Apr 2014 01:10:54 +0000 (10:10 +0900)]
build: fix compilation error

Some header file is renamed.
Some function prototype is modified.

Change-Id: I4100279f3366dac0f40a2319e0b933dd92398b34
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
10 years agokeyboard: Maru keyboard device handles key events directly 83/19883/1
GiWoong Kim [Tue, 22 Apr 2014 10:33:22 +0000 (19:33 +0900)]
keyboard: Maru keyboard device handles key events directly

Change-Id: I18050322c30003656ecb73f0819547821fd196ba
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
10 years agotouch: Maru touchscreen device handles touch events directly 63/19863/1
GiWoong Kim [Tue, 22 Apr 2014 07:53:47 +0000 (16:53 +0900)]
touch: Maru touchscreen device handles touch events directly

Change-Id: I40f4af19103e7a2add265f3bcefe1f62d03fa2b7
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
10 years agobuild: fix a invalid merge
SeokYeon Hwang [Mon, 21 Apr 2014 08:11:52 +0000 (17:11 +0900)]
build: fix a invalid merge

Change-Id: I505dd07f471c3f2f6a974f1e06df90997cb5a62e
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
10 years agovigs: fix compilation errors
SeokYeon Hwang [Mon, 21 Apr 2014 07:03:05 +0000 (16:03 +0900)]
vigs: fix compilation errors

1. Some qemu function prototype modification.
graphic_console_init()
qemu_thread_create()

2. A "work_queue.c" is moved to "vigs".

Change-Id: I066734b08bb8ad59aeb5afb67049065048bcdd63
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
10 years agoMerge branch 'upstream_qemu_2.0' into tizen
SeokYeon Hwang [Mon, 21 Apr 2014 06:32:27 +0000 (15:32 +0900)]
Merge branch 'upstream_qemu_2.0' into tizen

Initial merge

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Conflicts:
.gitignore
Makefile.target
block/raw-win32.c
configure
cpu-exec.c
cpus.c
hw/9pfs/virtio-9p-device.c
hw/i386/pc_piix.c
include/exec/cpu-defs.h
include/qemu-common.h
include/sysemu/sysemu.h
include/ui/console.h
tcg/i386/tcg-target.c
tcg/tcg.h
ui/console.c
ui/input.c
util/oslib-posix.c
vl.c

Change-Id: I52df9052942eea8d541bde75fd936e58a9f2f8ff

10 years agoUpdate version for v2.0.0 release
Peter Maydell [Thu, 17 Apr 2014 12:41:45 +0000 (13:41 +0100)]
Update version for v2.0.0 release

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
10 years agoYaGL: Fix transport separate short command skip bug 51/19751/1
Stanislav Vorobiov [Thu, 17 Apr 2014 08:28:36 +0000 (12:28 +0400)]
YaGL: Fix transport separate short command skip bug

Separate short commands (1 unit long) could be skipped due
to incorrect check, this is now fixed

Change-Id: I8736abb171e35563580407a25cdffadfc589ed18
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
10 years agoMerge "package: version up" into tizen
SeokYeon Hwang [Thu, 17 Apr 2014 06:18:58 +0000 (23:18 -0700)]
Merge "package: version up" into tizen

10 years agoMerge "display: do not call qemu_ds_sdl_update directly" into tizen
SeokYeon Hwang [Thu, 17 Apr 2014 06:18:41 +0000 (23:18 -0700)]
Merge "display: do not call qemu_ds_sdl_update directly" into tizen

10 years agoMerge "VIGS: Add framebuffer and temporary texture pool" into tizen
SeokYeon Hwang [Thu, 17 Apr 2014 06:18:11 +0000 (23:18 -0700)]
Merge "VIGS: Add framebuffer and temporary texture pool" into tizen

10 years agopackage: version up 75/19675/1
GiWoong Kim [Thu, 17 Apr 2014 05:34:21 +0000 (14:34 +0900)]
package: version up

1.7.35

Change-Id: I62d0e8dc3dd31955a2bb30f9e4db5dc24efe2f1b
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
10 years agodisplay: do not call qemu_ds_sdl_update directly 74/19674/1
GiWoong Kim [Thu, 17 Apr 2014 05:20:22 +0000 (14:20 +0900)]
display: do not call qemu_ds_sdl_update directly

qemu_update should be synchronized with hw_update.
Otherwise, image processing like a brightness compositing
can be multiple overlapped on display surface.

Change-Id: Icab65289a6f279b3e61b045319cb02383af591e2
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
10 years agoSENSOR: bug fixed to set gyroscope & light 76/19576/2
Jinhyung Choi [Wed, 16 Apr 2014 02:46:02 +0000 (11:46 +0900)]
SENSOR: bug fixed to set gyroscope & light

Change-Id: I6549f8432ad6b0c7aac80de6120555fce9d2a2df
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>
10 years agoVIGS: Add framebuffer and temporary texture pool 68/19568/1
Stanislav Vorobiov [Tue, 15 Apr 2014 11:24:31 +0000 (15:24 +0400)]
VIGS: Add framebuffer and temporary texture pool

In order not to waste host GPU resources we now
have 2 OpenGL object pools - for temporary textures
and for framebuffers. These used to be allocated for
every surface, but now we allocate only one object
per distinct format, i.e. one
object per (width, height, format) tuple

Change-Id: Ie63e571045a2477043e8e08da3a50765523e54fc
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
10 years agoMerge "timer: fix qemu_poll_ns early timeout on windows" into tizen
SeokYeon Hwang [Tue, 15 Apr 2014 05:42:18 +0000 (22:42 -0700)]
Merge "timer: fix qemu_poll_ns early timeout on windows" into tizen

10 years agoMerge "display: Add dirty flag for display" into tizen
SeokYeon Hwang [Tue, 15 Apr 2014 02:07:27 +0000 (19:07 -0700)]
Merge "display: Add dirty flag for display" into tizen

10 years agoMerge "ecs : ecs log change to emulator log" into tizen
SeokYeon Hwang [Tue, 15 Apr 2014 02:06:22 +0000 (19:06 -0700)]
Merge "ecs : ecs log change to emulator log" into tizen

10 years agoUpdate version for v2.0.0-rc3 release
Peter Maydell [Mon, 14 Apr 2014 16:45:11 +0000 (17:45 +0100)]
Update version for v2.0.0-rc3 release

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
10 years agoRevert "fix return check for KVM_GET_DIRTY_LOG ioctl"
Michael Tokarev [Mon, 14 Apr 2014 12:14:04 +0000 (16:14 +0400)]
Revert "fix return check for KVM_GET_DIRTY_LOG ioctl"

This reverts commit b533f658a98325d0e47b36113bd9f5bcc046fdae.

The original code was wrong, because effectively it ignored errors
from kernel, because kernel does not return -1 on error case but
returns -errno, and does not return -EPERM for this particular ioctl.
But in some cases kernel actually returned unsuccessful result,
namely, when the dirty bitmap in requested slot does not exist
it returns -ENOENT.  With new code this condition becomes an
error when it shouldn't be.

Revert that patch instead of fixing it properly this late in the
release process.  I disagree with this approach, but let's make
things move _somewhere_, instead of arguing endlessly whch of
the 2 proposed fixes is better.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Message-id: 1397477644-902-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
10 years agoMerge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
Peter Maydell [Mon, 14 Apr 2014 13:02:12 +0000 (14:02 +0100)]
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

acpi: SSDT update

This has a fix by Igor for a regression introduced by
bridge hotplug code.
Expected test files were updated accordingly.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Mon 14 Apr 2014 13:13:35 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:
  acpi-test: update expected files
  acpi: fix incorrect encoding for 0x{F-1}FFFF

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
10 years agoide: Correct improper smart self test counter reset in ide core.
Benoît Canet [Sat, 12 Apr 2014 20:59:50 +0000 (22:59 +0200)]
ide: Correct improper smart self test counter reset in ide core.

The SMART self test counter was incorrectly being reset to zero,
not 1. This had the effect that on every 21st SMART EXECUTE OFFLINE:
 * We would write off the beginning of a dynamically allocated buffer
 * We forgot the SMART history
Fix this.

Signed-off-by: Benoit Canet <benoit@irqsave.net>
Message-id: 1397336390-24664-1-git-send-email-benoit.canet@irqsave.net
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Cc: qemu-stable@nongnu.org
Acked-by: Kevin Wolf <kwolf@redhat.com>
[PMM: tweaked commit message as per suggestions from Markus]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
10 years agoacpi-test: update expected files
Michael S. Tsirkin [Mon, 14 Apr 2014 12:08:37 +0000 (15:08 +0300)]
acpi-test: update expected files

commit 58b035c7354afc0c5351ea62264c01d74196ec26
    acpi: fix incorrect encoding for 0x{F-1}FFFF
changes the SSDT, update expected files accordingly.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
10 years agoacpi: fix incorrect encoding for 0x{F-1}FFFF
Igor Mammedov [Sun, 13 Apr 2014 21:55:51 +0000 (23:55 +0200)]
acpi: fix incorrect encoding for 0x{F-1}FFFF

Fix typo in build_append_int() which causes integer
truncation when it's in range 0x{F-1}FFFF by packing it
as WordConst instead of required DWordConst.

In partucular this fixes a regression: hotplug in slots 16,17,18 and 19
didn't work, since SSDT had code like this:

                If (And (Arg0, 0x0000))
                {
                    Notify (S80, Arg1)
                }

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
10 years agoconfigure: Make stack-protector test check both compile and link
Peter Maydell [Fri, 11 Apr 2014 16:13:52 +0000 (17:13 +0100)]
configure: Make stack-protector test check both compile and link

Since we use the -fstack-protector argument at both compile and
link time in the build, we must check that it works with both
a compile and a link:
 * MacOSX only fails in the compile step, not linking
 * some gcc cross environments only fail at the link stage (if they
   require a libssp and it's not present for some reason)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1397232832-32301-1-git-send-email-peter.maydell@linaro.org
Tested-by: Alexey Kardashevskiy <aik@ozlabs.ru>
10 years agovmxnet3: validate queues configuration read on migration
Dmitry Fleytman [Fri, 4 Apr 2014 09:45:22 +0000 (12:45 +0300)]
vmxnet3: validate queues configuration read on migration

CVE-2013-4544

Signed-off-by: Dmitry Fleytman <dmitry@daynix.com>
Reported-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-id: 1396604722-11902-5-git-send-email-dmitry@daynix.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
10 years agovmxnet3: validate interrupt indices read on migration
Dmitry Fleytman [Fri, 4 Apr 2014 09:45:21 +0000 (12:45 +0300)]
vmxnet3: validate interrupt indices read on migration

CVE-2013-4544

Signed-off-by: Dmitry Fleytman <dmitry@daynix.com>
Reported-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-id: 1396604722-11902-4-git-send-email-dmitry@daynix.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
10 years agovmxnet3: validate queues configuration coming from guest
Dmitry Fleytman [Fri, 4 Apr 2014 09:45:20 +0000 (12:45 +0300)]
vmxnet3: validate queues configuration coming from guest

CVE-2013-4544

Signed-off-by: Dmitry Fleytman <dmitry@daynix.com>
Reported-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-id: 1396604722-11902-3-git-send-email-dmitry@daynix.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
10 years agovmxnet3: validate interrupt indices coming from guest
Dmitry Fleytman [Fri, 4 Apr 2014 09:45:19 +0000 (12:45 +0300)]
vmxnet3: validate interrupt indices coming from guest

CVE-2013-4544

Signed-off-by: Dmitry Fleytman <dmitry@daynix.com>
Reported-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-id: 1396604722-11902-2-git-send-email-dmitry@daynix.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
10 years agodisplay: Add dirty flag for display 84/19484/2
GiWoong Kim [Fri, 11 Apr 2014 07:01:58 +0000 (16:01 +0900)]
display: Add dirty flag for display

At idle screen moment, there is no need to copy framebuffers
to the display.

Change-Id: I4006e5732de947ce1617161182ca901b179c9423
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
10 years agoMerge changes I1b071d12,I55ce8eab into tizen
SeokYeon Hwang [Mon, 14 Apr 2014 07:12:14 +0000 (00:12 -0700)]
Merge changes I1b071d12,I55ce8eab into tizen

* changes:
  build: add enable-curl option
  package: version up

10 years agoecs : ecs log change to emulator log 30/19330/3
haken kim [Thu, 10 Apr 2014 10:32:51 +0000 (19:32 +0900)]
ecs : ecs log change to emulator log

Change-Id: I9bc28ff56764037a5045e3e6b1b6d55ad5a38332
Signed-off-by: haken kim <haken.kim@samsung.com>
10 years agotimer: fix qemu_poll_ns early timeout on windows 14/19414/2
Sangho Park [Fri, 11 Apr 2014 08:50:52 +0000 (12:50 +0400)]
timer: fix qemu_poll_ns early timeout on windows

g_poll has a problem on windows when using
timeouts < 10ms, in glib/gpoll.c:

/* If not, and we have a significant timeout, poll again with
 * timeout then. Note that this will return indication for only
 * one event, or only for messages. We ignore timeouts less than
 * ten milliseconds as they are mostly pointless on Windows, the
 * MsgWaitForMultipleObjectsEx() call will timeout right away
 * anyway.
 */
if (retval == 0 && (timeout == INFINITE || timeout >= 10))
  retval = poll_rest (poll_msgs, handles, nhandles, fds, nfds, timeout);

so whenever g_poll is called with timeout < 10ms it does
a quick poll instead of wait, this causes significant performance
degradation of qemu, thus we should use WaitForMultipleObjectsEx
directly

Change-Id: I95c7be6a57b9458e5ff2b82605aa5d7c4b6d303b
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
10 years agoqom: Fix crash with qom-list and link properties
Cole Robinson [Thu, 10 Apr 2014 18:47:38 +0000 (14:47 -0400)]
qom: Fix crash with qom-list and link properties

Commit 9561fda8d90e176bef598ba87c42a1bd6ad03ef7 changed the type of
'opaque' for link properties, but missed updating this call site.
Reproducer:

./x86_64-softmmu/qemu-system-x86_64 -qmp unix:./qmp.sock,server &
./scripts/qmp/qmp-shell ./qmp.sock
(QEMU) qom-list path=//machine/i440fx/pci.0/child[2]

Reported-by: Marcin Gibuła <m.gibula@beyond.pl>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
Message-id: 2f8f007ce2152ac3b65f0811199662799c509225.1397155389.git.crobinso@redhat.com
Acked-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
10 years agovirtio-net: fix guest-triggerable buffer overrun
Michael S. Tsirkin [Fri, 11 Apr 2014 12:18:08 +0000 (15:18 +0300)]
virtio-net: fix guest-triggerable buffer overrun

When VM guest programs multicast addresses for
a virtio net card, it supplies a 32 bit
entries counter for the number of addresses.
These addresses are read into tail portion of
a fixed macs array which has size MAC_TABLE_ENTRIES,
at offset equal to in_use.

To avoid overflow of this array by guest, qemu attempts
to test the size as follows:
-    if (in_use + mac_data.entries <= MAC_TABLE_ENTRIES) {

however, as mac_data.entries is uint32_t, this sum
can overflow, e.g. if in_use is 1 and mac_data.entries
is 0xffffffff then in_use + mac_data.entries will be 0.

Qemu will then read guest supplied buffer into this
memory, overflowing buffer on heap.

CVE-2014-0150

Cc: qemu-stable@nongnu.org
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Message-id: 1397218574-25058-1-git-send-email-mst@redhat.com
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
10 years agoMerge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Peter Maydell [Fri, 11 Apr 2014 13:07:24 +0000 (14:07 +0100)]
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block patches for 2.0.0-rc3

# gpg: Signature made Fri 11 Apr 2014 13:37:34 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"

* remotes/kevin/tags/for-upstream:
  block-commit: speed is an optional parameter
  iscsi: Remember to set ret for iscsi_open in error case
  bochs: Fix catalog size check
  bochs: Fix memory leak in bochs_open() error path

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
10 years agoMerge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-1' into staging
Peter Maydell [Fri, 11 Apr 2014 12:51:15 +0000 (13:51 +0100)]
Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-1' into staging

sdl2 relative mouse mode fixes.

# gpg: Signature made Fri 11 Apr 2014 11:36:46 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-sdl-1:
  input: sdl2: Fix relative mode to match SDL1 behavior
  input: sdl2: Fix guest_cursor logic

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
10 years agoblock-commit: speed is an optional parameter
Max Reitz [Thu, 10 Apr 2014 17:36:25 +0000 (19:36 +0200)]
block-commit: speed is an optional parameter

As speed is an optional parameter for the QMP block-commit command, it
should be set to 0 if not given (as it is undefined if has_speed is
false), that is, the speed should not be limited.

Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
10 years agoiscsi: Remember to set ret for iscsi_open in error case
Fam Zheng [Thu, 10 Apr 2014 01:33:55 +0000 (09:33 +0800)]
iscsi: Remember to set ret for iscsi_open in error case

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
10 years agobochs: Fix catalog size check
Kevin Wolf [Wed, 9 Apr 2014 10:10:34 +0000 (12:10 +0200)]
bochs: Fix catalog size check

The old check was off by a factor of 512 and didn't consider cases where
we don't get an exact division. This could lead to an out-of-bounds
array access in seek_to_sector().

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
10 years agobochs: Fix memory leak in bochs_open() error path
Kevin Wolf [Wed, 9 Apr 2014 09:19:04 +0000 (11:19 +0200)]
bochs: Fix memory leak in bochs_open() error path

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
10 years agoinput: sdl2: Fix relative mode to match SDL1 behavior
Cole Robinson [Tue, 1 Apr 2014 20:37:11 +0000 (16:37 -0400)]
input: sdl2: Fix relative mode to match SDL1 behavior

Right now relative mode accelerates too fast, and has the 'invisible wall'
problem. SDL2 added an explicit API to handle this use case, so let's use
it.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
10 years agoinput: sdl2: Fix guest_cursor logic
Cole Robinson [Tue, 1 Apr 2014 20:37:10 +0000 (16:37 -0400)]
input: sdl2: Fix guest_cursor logic

Unbreaks relative mouse mode with sdl2, just like was done with sdl.c
in c3aa84b6.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
10 years agobuild: add enable-curl option 82/19482/1
Kitae Kim [Fri, 11 Apr 2014 09:58:24 +0000 (18:58 +0900)]
build: add enable-curl option

libcurl is used for osutil. It has to be checked at configure time.

Change-Id: I1b071d129b394a4edd57f6e86a71f6e82e2f611f
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
10 years agocommunication: modified hb signal period 59/19359/1
GiWoong Kim [Wed, 9 Apr 2014 05:48:59 +0000 (14:48 +0900)]
communication: modified hb signal period

The initial period of HB signal needs a bit tuning
in case of low performance machine.

Change-Id: I08274b7ea6526aea9d356e5474bd0aa08236922a
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
10 years agopackage: version up 61/19361/1
Kitae Kim [Fri, 11 Apr 2014 06:12:37 +0000 (15:12 +0900)]
package: version up

1.7.34

Change-Id: I55ce8eaba4cdb53a1f6dbf9323e5336e6e57a5ae
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
10 years agoMerge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
Peter Maydell [Thu, 10 Apr 2014 22:07:55 +0000 (23:07 +0100)]
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

acpi: DSDT update

Two fixes here:
- Test fix to avoid warning with make check.
- Hex file update so people building QEMU
  without installing iasl get exactly the same ACPI
  as with.

Both should help avoid user confusion.

As it's very easy to check that the produced ACPI
binary didn't change, I think these are very low risk.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Thu 10 Apr 2014 17:09:43 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:
  acpi: update generated hex files
  tests/acpi: update expected DSDT files

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
10 years agoconfigure: use do_cc when checking for -fstack-protector support
Peter Maydell [Wed, 9 Apr 2014 11:04:47 +0000 (12:04 +0100)]
configure: use do_cc when checking for -fstack-protector support

MacOSX clang silently swallows unrecognized -f options when doing a link
with '-framework' also on the command line, so to detect support for
the various -fstack-protector options we must do a plain .c to .o compile,
not a complete compile-and-link.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-id: 1397041487-28477-1-git-send-email-peter.maydell@linaro.org

10 years agoacpi: update generated hex files
Michael S. Tsirkin [Thu, 10 Apr 2014 16:03:18 +0000 (19:03 +0300)]
acpi: update generated hex files

commit f2ccc311df55ec026a8f8ea9df998f26314f22b2
    dsdt: tweak ACPI ID for hotplug resource device
changes the DSDT, update hex files to match

Otherwise the fix is only effective if QEMU is built
with iasl.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
10 years agopackage: version up 92/19292/1
GiWoong Kim [Thu, 10 Apr 2014 05:16:28 +0000 (14:16 +0900)]
package: version up

1.7.33

Change-Id: I6218a3e6b132ddd744888293a00aa8bdaabe5e77
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
10 years agoemulator: add kernel parameter 91/19291/2
GiWoong Kim [Thu, 10 Apr 2014 03:44:18 +0000 (12:44 +0900)]
emulator: add kernel parameter

In some cases, guest needs VM resolution value.
(e.g. touchscreen driver, model-config.xml)
In order to read that values from host easily,
I added resolution parameters for kernel.

Change-Id: I615ec909e517e2628cc727ec77d7d86a18d0c8c8
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
10 years agotests/acpi: update expected DSDT files
Michael S. Tsirkin [Wed, 9 Apr 2014 14:47:07 +0000 (17:47 +0300)]
tests/acpi: update expected DSDT files

commit f2ccc311df55ec026a8f8ea9df998f26314f22b2
    dsdt: tweak ACPI ID for hotplug resource device
changes the DSDT, update test expected files to match

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reported-by: Igor Mammedov <imammedo@redhat.com>
10 years agopackage : version up 31/19231/1
haken kim [Wed, 9 Apr 2014 06:55:11 +0000 (15:55 +0900)]
package : version up

1.7.32

Change-Id: I5024f5387e68792d6f97a99a1f03c5861cb26488
Signed-off-by: haken kim <haken.kim@samsung.com>
10 years agoMerge "skin: using sensor device" into tizen
SeokYeon Hwang [Wed, 9 Apr 2014 06:30:05 +0000 (23:30 -0700)]
Merge "skin: using sensor device" into tizen

10 years agoUpdate version for v2.0.0-rc2 release
Peter Maydell [Tue, 8 Apr 2014 17:52:06 +0000 (18:52 +0100)]
Update version for v2.0.0-rc2 release

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
10 years agohw/pci-host/prep: Don't reverse IO accesses on bigendian hosts
Peter Maydell [Tue, 8 Apr 2014 15:51:11 +0000 (16:51 +0100)]
hw/pci-host/prep: Don't reverse IO accesses on bigendian hosts

The raven_io_read() and raven_io_write() functions pass and
return values in little-endian format (since the IO op struct
is marked DEVICE_LITTLE_ENDIAN); however they were storing the
values in the buffer to pass to address_space_read/write()
in host-endian order, which meant that on big-endian hosts
the values were inadvertently reversed. Use the *_le_p()
accessors instead so that we are consistent regardless of
host endianness.

Strictly speaking the byte order of the buffer for
address_space_rw() is target byte order (which for PPC
will be BE) but it doesn't actually matter as long as we
are consistent about the marking on the IO op struct and
which stl_*_p().

This bug was probably introduced due to confusion caused by
the two different versions of ldl_p() and friends:
 bswap.h defines versions meaning "host endianness access"
 cpu-all.h defines versions meaning "target endianness access"
As a target-independent source file prep.c gets the bswap.h
versions; the very similar looking code in ioport.c is
compiled per-target and gets the cpu-all.h versions.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1396972271-22660-1-git-send-email-peter.maydell@linaro.org
Reviewed-by: Richard Henderson <rth@twiddle.net>
10 years agoMerge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
Peter Maydell [Tue, 8 Apr 2014 12:59:28 +0000 (13:59 +0100)]
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

acpi bug fix

Here is a single last minute fix for 2.0

This changes the HID of the container used to claim
resources for CPU hotplug.
As a result, windows XP SP3 no longer brings up
an annoying "found new hardware" wizard on boot.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Tue 08 Apr 2014 13:23:30 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:
  dsdt: tweak ACPI ID for hotplug resource device

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