sdk/emulator/qemu.git
8 years agoaudio: support audio hot-plug event for Windows
Byeongki Shin [Tue, 23 Feb 2016 06:27:04 +0000 (15:27 +0900)]
audio: support audio hot-plug event for Windows

Because dsound audio doesn't support audio endpoint event,
it has failed to initialize without speaker or mic connection.
Now, dsound supports audio endpoint event.
Therefore, emulator can play sound
even if a speaker is connected to host lately.

- Because the COM initialization requires for each thread,
  in order to share the object, a thread is used as init and event handler.
- When event occurs, the notification callback sends it to init thread.
  If we handle the event in notification callback, it would make deadlock.

Change-Id: Iaeef62d6c5b0952f77f0040abea9bfc7778be536
Signed-off-by: Byeongki Shin <bk0121.shin@samsung.com>
8 years agomaru-tablet: fix unexpected shutdown issue
Jinhyung Jo [Thu, 3 Mar 2016 09:07:02 +0000 (18:07 +0900)]
maru-tablet: fix unexpected shutdown issue

If a user uses this device to hard, the emulator dies unexpectedly.
Its reason is to use the virtio queue.
The tablet device accesses the queue that is not prepared
and then releases it.
Fix the issue and refactoring the code.
 - improve the use of the virtio queue
 - remove unused structure & variables
 - pthread mutex to qemu mutex
 - remove unnecessary function declaration
 - clean up logs.

Change-Id: I8adfd2e89c88185547333a45462eceaa1f061c5b
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
8 years agorotary: correct use of virtioqueue to fix bug
Jinhyung Jo [Tue, 23 Feb 2016 08:28:18 +0000 (17:28 +0900)]
rotary: correct use of virtioqueue to fix bug

When using the rotary device, the segmentation fault occurs in the host.
Its cause is due to use the virtioqueue in the wrong way.
So correct with the kernel driver side.
Fix the fault and simplify complex sources.

Conflicts:
    ;; VIRTIO_ROTARY to VIRTIO_MARU_ROTARY
tizen/src/hw/virtio/maru_virtio_rotary.c

Change-Id: I85d0517a6567de742bbd56cd756faa9b8f47e58c
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
(cherry picked from commit b4ec658343d4808aba2f4f3d04f26f65f3cb73c2)

8 years agohwkey: add XML schema for color-filled hover
GiWoong Kim [Wed, 2 Mar 2016 08:18:52 +0000 (17:18 +0900)]
hwkey: add XML schema for color-filled hover

<form>
 ...
    <hover fill="true">
        <color R="255" G="255" B="255"/>
    </hover>
</form>

Change-Id: I1de124cdb6f82c84294364872136d01e0a6c9b3f
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agomenu: modify event filter rule
GiWoong Kim [Mon, 22 Feb 2016 07:03:43 +0000 (16:03 +0900)]
menu: modify event filter rule

Do not filter out a right-click event when it is triggerd
at outside of menu. But, still need a event filtering at
inside of menu to prevent the selection mistake.

Change-Id: Ieb453a6d9b68cbce875cc7a58e805fa73a47adcf
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agoskin: delete legacy skin resources
GiWoong Kim [Fri, 15 Jan 2016 05:39:34 +0000 (14:39 +0900)]
skin: delete legacy skin resources

- mobile-320x480-3btn
- wearableO-360x360-1btn

Change-Id: I9640a6706b1ff5108a525ecf8bc26e51287e14cc
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agohwkey: add Back key to wearable-general skin for Qt GUI
GiWoong Kim [Thu, 14 Jan 2016 07:40:15 +0000 (16:40 +0900)]
hwkey: add Back key to wearable-general skin for Qt GUI

Change-Id: If6a0986521ac51049889f3692f9be491bc11f4be
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agoconfigure: use TIZEN_SDK_DEV directory that is really exist
SeokYeon Hwang [Wed, 24 Feb 2016 07:22:57 +0000 (16:22 +0900)]
configure: use TIZEN_SDK_DEV directory that is really exist

Change-Id: I5c4cf7b7f0b987de59fd158816098a31fb2ec168
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
8 years agoutil: remove/replace unnecessary system(3) call
Sangho Park [Mon, 15 Feb 2016 03:38:07 +0000 (12:38 +0900)]
util: remove/replace unnecessary system(3) call

* Mac OS X
** use uname(3) instead of system("uname")
** remove system("java -version")
* Linux
** Try to read /etc/lsb-release
** Add get_number_of_processors()
** Remove redundant codes

Change-Id: I0a73b27ab35a6ab9dd774455b33182abb15ad481
Signed-off-by: Sangho Park <sangho.p@samsung.com>
8 years agodisplay: protect the integrity of the input devices
GiWoong Kim [Fri, 5 Feb 2016 03:46:51 +0000 (12:46 +0900)]
display: protect the integrity of the input devices

When user changes widget focus while mouse dragging, it causes a mismatch
problem between press event and release event.
To protect the integrity of the input devices, press event of mouse
or touch screen device should be canceled(by auto-generated release event)
if user opens context popup menu or enable the moving mode.

Change-Id: Id0817d1ee826b5576fdfe058ce98e964d3d2ae72
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agoecs: apply code conventions
ChulHo Song [Mon, 15 Feb 2016 06:10:29 +0000 (15:10 +0900)]
ecs: apply code conventions

Change-Id: I93f9cd75492f33259adeaa2ca5f237648f5e0312
Signed-off-by: ChulHo Song <ch81.song@samsung.com>
8 years agoconfigure: cross-build with TIZEN_SDK_DEV_PATH
Sangho Park [Mon, 15 Feb 2016 07:17:37 +0000 (16:17 +0900)]
configure: cross-build with TIZEN_SDK_DEV_PATH

When TIZEN_SDK_DEV_PATH env. variable is already exported,
cross-compiling fails because TIZEN_SDK_DEV_PATH is for native build.
Append CROSS_PREFIX to TIZEN_SDK_DEV_PATH and support cross-build.

Change-Id: I51218f895e9131153ac27ff2cdc8a8de53018379
Signed-off-by: Sangho Park <sangho.p@samsung.com>
8 years agotouch: minor cleanup for touch event
GiWoong Kim [Thu, 4 Feb 2016 07:28:21 +0000 (16:28 +0900)]
touch: minor cleanup for touch event

- remove dependency with emul_state
- modify function and variable names

Change-Id: I675bc802ea9ee54e7b587f7f5441623cdd71ac12
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agoosutil: minor refactoring on vm_lock
Sangho Park [Mon, 1 Feb 2016 06:03:53 +0000 (15:03 +0900)]
osutil: minor refactoring on vm_lock

* Remove assertion on remove vm_lock because lock_file can be
  INVALID_HANDLE_VALUE or -1
* Add assertion on locking vm
* Remove redundant g_strdup()

Change-Id: Ica262b8522aeec26561e5f06b46295b48159b307
Signed-off-by: Sangho Park <sangho.p@samsung.com>
8 years agonet_helper: use qemu_socket() instead of socket()
Sangho Park [Mon, 1 Feb 2016 06:14:32 +0000 (15:14 +0900)]
net_helper: use qemu_socket() instead of socket()

* Change socket() to qemu_socket()
** qemu_socket() turns on SOCK_CLOEXEC option.
* Remove unused functions, socket_close() and socket_close_handler()

Change-Id: I8878bd50b2a6a78680583a5922c597378c67eea3
Signed-off-by: Sangho Park <sangho.p@samsung.com>
8 years agosource: add braces to if statements
ChulHo Song [Wed, 3 Feb 2016 02:30:23 +0000 (11:30 +0900)]
source: add braces to if statements

Change-Id: Iccd3f70f0773099c2d38bddb86e7dc1fc3c75eca
Signed-off-by: ChulHo Song <ch81.song@samsung.com>
(cherry picked from commit c390c54dbc94019b5725d1e8b7890bba3e46742e)

8 years agosdcard: send notification to ECP when sdcard state is changed
ChulHo Song [Fri, 29 Jan 2016 08:45:14 +0000 (17:45 +0900)]
sdcard: send notification to ECP when sdcard state is changed

Change-Id: Ic8804fc221058cae14bd74509c2ca84b6b45c29c
Signed-off-by: ChulHo Song <ch81.song@samsung.com>
(cherry picked from commit 7e051a5400555016e4656f9635e0fe4b26409405)

8 years agosdcard: add trailing backslash only if path has no trailing backslash
ChulHo Song [Fri, 29 Jan 2016 07:31:30 +0000 (16:31 +0900)]
sdcard: add trailing backslash only if path has no trailing backslash

Change-Id: I350f81df3c9ddc0408a21a1b5673ed0dcf8c378c
Signed-off-by: ChulHo Song <ch81.song@samsung.com>
(cherry picked from commit 47774e6252defe89cb31fbc06b684e134e3bbcde)

8 years agoosutil: fix bugs on locking sdcard in Windows
Sangho Park [Mon, 1 Feb 2016 02:11:26 +0000 (11:11 +0900)]
osutil: fix bugs on locking sdcard in Windows

* Remove 'pid' on filename of sdcard lock. It makes that only a single emulator
  can attach the same sdcard image.
* Check whether sdcard is already attached or not when try to attach sdcard
* Check whether sdcard is attached and same when try to detach sdcard
* Refactoring
** Just CloseHandle() when detach sdcard. It is sufficient to remove the
   lock file
** Remove redundant memory allocation

Change-Id: Ib6611dceffa5b9e6dfaf10fb450b9c7b218687b7
Signed-off-by: Sangho Park <sangho.p@samsung.com>
8 years agoosutil: lock the sdcard image instead of lock file
Sangho Park [Thu, 28 Jan 2016 04:03:18 +0000 (13:03 +0900)]
osutil: lock the sdcard image instead of lock file

Lock a sdcard image file to use and prevent other emulator from
using the sdcard image. Additional lock file is not needed.

Change-Id: Ie39cf7d1a66c7047593968caec3970c907eee935
Signed-off-by: Sangho Park <sangho.p@samsung.com>
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
8 years agoosutil: modified posix lock mechanism
Sangho Park [Wed, 27 Jan 2016 09:09:37 +0000 (18:09 +0900)]
osutil: modified posix lock mechanism

After failing to lock file, check the lock whether other emulator locks
the file or not. If other emulator does not lock the file, try again to
lock file after sleep.

Change-Id: I9cfc3c4af395eb0d9e113eefb83d3953b431a19c
Signed-off-by: Sangho Park <sangho.p@samsung.com>
8 years agodisplay: no need to consider multi-touch drawing when mouse enabled
GiWoong Kim [Tue, 26 Jan 2016 05:51:08 +0000 (14:51 +0900)]
display: no need to consider multi-touch drawing when mouse enabled

Change-Id: I1dd6cdd16155249be4a3376904e98a496b317cc5
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agomouse: synchronize mouse position between guest and host after moving
GiWoong Kim [Mon, 25 Jan 2016 11:46:46 +0000 (20:46 +0900)]
mouse: synchronize mouse position between guest and host after moving

Change-Id: Ia42b64d1a89f678e9b21ed37c31a2da922c10a8f
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agomenu: modified move function
GiWoong Kim [Tue, 19 Jan 2016 11:40:06 +0000 (20:40 +0900)]
menu: modified move function

Let's keep the emulator window covered with transparent widget
while moving, to handle mouse events conveniently. However,
display region is excepted. Display can be drawn black or frozen
screen if it has a transparent layer on it. So, to avoid this issue,
display handles mouse events directly while moving, instead of
helping of transparent widget.

Change-Id: I37d69f1c041843fdaa61244268d06bbf0af7c20b
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agoYaGL: modify native configs enumerator in OS X
Jinhyung Jo [Wed, 20 Jan 2016 08:03:46 +0000 (17:03 +0900)]
YaGL: modify native configs enumerator in OS X

Some apps want to get the config without multisampling.
Currently, YaGL module provides only one config with multisampling attribute.
So the apps fail because they can not find the matched config in OS X.
So add one more pixelformat without multisampling attribute & add related tasks.

Change-Id: Ibf41243110d9212b9a62e4006dfa6f9c4356291f
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
(cherry picked from commit 2c9de13bde79583b1f6dfe78fc16f3cfcec99973)

8 years agoosutil-win32: always get java path from registry
Jinhyung Jo [Mon, 25 Jan 2016 10:44:25 +0000 (19:44 +0900)]
osutil-win32: always get java path from registry

Regardless of the architecture of the emulator(32bit or 64bit),
always gets the java execution path from Windows registry.
This commit would be helpful to reduce the java execution failure.

Conflicts:
tizen/src/util/osutil-win32.c

Change-Id: I4680c888292a0c11d85f7a662708faf8973c6bc4
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
(cherry picked from commit 6eb715fd787c0f25a519903b8a552d8e95d0e6b7)

8 years agopackage: update version (2.5.1)
SeokYeon Hwang [Tue, 26 Jan 2016 08:08:46 +0000 (17:08 +0900)]
package: update version (2.5.1)

Change-Id: Ia4e204f96c0a027f12a5692f93839e6e6760b6fa
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
8 years agoosutil: change locking mechanism
SeokYeon Hwang [Wed, 6 Jan 2016 10:00:49 +0000 (19:00 +0900)]
osutil: change locking mechanism

Using file lock mechanism instead of shared memory. Emulator-manager
can share same file lock for checking whether same VM is running or not.

On Linux and MacOSX, POSIX file lock is used. If it is failed to lock file
and the file is not locked with valid type and record, it will try again to
lock file after sleeping.

On Windows, emulator will stop before checking lock because platform
image file and kernel log file are aleady opened with exclusive write
lock by pre-executed emulator. But it is still useful for
emulator-manager.

In addition, header files are cleaned up.

Change-Id: Ibedfac3503fb0d19956a7fbed6736337be8f2223
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Signed-off-by: Sangho Park <sangho.p@samsung.com>
8 years agomenu: refactoring for Move function
GiWoong Kim [Fri, 15 Jan 2016 07:47:28 +0000 (16:47 +0900)]
menu: refactoring for Move function

- cancel the moving mode before the layout changing
- use override functions instead of event filter
- delete unnecessary functions
- modify function and variable names

Change-Id: I0e97f3c9816ab4f107796bba0616a6ab590184ff
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agokeyboard: ignore key events while the display is off
Jihye Won [Mon, 11 Jan 2016 04:28:46 +0000 (13:28 +0900)]
keyboard: ignore key events while the display is off

There was a bug when a user presses the HW key shortcut in display-off mode.
The reason is that the guest OS receives key events while the display is off.
After applying this commit, the emulator ignores key events while the display is off.

Change-Id: I97f2e21f1d0aaaa9aa4ddba9c18518a5a5df74bc
Signed-off-by: Jihye Won <jihye.won1@samsung.com>
(cherry picked from commit 36cec4673a2927d99696122ef795eec01da723a9)

8 years agoshortcuts: changed the shortcut for Power function
Jihye Won [Fri, 15 Jan 2016 06:52:04 +0000 (15:52 +0900)]
shortcuts: changed the shortcut for Power function

According to the version of OS or Platform, the previous shortcut
for Power function(Ctrl+Shift+F7) did not work well.
After performing tests on MacOS 10.10, 10.11, Ubuntu, Windows 7 and Windows 10,
I confirmed the new shorcut(Ctrl+shift+F8) operates correctly.

Change-Id: I0a12216a066cd46a604a5060ed88a75dda29c3bc
Signed-off-by: Jihye Won <jihye.won1@samsung.com>
(cherry picked from commit afbc265908c2319d03e596bd9f568a5d96e56004)

8 years agoshortcuts: change Scale function shortcuts
Jihye Won [Mon, 11 Jan 2016 03:41:26 +0000 (12:41 +0900)]
shortcuts: change Scale function shortcuts

I changed Scale function shortcuts because MacOSX
uses Control+Shift+Arrows Keys for Mission Control Shortcuts.
Mission Control Shortcuts are enable as the default setting on MacOSX.
So, I changed shortcuts for Scale function to avoid the system shortcuts.

Change-Id: I8a4fe87e79e0a216058d17e320e1fb22c682f2ab
Signed-off-by: Jihye Won <jihye.won1@samsung.com>
8 years agoqt5_msgbox: fix the bug of an abnormal execution in Windows
Won Jihye [Wed, 16 Dec 2015 08:44:54 +0000 (17:44 +0900)]
qt5_msgbox: fix the bug of an abnormal execution in Windows

_spawnv function was changed into CreateProcess function
to execute the program(qt5_msgbox).
_spawnv eventually call CreateProcess because CreateProcess is Win32 API function.
Also, CreateProcess gives us more control over the child processes.
Although I can not find out the exact reason of the bug, I fixed the bug by using CreateProcess.

Change-Id: Ib8d53df65da93460a2ac6c8e57bff660d14021ca
Signed-off-by: Jihye Won <jihye.won1@samsung.com>
8 years agogui: delete meaningless lines
GiWoong Kim [Wed, 13 Jan 2016 11:15:51 +0000 (20:15 +0900)]
gui: delete meaningless lines

QWidget's showEvent function is empty.

Change-Id: I55feb0a06e7e3aa374ec62667f62009d6d9c4c2c
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agocontroller: make fixed size floating controller
GiWoong Kim [Wed, 13 Jan 2016 06:20:43 +0000 (15:20 +0900)]
controller: make fixed size floating controller

Sets both the minimum and maximum sizes of the widget to
initial value, thereby preventing it from ever growing or
shrinking.

Change-Id: I6afc0150255b51ea42575bd881d2b9e06f5a316c
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agocontroller: consider elided text for key buttons
GiWoong Kim [Tue, 12 Jan 2016 07:28:59 +0000 (16:28 +0900)]
controller: consider elided text for key buttons

If the string text is wider than button width, use
an elided version of the string.

Change-Id: I458b04d794db717e6a428b78ddbe9e38a083db30
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agopackage: update version (2.5.0)
SeokYeon Hwang [Wed, 13 Jan 2016 08:23:14 +0000 (17:23 +0900)]
package: update version (2.5.0)

Rebased on QEMU 2.5.0

Change-Id: I97488a8595de890f4238bf1e2ad2486595f6be24
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
8 years agoemul_state: delete unnecessary functions
GiWoong Kim [Fri, 8 Jan 2016 11:29:19 +0000 (20:29 +0900)]
emul_state: delete unnecessary functions

Change-Id: I86f25232bb0f5739c52b58c0d44ef686e6fa1204
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agoextra package: skip installing duplicate packages
ChulHo Song [Fri, 4 Dec 2015 07:56:11 +0000 (16:56 +0900)]
extra package: skip installing duplicate packages

Do not install same version of the packages. Newer version of the
packages will be upgraded, older version of the packages will be
failed to install.

Change-Id: Ib5cc8b781aee56d39447b6cb46689e948b68045c
Signed-off-by: ChulHo Song <ch81.song@samsung.com>
(cherry picked from commit 58a790efcd2d468ef01987cde3866276ffa445fd)

8 years agokeyboard: remove dependency with emul_state
GiWoong Kim [Fri, 8 Jan 2016 07:46:51 +0000 (16:46 +0900)]
keyboard: remove dependency with emul_state

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

8 years agogui: prevent moving to position out of monitor range
GiWoong Kim [Mon, 11 Jan 2016 06:42:34 +0000 (15:42 +0900)]
gui: prevent moving to position out of monitor range

Change-Id: I755b7d8700e99fd3f4f1889159113e32a8ceb1dc
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agodisplay: minor cleanup for input
GiWoong Kim [Fri, 8 Jan 2016 05:31:00 +0000 (14:31 +0900)]
display: minor cleanup for input

move each duplicated code to its parent class

Change-Id: I7eeb29892bd23264eb688a72d6583fc9d4460755
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
(cherry picked from commit 9ca2ddeccd7c8e00beffe1e4fc044314e5ae8701)

8 years agocamera: define common pixel format type for Mac
sungmin ha [Fri, 8 Jan 2016 07:59:18 +0000 (16:59 +0900)]
camera: define common pixel format type for Mac

Change-Id: I9a1c7361e145d9dc7d06c1b61c4f429444b6ad05
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>
8 years agomenu: improve VM information from Detailed Info
GiWoong Kim [Thu, 7 Jan 2016 05:38:31 +0000 (14:38 +0900)]
menu: improve VM information from Detailed Info

- reorder VM info contents
- add emulator version
- add network connection type
- remove kernel and file info

Change-Id: Idd305385ba21eb0f9240ee0c5f73cb1b8cc3e8ac
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agohds: check available PCI slot before mounts
Jinhyung Choi [Thu, 7 Jan 2016 05:55:58 +0000 (14:55 +0900)]
hds: check available PCI slot before mounts

PCI slot max is 32 and reserved slot for hidden is 4.
ECS sends the number of available PCI slot when the status is requested.
Also, it checks the available PCI slot before HDS tries to attach 9p device.

Change-Id: I24b12bf07574420753de2330ac8dbde6b6547915
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
8 years agohwkey: establish priorities for tooltip definition of Key Window
GiWoong Kim [Thu, 7 Jan 2016 11:01:20 +0000 (20:01 +0900)]
hwkey: establish priorities for tooltip definition of Key Window

priority)
1. In XML file, declared tooltip text for HW key
2. preset shortcut key for HW key

Change-Id: I31a305603e5cbf08a3d466734da21deb3d436be7
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agopackage: remove unused lines for java UI
SeokYeon Hwang [Thu, 7 Jan 2016 11:18:48 +0000 (20:18 +0900)]
package: remove unused lines for java UI

Change-Id: I4e6533ce8ebbf3dc4ae18a306fcd2c2ec19e374b
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
8 years agohds: change the policy from unmodifiable to hidden
Jinhyung Choi [Wed, 6 Jan 2016 12:35:39 +0000 (21:35 +0900)]
hds: change the policy from unmodifiable to hidden

ECP UI did not allow unmount when unmodifiable level is chosen.
But, it is changed to hide.

Change-Id: Ib33a61a3a0217f015676cd76e10878799818a4d7
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
8 years agohds: not allow duplicated host & guest path
Jinhyung Choi [Wed, 6 Jan 2016 12:25:32 +0000 (21:25 +0900)]
hds: not allow duplicated host & guest path

Change-Id: Ia282cf951ac9dd87c659ae3ed20f3de5092a93b1
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
8 years agoecs: reduce header definition for ecs.h
Jinhyung Choi [Wed, 6 Jan 2016 04:55:10 +0000 (13:55 +0900)]
ecs: reduce header definition for ecs.h

- clean-up and re-arrange the definitions and inclusion
- remove unused function definition

Change-Id: Ic54e9d81da2e91f6e534c45f9c7064a53d7e54cc
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
8 years agoemul_state: guest IP and host IP getters/setters are refined
SeokYeon Hwang [Wed, 6 Jan 2016 06:49:53 +0000 (15:49 +0900)]
emul_state: guest IP and host IP getters/setters are refined

Change-Id: I2a7b3bed1fb653855c21e61da79a85b35dfae524
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
8 years agosudoers: set sudoers' permission
Munkyu Im [Thu, 7 Jan 2016 05:52:58 +0000 (14:52 +0900)]
sudoers: set sudoers' permission

according to man page of sudoers, the default file mode is 0440.
(readable by owner and group, writable by none).

Change-Id: Id3402f391b976ee490318d55b068c565172e6e87
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
8 years agogui: delete deprecated SWT GUI
GiWoong Kim [Tue, 5 Jan 2016 07:40:35 +0000 (16:40 +0900)]
gui: delete deprecated SWT GUI

- maru_sdl, maru_shm options
- related source code

Change-Id: I5d2444982753e909170af6b5a15eb688d916eadf
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agoemulator: clean-up emulator network initialization
SeokYeon Hwang [Mon, 4 Jan 2016 10:28:26 +0000 (19:28 +0900)]
emulator: clean-up emulator network initialization

Do port forwarding and base port initialization at once.
Some emul_state getters/setters are refined.
"sdb.c" is "net_helper.c" now and it use new_debug_channel.

Change-Id: I0659b35e231a8f60bd3707a2d04b09213a9cb830
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
8 years agonet: clean-up tap handling logic
SeokYeon Hwang [Mon, 4 Jan 2016 10:38:25 +0000 (19:38 +0900)]
net: clean-up tap handling logic

Tizen emulator specific logic is extracted to independent source file.
Tap interface prefix is changed to "tap-tizen".

Change-Id: I38e218936003e8bc8de51a4d0b3413872defe4c3
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
8 years agoconfigure: disable gcrypt, nettle, vte by default
SeokYeon Hwang [Wed, 30 Dec 2015 08:28:02 +0000 (17:28 +0900)]
configure: disable gcrypt, nettle, vte by default

Detaching unnecessary library dependencies.

Change-Id: I37cea8fae1cdb8860a7736628682452964afed7d
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
8 years agocontroller: define fixed size for controller view
GiWoong Kim [Wed, 23 Dec 2015 05:36:06 +0000 (14:36 +0900)]
controller: define fixed size for controller view

Emulator window obtains a consistent display result by define
fixed size for controller view. The controller of emulator does
not have to adjustable size.

Change-Id: I79b206b19aff46e7a5088de23cae250bfec9765b
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
(cherry picked from commit 8972ab7c2910549bf023930b4bf6be47b58a5a50)

8 years agovl.c: improve error handling while display option parsing
GiWoong Kim [Tue, 29 Dec 2015 03:53:41 +0000 (12:53 +0900)]
vl.c: improve error handling while display option parsing

Change-Id: I359d40e206815b66cfcc52f5890b4cf74aaf2723
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agopackage: update version (2.4.9)
SeokYeon Hwang [Wed, 30 Dec 2015 07:36:41 +0000 (16:36 +0900)]
package: update version (2.4.9)

Change-Id: Idef6a6c6bff2c5b7f8e3726ecb46b2967a576a13
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
8 years agonet: check if sdb/gdb port is available
Munkyu Im [Tue, 29 Dec 2015 08:20:11 +0000 (17:20 +0900)]
net: check if sdb/gdb port is available

It is an additional port checking to improve stability.

Change-Id: I6124fd6f1479b40b5c803f4a1b495e994c63f51f
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
8 years agohwkey: modified HW key's tooltip on MacOS
GiWoong Kim [Tue, 29 Dec 2015 04:59:05 +0000 (13:59 +0900)]
hwkey: modified HW key's tooltip on MacOS

Change-Id: I2913cb6f0957dc829b73201625fd35305c273846
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
(cherry picked from commit 6ca2c76322b03537bc2df8f95a6ce68d9d39f2de)

8 years agomenu: add platform image version info to Detailed Info dialog
GiWoong Kim [Tue, 29 Dec 2015 07:28:16 +0000 (16:28 +0900)]
menu: add platform image version info to Detailed Info dialog

Change-Id: I527b54aa134a5dacbf34c1f3030a2038336185d8
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
(cherry picked from commit 18c5e6c2adbea54e4628a2207c1a23777bb94bdf)

8 years agoconfigure: support branch specific TIZEN_SDK_DEV directory
SeokYeon Hwang [Tue, 29 Dec 2015 02:29:41 +0000 (11:29 +0900)]
configure: support branch specific TIZEN_SDK_DEV directory

We can support different TIZEN_SDK_DEV directory per branch now. It is
useful when specific branch needs different lib dev packages.
If "branch" directory is not exist, it uses default directory.

Change-Id: I86bf7e31fe8538c620eb9b0bebdb7481618a93cf
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
8 years agonet: close socket after checking available port
Munkyu Im [Wed, 30 Dec 2015 02:04:11 +0000 (11:04 +0900)]
net: close socket after checking available port

fixed check_port_bind_listen() in 6ae322880b2a6f4de42bd25c9f19ccce870136cd
But one caller of this function was skipped closing socket.
So, this commit adds socket close.

Change-Id: Id204f7e3bd15111019ae86cbacaa75111edd59fd
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
8 years agoshortcut: correct wrong Reboot shortcut
Jihye Won [Mon, 28 Dec 2015 09:35:08 +0000 (18:35 +0900)]
shortcut: correct wrong Reboot shortcut

The correct shortcut of Reboot is not Ctrl+Shift+F4 but Ctrl+Shift+Del.

Change-Id: Ib1166308d8a74bdd06e589829469708f8e36e0f2
Signed-off-by: Jihye Won <jihye.won1@samsung.com>
8 years agoemulator_options: fix critical bug
SeokYeon Hwang [Tue, 29 Dec 2015 04:52:03 +0000 (13:52 +0900)]
emulator_options: fix critical bug

Variable value is contaminated during it is processed. We fix this
issue and prevent a recurrence of this issue by using "const" keyword.

Change-Id: I7d50a82a10a6b43b203e78b5394bf3eb8e0231a2
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
8 years agoMerge branch 'tizen_3.0_qemu_2.5' into tizen_3.0_develop
SeokYeon Hwang [Wed, 30 Dec 2015 02:24:57 +0000 (11:24 +0900)]
Merge branch 'tizen_3.0_qemu_2.5' into tizen_3.0_develop

Change-Id: I2fe88ade2a861c3c07bfa8c9d3aafb6fb59a3ac2
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
8 years agoecs: fix build errors
SeokYeon Hwang [Tue, 22 Dec 2015 04:01:10 +0000 (13:01 +0900)]
ecs: fix build errors

Change-Id: Iebe782bd96e3a16ef28ad7030ae8ce3835d71401
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Signed-off-by: ChulHo Song <ch81.song@samsung.com>
8 years agohds: count available pci slots
Jinhyung Choi [Fri, 18 Dec 2015 09:25:43 +0000 (18:25 +0900)]
hds: count available pci slots

PCI slots are limited as PCI_SLOT_MAX which is 32.
For the stability of using HDS, the max connection should be set.
This function will be used by ECS for it.

Change-Id: Id67a2550ddfffff24feb1df04a7b8b2e912237b8
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
8 years agoMerge tag 'v2.5.0' into tizen_3.0_qemu_2.5
SeokYeon Hwang [Mon, 21 Dec 2015 09:00:30 +0000 (18:00 +0900)]
Merge tag 'v2.5.0' into tizen_3.0_qemu_2.5

v2.5.0 release

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
8 years agomouse: add MouseHelper class
GiWoong Kim [Wed, 16 Dec 2015 07:59:48 +0000 (16:59 +0900)]
mouse: add MouseHelper class

- extract input related codes from Display class
- clean up some lines

Change-Id: I90e9db61dbfffd1ee85aa578a5de9225921d7b55
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agopackage: update version (2.4.8)
SeokYeon Hwang [Thu, 17 Dec 2015 04:31:34 +0000 (13:31 +0900)]
package: update version (2.4.8)

Change-Id: I75cd5155eb0a735cf49b7e83641653c11b7662bb
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
8 years agobuild: use script file for correcting PC's prefix
SeokYeon Hwang [Fri, 18 Dec 2015 03:07:58 +0000 (12:07 +0900)]
build: use script file for correcting PC's prefix

Now emulator-lib-dev package provide script for correcting PC's prefix. So
we use it instead of embedded one.

Change-Id: I57501207c49d81516acd2d3354d160580d6b2a45
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
8 years agobuild: clean macos-64 libraries up
SeokYeon Hwang [Thu, 17 Dec 2015 04:31:18 +0000 (13:31 +0900)]
build: clean macos-64 libraries up

Change-Id: Ifec7d8bef21d9c78bff4189201b91a6d1f1f6178
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
8 years agocontroller: fix the bug on the event of dockingconview
Jihye Won [Thu, 10 Dec 2015 05:34:41 +0000 (14:34 +0900)]
controller: fix the bug on the event of dockingconview

Because handling the mouse event of dockingconview is incorrect,
the controller could be moved unintenionally in certain case.
Therefore, I added codes for setting dockingconview's status correctly.
Also the enumeration like CONVIEW_* is designed to react the left mouse button.

Change-Id: I8fbe0951bd3804b7edd843aeec03624770498329
Signed-off-by: Jihye Won <jihye.won1@samsung.com>
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
(cherry picked from commit 8c0cb0b479bed1550a69730459574adbb0db46f0)

8 years agoshortcut: change all shortcuts with Ctrl+Shift
Jihye Won [Tue, 15 Dec 2015 11:30:49 +0000 (20:30 +0900)]
shortcut: change all shortcuts with Ctrl+Shift

To improve usuability, we changed all shortcuts with
a combination of Ctrl key and Shift key.

Change-Id: Ie8cd2ba5bd9bfad01f0c140462e70677a899f705
Signed-off-by: Jihye Won <jihye.won1@samsung.com>
(cherry picked from commit 2cb5dfc576b22efe5452cfd1d5f7e73701f4596c)

8 years agoUpdate version for v2.5.0 release
Peter Maydell [Wed, 16 Dec 2015 16:10:14 +0000 (16:10 +0000)]
Update version for v2.5.0 release

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
8 years agopackage: update version (2.4.7)
SeokYeon Hwang [Wed, 16 Dec 2015 12:57:28 +0000 (21:57 +0900)]
package: update version (2.4.7)

Change-Id: I732d9da90c2ebe01100f9f3bd4a043cf3ef45974
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
8 years agoconfigure: disable curl as a default
SeokYeon Hwang [Tue, 15 Dec 2015 08:41:00 +0000 (17:41 +0900)]
configure: disable curl as a default

"curl" is used as a block device in QEMU. And now we disable curl support
since we never use it.

Change-Id: I83c9b01b0db88655f84c143c382f7201f6614005
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
8 years agoshortcut: make default shortcut keys with "Control key" on MacOS
GiWoong Kim [Tue, 15 Dec 2015 11:01:07 +0000 (20:01 +0900)]
shortcut: make default shortcut keys with "Control key" on MacOS

QKeySequence Note - On Mac OS X, references to "Ctrl", Qt::CTRL, Qt::Control and
Qt::ControlModifier correspond to the Command keys on the Macintosh keyboard,
and references to "Meta", Qt::META, Qt::Meta and Qt::MetaModifier correspond to
the Control keys. Developers on Mac OS X can use the same shortcut descriptions
across all platforms, and their applications will automatically work as expected
on Mac OS X.

According to Qt note, "Ctrl" will be treated as command key. This is not what we
want. To be recognized as control key on MacOS, XML Parser should replace "Ctrl"
with "Meta" text.

Change-Id: Id26972ba7236df1b33d7d2409fcf58115ebf163c
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agolayout: use enum type variables for menu parsing
GiWoong Kim [Fri, 11 Dec 2015 08:03:14 +0000 (17:03 +0900)]
layout: use enum type variables for menu parsing

Change-Id: I65785ee1fbf3c3b3352e5c9c7eb4d4ad30c49252
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agoUpdate version for v2.5.0-rc4 release
Peter Maydell [Fri, 11 Dec 2015 16:37:55 +0000 (16:37 +0000)]
Update version for v2.5.0-rc4 release

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
8 years agoblockdev: Mark {insert, remove}-medium experimental
Max Reitz [Fri, 11 Dec 2015 15:23:05 +0000 (16:23 +0100)]
blockdev: Mark {insert, remove}-medium experimental

While in the long term we want throttling to be its own block filter
BDS, in the short term we want it to be part of the BB instead of a BDS;
even in the long term we may want legacy throttling to be automatically
tied to the BB.

blockdev-insert-medium and blockdev-remove-medium do not retain
throttling information in the BB (deliberately so). Therefore, using
them means tying this information to a BDS, which would break the model
described above. (The same applies to other flags such as
detect_zeroes.) We probably want to move this information to the BB or
its own filter BDS before blockdev-{insert,remove}-medium can be
considered completely stable.

Therefore, mark these functions experimental for the time being.

Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Acked-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Kevin Wolf <kwolf@redhat.com>
Message-id: 1449847385-13986-2-git-send-email-mreitz@redhat.com
Reviewed-by: Eric Blake <eblake@redhat.com>
[PMM: fixed format nit (underlining) in qmp-commands.hx]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
8 years agoFix xbzrle vs last_sent_block update
Dr. David Alan Gilbert [Thu, 10 Dec 2015 16:31:46 +0000 (16:31 +0000)]
Fix xbzrle vs last_sent_block update

My fix (84e7b80a) replaced the last_sent_block update that I'd
removed earlier; however it was too aggressive in the xbzrle case.

save_xbzrle_page might return '0' to mean that the page didn't
need sending since it was the same as the last sent version;
in this case we can't update 'last_sent_block' since we didn't
actually send it.

Symptom: 'Illegal RAM offset 1018000' as we try and send a page
        to the wrong RAMBlock;  potentially that could be a data
        corruption if you were really unlucky.

Fixes: 84e7b80a05c0c44b90533c6cd2f1db5c932ccf77

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-id: 1449765106-6528-1-git-send-email-dgilbert@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
8 years agomenu: modify some variable names for Always on Top
GiWoong Kim [Fri, 11 Dec 2015 04:58:20 +0000 (13:58 +0900)]
menu: modify some variable names for Always on Top

Change-Id: I9d57e4de836273ac735117895dff41a6ed28ef47
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agoUpdate language files for QEMU 2.5.0
Peter Maydell [Thu, 10 Dec 2015 13:34:27 +0000 (13:34 +0000)]
Update language files for QEMU 2.5.0

Update translation files (change created via 'make -C po update').

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Message-id: 1449754467-3496-1-git-send-email-peter.maydell@linaro.org

8 years agosparc: allow CASA with ASI 0xa from user space
Alex Zuepke [Fri, 4 Dec 2015 15:01:02 +0000 (16:01 +0100)]
sparc: allow CASA with ASI 0xa from user space

LEON3 allows the CASA instruction to be used from user space
if the ASI is set to 0xa (user data).

Signed-off-by: Alex Zuepke <azu@sysgo.de>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
8 years agoMAINTAINERS: add maintainer to virtio-9p
Greg Kurz [Mon, 30 Nov 2015 15:40:16 +0000 (16:40 +0100)]
MAINTAINERS: add maintainer to virtio-9p

As suggested by Paolo, I add myself as maintainer for virtio-9p.

Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
Acked-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Message-id: 20151130154016.20108.79073.stgit@bahia.huguette.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
8 years agovirtio-9p-device: add minimal unrealize handler
Greg Kurz [Tue, 8 Dec 2015 15:54:57 +0000 (16:54 +0100)]
virtio-9p-device: add minimal unrealize handler

Since commit 4652f1640e029e1f2433fa77ba6af285 "virtio-9p: add savevm
handlers", if the user hot-unplugs a quiescent 9p device and live
migrates, the source QEMU crashes before migration completetion...
This happens because virtio-9p devices have a realize handler which
calls virtio_init() and register_savevm().  Both calls store pointers
to the device internals, that get dereferenced during migration even
if the device got unplugged.

This patch simply adds an unrealize handler to perform minimal
cleanup and avoid the crash.  Hot unplug of non-quiescent 9p devices
is still not supported in QEMU, and not supported by linux guests
either.

Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-id: 20151208155457.27775.69441.stgit@bahia.huguette.org
[PMM: rewrapped long lines in commit message]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
8 years agohwkey: add double keycode type handling
GiWoong Kim [Wed, 9 Dec 2015 05:32:55 +0000 (14:32 +0900)]
hwkey: add double keycode type handling

According to real target behavior, some HW key buttons must
send a press event one more while long pressing. I named this
type of key called "double keycode key". The double keycode
key has same value for long-press and short-press keycode.

Change-Id: Ie7f227bd0836727b9b6683473dd37308a8309b3d
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
(cherry picked from commit 09ff007b6842731e2b86ba89e2d41faf31406cc6)

8 years agolayout: minor improvements for XML parser
GiWoong Kim [Fri, 4 Dec 2015 10:13:50 +0000 (19:13 +0900)]
layout: minor improvements for XML parser

- use const type variables
- delete an unnecessary error popup call
- add some logs

Change-Id: I3662284c0b329f683a4ca0e5f9a3e0748b70f336
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
8 years agoUpdate version for v2.5.0-rc3 release
Peter Maydell [Mon, 7 Dec 2015 17:47:40 +0000 (17:47 +0000)]
Update version for v2.5.0-rc3 release

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
8 years agosd: Mark brittle abuse of blk_attach_dev() FIXME
Markus Armbruster [Mon, 7 Dec 2015 15:55:10 +0000 (16:55 +0100)]
sd: Mark brittle abuse of blk_attach_dev() FIXME

blk_attach_dev() fails here only when we're working for device
"sdhci-pci" (which already attached the backend), and then we don't
want to attach a second time.  If we ever create another failure mode,
we're setting up ourselves to using the same backend from multiple
frontends, which is likely to end in tears.  Can't clean this up this
close to the release, so mark it FIXME.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1449503710-3707-3-git-send-email-armbru@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
8 years agosdhci: Sanitize "sdhci-pci" properties for future qomification
Markus Armbruster [Mon, 7 Dec 2015 15:55:09 +0000 (16:55 +0100)]
sdhci: Sanitize "sdhci-pci" properties for future qomification

We currently fuse controller and card into a single device model, but
we intend qomify things properly and separate the two.  The properties
that really belong to the card would then have to somehow pass-through
to the card's properties.  To avoid that complication, either mark
them experimental or drop them.

Properties "capareg", "maxcurr" and the usual PCI device properties
belong to the controller.  Property "drive" belongs to the card;
rename it to "x-drive".  Properties "logical_block_size",
"physical_block_size", "min_io_size", "opt_io_size",
"discard_granularity" belong to the card, but have no effect; drop
them.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1449503710-3707-2-git-send-email-armbru@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
8 years agovirtio-blk: Drop x-data-plane option
Fam Zheng [Mon, 7 Dec 2015 10:59:27 +0000 (18:59 +0800)]
virtio-blk: Drop x-data-plane option

The official way of enabling dataplane is through the "iothread"
property that references an iothread object created by "-object
iothread".  Since the old "x-data-plane=on" way now even crashes, it's
probably easier to just drop it:

$ qemu-system-x86_64 -drive file=null-co://,id=d0,if=none \
    -device virtio-blk-pci,drive=d0,x-data-plane=on

ERROR:/home/fam/work/qemu/qom/object.c:1515:
object_get_canonical_path_component: assertion failed: (obj->parent != NULL)
Aborted

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-id: 1449485967-19240-1-git-send-email-famz@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
8 years agoMerge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
Peter Maydell [Mon, 7 Dec 2015 14:18:31 +0000 (14:18 +0000)]
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging

# gpg: Signature made Mon 07 Dec 2015 14:06:07 GMT using RSA key ID 398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@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: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request:
  lan9118: log and ignore access to invalid registers, rather than aborting
  lan9118: fix emulation of MAC address loaded bit in E2P_CMD register
  vmxnet3: silence warning
  pcnet: fix rx buffer overflow(CVE-2015-7512)
  net: pcnet: add check to validate receive data size(CVE-2015-7504)
  e1000: fix hang of win2k12 shutdown with flood ping

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
8 years agolan9118: log and ignore access to invalid registers, rather than aborting
Andrew Baumann [Fri, 4 Dec 2015 18:58:50 +0000 (10:58 -0800)]
lan9118: log and ignore access to invalid registers, rather than aborting

With this change, access to invalid/unimplemented device registers are
logged as a "guest error" rather than aborting qemu with
hw_error. This enables drivers for similar devices (e.g. SMSC 9221),
by simply ignoring the unimplemented writes. It's also closer to what
real hardware does.

Signed-off-by: Andrew Baumann <Andrew.Baumann@microsoft.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
8 years agolan9118: fix emulation of MAC address loaded bit in E2P_CMD register
Andrew Baumann [Fri, 4 Dec 2015 18:58:49 +0000 (10:58 -0800)]
lan9118: fix emulation of MAC address loaded bit in E2P_CMD register

There appears to have been a longstanding typo in the implementation
of the "MAC address loaded" bit in the E2P_CMD (EEPROM command)
register. The code was using 0x10, but the controller spec says it
should be bit 8 (0x100).

Signed-off-by: Andrew Baumann <Andrew.Baumann@microsoft.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
8 years agovmxnet3: silence warning
Michael S. Tsirkin [Mon, 30 Nov 2015 16:26:24 +0000 (18:26 +0200)]
vmxnet3: silence warning

vmxnet3 always produces a warning under qtest.

This is not a user error, don't warn.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
8 years agopcnet: fix rx buffer overflow(CVE-2015-7512)
Jason Wang [Mon, 30 Nov 2015 07:00:06 +0000 (15:00 +0800)]
pcnet: fix rx buffer overflow(CVE-2015-7512)

Backends could provide a packet whose length is greater than buffer
size. Check for this and truncate the packet to avoid rx buffer
overflow in this case.

Cc: Prasad J Pandit <pjp@fedoraproject.org>
Cc: qemu-stable@nongnu.org
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>