Jinhyung Choi [Thu, 15 Dec 2016 06:07:30 +0000 (15:07 +0900)]
ecs: send answer message to single client
Change-Id: I6c5ee1ba1460550cce37094baa35181af1dd5013
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
Jinhyung Jo [Mon, 12 Dec 2016 11:56:04 +0000 (20:56 +0900)]
display: fix null pointer dereference with tablet
Check whether the touchscreen device is accessible.
Change-Id: I85956f7b13ac534c738797843bc411d128eebc08
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Munkyu Im [Tue, 13 Dec 2016 08:43:05 +0000 (17:43 +0900)]
pkg: change destination path for add on packages
The previous path does not have permission to push files.
Change-Id: Ie0644cdd6c66cef121d42cb05681376d05217bf9
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
Jinhyung Jo [Mon, 12 Dec 2016 07:21:42 +0000 (16:21 +0900)]
package: update version (2.6.15)
Change-Id: I847bdc6f3f3507892c987a8007e49bfefbc83f09
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Jinhyung Jo [Wed, 7 Dec 2016 07:21:58 +0000 (16:21 +0900)]
display: W/A for OpenGL context version mismatch
Now, VIGS & Qt5 GUI use the OpenGL 3.2 core profile.
Later, we must solve this issue in the right way.
TODO:
- Improve the check GL version related function in VIGS.
- Add check GL version function to the Qt5 GUI.
- Add feature to match the verified GL version of Qt5 GUI and VIGS.
Change-Id: I9d225c69ba9ab55a7b65ff9affa5633ed4462092
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Minkee Lee [Mon, 5 Dec 2016 09:56:47 +0000 (18:56 +0900)]
package: update version (2.6.14)
Change-Id: I6e571243564c811943e238006cbbbdabf5d866f0
Signed-off-by: Minkee Lee <minkee.lee@samsung.com>
SeokYeon Hwang [Mon, 5 Dec 2016 08:37:14 +0000 (17:37 +0900)]
maru_virtio: disable modern interface for maru devices
"modern interface" is not ready for maru devices yet.
Change-Id: I97e95b2d71ce7771fcaf4924f281a1673709650d
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
jihye [Mon, 5 Dec 2016 02:47:57 +0000 (11:47 +0900)]
package: update version (2.6.13)
Change-Id: I49bc424d154d603ddcf6ad3a185532071fa508f7
Signed-off-by: jihye <jihye424.kim@samsung.com>
jihye [Fri, 2 Dec 2016 09:40:26 +0000 (18:40 +0900)]
skin: clear mask before set mask
Change-Id: Iea61ab5813fb52c7062e28cc706a0b381f2efb2e
Signed-off-by: jihye <jihye424.kim@samsung.com>
SeokYeon Hwang [Fri, 2 Dec 2016 09:09:37 +0000 (18:09 +0900)]
build: enhance compiler compatibility
Some built-in functions are depend on compiler version. So we exclude
those functions when the source compiled by c++ compiler.
Change-Id: I3a89552fc56c32b79e6c92f6a7c2e26ad2297233
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Seokyeon Hwang [Fri, 2 Dec 2016 05:46:48 +0000 (14:46 +0900)]
configure: fix configure error with clang
Change-Id: I211b3c97e26bc43c3b391f2c930933abcf40c2fd
Signed-off-by: Seokyeon Hwang <syeon.hwang@samsung.com>
Jinhyung Jo [Wed, 9 Nov 2016 06:52:27 +0000 (15:52 +0900)]
display: fix blinking display issue with OpenGL 2.1
Use the texture arrays to avoid collisions.
The glBufferSubData function makes the display blink
with OpenGL verion 2.1 have no glMapBufferRange support.
The glMapBuffer function helps to solve this problem.
Use the Qt5 class API(QOpenGLShaderProgram) instead of the OpenGL API.
That's a little clearer and better to watch.
Use multiple buffering to avoid performance degration.
Change-Id: I819a52f7e0db5accded86b71c8a15fa1a9e65e28
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Jinhyung Jo [Tue, 25 Oct 2016 02:56:30 +0000 (11:56 +0900)]
display: change default OpenGL version for Qt gui
There are 2 issues:
With some Radeon GPU,
the Qt5 library makes runtime errors infinitely with glCreateShader
like below in Qt5 internal implementations:
'Implicit version number 110 not supported by GL3 forward compatible context'
The issue that VIGS uses OpenGL version 2,
: starts with the force legacy option(gl_version=2).
: User's GPU driver does not support OpenGL version 3.2.
In order to avoid these problems, use the OpenGL 3.2 Core Profile
instead of the OpenGL 3.1 to create shared context.
And after creating the shared context, reset to OpenGL versio 2.1.
Change-Id: I2d67580827b1eda53478adccf774d9ab1342b42a
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Jinhyung Jo [Fri, 21 Oct 2016 06:57:40 +0000 (15:57 +0900)]
Revert "Revert "display: move display functionality to Qt5 GUI""
This reverts commit
f569c289168ec579bcb62231d2572a80be5d6d52.
Conflicts:
tizen/src/ui/mainwindow.cpp
tizen/src/ui/qt5_supplement.cpp
Change-Id: Iad8ebbf7c35e42f8bfd034a1ab932e011fe60ed4
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
SeokYeon Hwang [Wed, 30 Nov 2016 05:11:48 +0000 (14:11 +0900)]
Merge branch 'develop_qemu_2.7' into develop
Change-Id: Ibae70e3c0d1d88632903f98be114f47af9ca7502
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Wed, 30 Nov 2016 04:33:02 +0000 (13:33 +0900)]
hax: fix routines for non-UG
Change-Id: Idad6e573e9f50199a4e57ba50429edac3095d057
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Munkyu Im [Fri, 25 Nov 2016 05:16:19 +0000 (14:16 +0900)]
package: update version (2.6.12)
Change-Id: I29fb86317af74dd08929326ddb5d94d650bb034a
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
Munkyu Im [Fri, 25 Nov 2016 04:01:31 +0000 (13:01 +0900)]
shortcut: release pressed keys before input H/W keycode
when user input shortcut key,
the last key sequence is replaced with H/W keycode.
So the key combination on guest is twisted.
Here is an example.
This is key sequence of Menu H/W key: "Crtl + Shift + F6"
If user press "F6",
this key is not delivered to guest but "keycode 169" is delivered.
Finally guest gets "Ctrl + Shift" and "keycode 169".
It occurs unexpected behavior on guest side.
So, if user want to input H/W keycode with shortcut,
all keys pressed should be released before send it.
Change-Id: I82e1310af577d1ab43d20e2f5a9362ba2f58e59c
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
SeokYeon Hwang [Thu, 24 Nov 2016 07:45:56 +0000 (16:45 +0900)]
package: update version (2.6.11)
Change-Id: If1e22485f0054bdd81a88ebfc76e70421d190586
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Wed, 23 Nov 2016 05:59:52 +0000 (14:59 +0900)]
emul_state: choose vm_name specified in conf file
When "vm_name" that is specified in conf file is different from
image file name, we should choose "vm_name".
Change-Id: Ia234784142808bae787d12ac6d01377b14e4c2bc
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Sooyoung Ha [Wed, 2 Nov 2016 08:33:34 +0000 (17:33 +0900)]
9pfs: enable 9pfs on Windows and Macos
I modify the maru defined codes of 9pfs for applying qemu 2.7 upgrade.
Change-Id: I83abb46d97f07443f1337659f12da8afa1d8eb15
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
jihye [Thu, 17 Nov 2016 10:47:43 +0000 (19:47 +0900)]
screenshot: change button icons
Change-Id: Idc563dc37942826441e32109b83da0f8e37c3ed7
Signed-off-by: jihye <jihye424.kim@samsung.com>
jihye [Tue, 15 Nov 2016 07:38:31 +0000 (16:38 +0900)]
contextmenu: change menu icon
Change-Id: Ia4a8fe9c329cc382be65e8119b15627bc4cd13fe
Signed-off-by: jihye <jihye424.kim@samsung.com>
SeokYeon Hwang [Wed, 9 Nov 2016 05:57:46 +0000 (14:57 +0900)]
build: include "linuxboot_dma.bin"
QEMU 2.7 bootloader needs "linuxboot_dma.bin".
Change-Id: I0e968890480d824a3282705c7fffe0645a933b6b
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Wed, 9 Nov 2016 05:40:37 +0000 (14:40 +0900)]
maru_board: apply compat property for HAX
HAX cannot support virtio-pci modern (virtio 1.0) mode. So we use
legacy (virtio 0.9) mode for HAX.
Change-Id: I901590736f34e4d2d31ebd0bf41315882c7b6e83
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Sooyoung Ha [Tue, 4 Oct 2016 10:29:05 +0000 (19:29 +0900)]
hax: apply missing headers for build
This commit may not be built. Next commits are needed.
Change-Id: I03bb2c4b72b163c46a14e6085f53dbc21632ccf3
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
Jinhyung Jo [Fri, 11 Nov 2016 09:25:45 +0000 (18:25 +0900)]
display: fix off-guide image issues
The off-guide image does not scale and does not rotate
since "ui: reuse resource when it is reusable" commit has been applied.
Now showOffGuideImg() updates the geometry each time it is called.
And delete unnecessary code and clean up the off-guide image code.
The ancestor class of the QLabel, QWidget class, already has similar variable
and manipulation functions for the offGuideShown variable.
Change-Id: I5ae29e12ac2220842f312e3ae2d7cc0b19995d4c
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
SeokYeon Hwang [Wed, 9 Nov 2016 05:04:43 +0000 (14:04 +0900)]
Merge branch 'develop' into develop_qemu_2.7
Change-Id: If718c77de19a889746a25a2dd51881dce52ef4b4
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Thu, 3 Nov 2016 13:07:55 +0000 (22:07 +0900)]
hax: fix "hflags" synchronization problem
CPUState synchronization should be done after MSR_EFER is updated.
Change-Id: I904564896d64ec9c31137cd5f2c47738ef2b79fd
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Munkyu Im [Tue, 8 Nov 2016 02:31:06 +0000 (11:31 +0900)]
package: update version (2.6.10)
Change-Id: I507823d8044939815bfe443a1e2832da319d9363
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
Jinhyung Jo [Fri, 4 Nov 2016 02:46:47 +0000 (11:46 +0900)]
keyboard: change the function to use
QMap::take(const Key &key) is more efficient.
Short description for take():
"Removes the item with the key from the map
and returns the value associated with it."
For more information, see 'http://doc.qt.io/qt-5/qmap.html#take'.
And the value function is a constant function.
Change-Id: Ibdaf578c6eef49ebfa8beb3a00fc61785e4b74ed
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Munkyu Im [Tue, 1 Nov 2016 07:09:12 +0000 (16:09 +0900)]
emulator: modify VM lock
check whether vm_launch.conf file exist.
skip making lock file if it's failed to create.
Change-Id: I2073d752e7fca9dfcce137b6ac0b6ecffcc0d05d
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
SeokYeon Hwang [Thu, 3 Nov 2016 11:09:08 +0000 (20:09 +0900)]
yagl: sync with CPUState on HAX
CPUState should contain some special register and state not only KVM but
also HAX. Especially, "HF_LMA_MASK" on hflags is very important flag for
walking page table on 64bit environments.
Change-Id: I432804d684c009de0a7c79d560f5a869918bb1a5
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Thu, 3 Nov 2016 11:08:11 +0000 (20:08 +0900)]
hax: sync with recent updates
Some CPU state synchronization has been missing on HAX. So, some logics
are updated. This updates are refered to recent KVM sources and
Intel's updated sources.
Change-Id: I181a3c98076ab114575875f0f566e12db457e267
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Jinhyung Choi [Mon, 24 Oct 2016 06:36:22 +0000 (15:36 +0900)]
ecs: handle device capabilities
* capability values are set by emulator daemon
|-------| |-----| |---------|
| emuld | -------> | ECS | --------> | clients |
|-------| set |-----| result |---------|
* ECS stores the value and send it when ECP requests.
|-----| |-----| |---------|
| ECP | --------> | ECS | --------> | clients |
|-----| request |-----| result |---------|
check sensor & nfc device status additionally.
Change-Id: Icebefa564f0263afff0f0e1b139335c7c6f2ba3d
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
SeokYeon Hwang [Tue, 1 Nov 2016 00:58:25 +0000 (09:58 +0900)]
emulator: "--conf" should be first argument
"--conf" should be first argument. Do not proceed if it is not.
Print more kind usage if arguments are not valid.
Change-Id: Ifb62075f3b130974b4a54d5900289c66c772dabd
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Tue, 25 Oct 2016 02:27:12 +0000 (11:27 +0900)]
ui: reuse resource when it is reusable
Some resources are unique and reusable. So we do not "free" and
"new" them repeatedly.
Change-Id: I2c1c0c15b9162a9f0eed49ed209e7073a102d821
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Tue, 25 Oct 2016 02:21:23 +0000 (11:21 +0900)]
ui: move Qt5 clean-up codes inside main()
Qt5 resource clean-up in exit handler cause several unexpected
behaviors include segmentation fault. So it is moved inside
main() function, then clean-up is done before main function exit.
Change-Id: I4f53d531261f376de869e9c286bd700f9acbf726
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Munkyu Im [Tue, 25 Oct 2016 09:32:22 +0000 (18:32 +0900)]
package: update version (2.6.9)
Change-Id: Icfae54729c6e7b68e65f3933c790c936af6eca35
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
Munkyu Im [Tue, 25 Oct 2016 09:02:25 +0000 (18:02 +0900)]
net: fix checking tap device
nic[i]->peer value is null currently.
Change-Id: I4a4d4fcea1687ed1e924569b7321ef19f686c09f
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
SeokYeon Hwang [Tue, 25 Oct 2016 04:53:16 +0000 (13:53 +0900)]
emulator: tighten validation for conf file
Change-Id: Iaae354e0815a568a7685d430959e60f8e5b424b9
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Sooyoung Ha [Thu, 13 Oct 2016 13:09:18 +0000 (22:09 +0900)]
package: update version(2.6.8)
Change-Id: I53e6e26d189819c39611b321f1fe6d7448e7aa2c
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
Munkyu Im [Thu, 13 Oct 2016 13:18:30 +0000 (22:18 +0900)]
emulator: respawning when elevated
In order to prevent potential elevation of privilege attack, lower
privilege processes can't interfere with higher privilege on Windows.
Emulator is usually launched by emulator manager that has high integrity
level, then drag-and-drop from Explorer (mostly medium integrity level)
does not work.
So, when emulator process has elevated integrity level, we try to
respawn emulator with medium integrity level.
Change-Id: I17f29e411252758098304ba25b60219d07aa0d7c
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Jinhyung Jo [Tue, 11 Oct 2016 11:06:06 +0000 (20:06 +0900)]
util: modify backtrace feature for Windows
integrate the 32-bit & 64-bit implementation
Change-Id: I7540eeec080ba7fb3f10dcbba663dc4d677b8db9
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
Jinhyung Jo [Wed, 5 Oct 2016 08:12:21 +0000 (17:12 +0900)]
display: remove Qt::AA_X11InitThreads attribute
The Qt::AA_X11InitThreads attribute is obsolete and has no effect.
Change-Id: I6b0373b08e80b056f7f2a49700f4e07ade366a42
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Jinhyung Jo [Wed, 5 Oct 2016 06:22:40 +0000 (15:22 +0900)]
screenshot: fix abnormal exit issue
If user close the emulator that have opened screenshot dialog,
the emulator becomes abnormal termination.
Change-Id: I0da1eac81ed575c8e1b13270246158a254ea4813
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Jinhyung Jo [Wed, 5 Oct 2016 06:15:30 +0000 (15:15 +0900)]
display: change QMatrix to QTransform
QMatrix class that we use for 2D transformation is obsolete.
QTransform is the recommended transformation class in Qt.
Change-Id: Ib4361575ac8fc519c4947ad927b3fa58b506a3a3
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Jinhyung Jo [Wed, 5 Oct 2016 12:25:25 +0000 (21:25 +0900)]
package: update version(2.6.7)
Change-Id: I921963c6bc6feb7fd98a7d18bbbd4a5c9b76d2cc
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Jinhyung Jo [Mon, 19 Sep 2016 11:04:13 +0000 (20:04 +0900)]
util: improve backtrace feature
improve & clean up the code:
- correct coding convention
- add backtrace feature to Mac OS X
: remove #ifdef CONFIG_DARWIN ... #endif
The 'backtarce' family functions first appeared in Mac OS X 10.5
- modify the Windows code using the APIs in DbgHelp
- change debug channel: from debug_ch to new_debug_ch
- remove some lines like redundant/unclear/unwanted/etc.
- modify output form
Change-Id: I8b57d996fa9daabf990932fcfb82e45a5e453636
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Jinhyung Jo [Fri, 30 Sep 2016 12:14:32 +0000 (21:14 +0900)]
Revert "display: move display functionality to Qt5 GUI"
With AMD GPUs,
reverted commit makes a ciritical bug that GUI is invisible.
This reverts commit
99ffcba1997dade13316bd09023f93597db0f2df.
Conflicts:
tizen/src/ui/displayglwidget.cpp
tizen/src/ui/qt5_supplement.cpp
Change-Id: Ie5b4655bdf1beb228c788dd7dc874bb6f1cba63c
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Jinhyung Jo [Fri, 30 Sep 2016 11:47:28 +0000 (20:47 +0900)]
display: fix display rotation failure
The degree 0(90) & degree 180(270) have same size of display.
For that reason,
the resize event does not occur when the rotate angle is changed.
So update the status of the rotate & scale before drawing.
Change-Id: I2092a45ad60e65d4ee14ed8bb66def210b28cc68
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
jihye [Wed, 28 Sep 2016 02:49:10 +0000 (11:49 +0900)]
package: update version(2.6.6)
Change-Id: Ided4434d646ffe0aaf21e7f451567cb06d512d41
Signed-off-by: jihye <jihye424.kim@samsung.com>
Jinhyung Choi [Wed, 28 Sep 2016 02:34:55 +0000 (11:34 +0900)]
Merge "osutil: adjust vm lock module" into develop
jihye [Tue, 27 Sep 2016 04:39:48 +0000 (13:39 +0900)]
about dialog: remove ?(about) button
Change-Id: I0041d77d293b7149a93321df2349697055a1dc7a
Signed-off-by: jihye <jihye424.kim@samsung.com>
jihye [Mon, 26 Sep 2016 09:19:00 +0000 (18:19 +0900)]
about: change version from build version to platform version
Change-Id: I4095209a97b751f51ce7c9696a98202399892493
Signed-off-by: jihye <jihye424.kim@samsung.com>
Munkyu Im [Mon, 26 Sep 2016 09:14:21 +0000 (18:14 +0900)]
osutil: adjust vm lock module
- move it to an earlier time.(early launching time)
- make the same lock file(vm.lock) on each host OS.
Change-Id: I80744500bf7c25c536061d2952f7f6552a0406f1
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
jihye424.kim [Thu, 22 Sep 2016 04:20:07 +0000 (13:20 +0900)]
package: update version (2.6.5)
Change-Id: I2e9b643c64e385b24f417d008a2440d491b46300
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>
jihye424.kim [Wed, 21 Sep 2016 05:44:04 +0000 (14:44 +0900)]
detail dialog: temporarily remove shortcut info in mac
Change-Id: I5f2b6a8471699c963084e52e3ad0d499b37473c1
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>
SeokYeon Hwang [Wed, 21 Sep 2016 04:40:04 +0000 (13:40 +0900)]
ui: add missing "break" statement
Change-Id: Iff825869360222d3beaf3d158de5121c7537b1e9
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
jihye424.kim [Wed, 21 Sep 2016 02:09:40 +0000 (11:09 +0900)]
package: update version(2.6.4)
Change-Id: I05290052483fc021d074c4e0529fae937773e177
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>
Jinhyung Choi [Tue, 20 Sep 2016 04:23:05 +0000 (13:23 +0900)]
ecs: separate cli vm searching
cannot find vm between old and later version by ecp cli
- old version: 2.3, 2.3.1
- later version: 2.3.2, 2.4, 3.0
Change-Id: I6833c03063573cb1329c74fce77cdafab12a5e58
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
Minkee Lee [Mon, 12 Sep 2016 10:57:09 +0000 (19:57 +0900)]
ecp-launch: launch .app file in mac os x
In mac os x, launch ecp using 'open' command like following
# open emulator-control-panel.app --args [params ...]
Change-Id: I9dbf1246decd5ef01272cce18a8841b103e311b1
Signed-off-by: Minkee Lee <minkee.lee@samsung.com>
Jinhyung Jo [Mon, 19 Sep 2016 11:22:20 +0000 (20:22 +0900)]
display: fix transparency bug
If the alpha value of the color less than 1.0,
there is a issue that the desktop background is blended
on the offscreen mode. So fixed it.
Change-Id: Ic5c80aa7274a8ce6e9b433dc87e2581b0761619c
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
jihye424.kim [Tue, 20 Sep 2016 07:19:09 +0000 (16:19 +0900)]
detail dialog: remove ?(about) button
Change-Id: I26c70ba1b868b1a769a37cf973231dc764e78da7
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>
Munkyu Im [Mon, 12 Sep 2016 02:27:53 +0000 (11:27 +0900)]
net: use https_proxy as ecp parameter
Search box on location tab uses https protocol to communicate with map server.
To access to map server, need https_proxy value.
Change-Id: Ice4847644abc9939d4e7a5c16e10a224d66c5acd
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
SeokYeon Hwang [Mon, 12 Sep 2016 06:41:37 +0000 (15:41 +0900)]
Merge tag 'v2.7.0' into develop_qemu_2.7
v2.7.0 release
Change-Id: Id5feb5a9404ab064f9ea3d0aa0d95eef17020fa3
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Jinhyung Jo [Mon, 12 Sep 2016 05:29:16 +0000 (14:29 +0900)]
Merge branch 'features/newscreen' into develop
Conflicts:
tizen/src/ui/qt5_supplement.cpp
Change-Id: Icd310f98594684aa96142b1a7c1af767d3cb16c5
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Jinhyung Jo [Tue, 26 Jul 2016 07:45:42 +0000 (16:45 +0900)]
display: add initialization option
Add code to run with OpenGL Legacy Profile in Mac OS X.
Change-Id: I23967ccdd33d87d96df858460ceaa688b129d41e
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Jinhyung Jo [Wed, 22 Jun 2016 10:32:42 +0000 (19:32 +0900)]
display: move display functionality to Qt5 GUI
Qt5 GUI paints final display with all processing, not in VIGS.
The followings are in this commit.
- VIGS: remove the code about display rendering
- VIGS: modify the code about onscreen rendering server
- VIGS: add functions to delivery the texture id to Qt5 UI
- Qt5 UI: change the deprecated classes to the new classes
- Qt5 UI: add OpenGL rendering functionality
- Qt5 UI: fix the transparent issue with OpenGL
- Qt5 UI: bug fix caused by image formats
- etc. : minor modifications
Change-Id: I39471237b5d526751fac95e9fe88f05f6939142c
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Jinhyung Jo [Mon, 5 Sep 2016 09:52:34 +0000 (18:52 +0900)]
tablet: fix unexpected termination issue
'Null Pointer Dereference' occurs, the emulator dies unexpectedly.
It is caused by commit
f998ca30b51b5c549898763d4bd5041380a60416.
The committer have made a mistake when applying the virtio API modification.
The virtio API has been changed as follows:
previous: int virtqueue_pop(VirtQueue *vq, VirtQueueElement *elem)
current: void *virtqueue_pop(VirtQueue *vq, size_t sz)
Change-Id: I2c5a20c2741633f855ab0128f7e4dd989404b2b2
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Jinhyung Jo [Wed, 31 Aug 2016 08:30:50 +0000 (17:30 +0900)]
monitor: avoid clang shifting negative signed warning
clang 3.7.0 on x86_64 warns about the following:
target-i386/monitor.c:38:22: warning: shifting a negative signed value is
undefined [-Wshift-negative-value]
addr |= -1LL << 48;
~~~~ ^
Change-Id: I0885a0fbadc0273b09e58ef756fea34208ca7230
Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Vasiliy Ulyanov [Wed, 24 Aug 2016 12:12:32 +0000 (15:12 +0300)]
Revert "yagl: fix the display broken issue"
This reverts commit
fcc44797b6faa635424e142a10870370948ee57d.
Currently tizen 2.4 platform does not include the patches needed for 64
bit addresses support in yagl package. Until it is fixed, there is a
need to handle two host/target communication protocol versions at qemu
side. In order to avoid modification of autogenerated files, the
function yagl_transport_get_out_uintptr_t now takes care of different
pointer sizes.
In general, this patch does not completely fix the compatibility problem
with various platfrom versions. I.e. if more API calls are added, there
is a need to make sure they are appended at the end of the funcs array
and the existing calls preserve their ID numbers. Otherwise backward
compatibility will be broken.
Change-Id: I9bb3c118d44f46d72c87d90c08aa34b85d4ab008
Signed-off-by: Vasiliy Ulyanov <v.ulyanov@samsung.com>
Peter Maydell [Fri, 2 Sep 2016 12:44:11 +0000 (13:44 +0100)]
Update version for v2.7.0 release
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Sooyoung Ha [Tue, 16 Aug 2016 09:33:23 +0000 (18:33 +0900)]
virtio: rewrite with new virtio API
Change-Id: I935332a83e44f49ddb3fc5717b3da7a68b953e88
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
Peter Maydell [Tue, 30 Aug 2016 19:39:45 +0000 (20:39 +0100)]
Update version for v2.7.0-rc5 release
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Greg Kurz [Tue, 30 Aug 2016 15:02:27 +0000 (17:02 +0200)]
9pfs: handle walk of ".." in the root directory
The 9P spec at http://man.cat-v.org/plan_9/5/intro says:
All directories must support walks to the directory .. (dot-dot) meaning
parent directory, although by convention directories contain no explicit
entry for .. or . (dot). The parent of the root directory of a server's
tree is itself.
This means that a client cannot walk further than the root directory
exported by the server. In other words, if the client wants to walk
"/.." or "/foo/../..", the server should answer like the request was
to walk "/".
This patch just does that:
- we cache the QID of the root directory at attach time
- during the walk we compare the QID of each path component with the root
QID to detect if we're in a "/.." situation
- if so, we skip the current component and go to the next one
Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Greg Kurz [Tue, 30 Aug 2016 17:13:11 +0000 (19:13 +0200)]
9pfs: forbid . and .. in file names
According to the 9P spec http://man.cat-v.org/plan_9/5/open about the
create request:
The names . and .. are special; it is illegal to create files with these
names.
This patch causes the create and lcreate requests to fail with EINVAL if
the file name is either "." or "..".
Even if it isn't explicitly written in the spec, this patch extends the
checking to all requests that may cause a directory entry to be created:
- mknod
- rename
- renameat
- mkdir
- link
- symlink
The unlinkat request also gets patched for consistency (even if
rmdir("foo/..") is expected to fail according to POSIX.1-2001).
The various error values come from the linux manual pages.
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Greg Kurz [Tue, 30 Aug 2016 17:11:05 +0000 (19:11 +0200)]
9pfs: forbid illegal path names
Empty path components don't make sense for most commands and may cause
undefined behavior, depending on the backend.
Also, the walk request described in the 9P spec [1] clearly shows that
the client is supposed to send individual path components: the official
linux client never sends portions of path containing the / character for
example.
Moreover, the 9P spec [2] also states that a system can decide to restrict
the set of supported characters used in path components, with an explicit
mention "to remove slashes from name components".
This patch introduces a new name_is_illegal() helper that checks the
names sent by the client are not empty and don't contain unwanted chars.
Since 9pfs is only supported on linux hosts, only the / character is
checked at the moment. When support for other hosts (AKA. win32) is added,
other chars may need to be blacklisted as well.
If a client sends an illegal path component, the request will fail and
ENOENT is returned to the client.
[1] http://man.cat-v.org/plan_9/5/walk
[2] http://man.cat-v.org/plan_9/5/intro
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Peter Maydell [Tue, 30 Aug 2016 16:11:14 +0000 (17:11 +0100)]
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* pc-bios/optionrom/Makefile fix for -O0
* revert socket_connect change
# gpg: Signature made Tue 30 Aug 2016 15:36:59 BST
# gpg: using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
optionrom: cope with multiple -O options
Revert "Change net/socket.c to use socket_*() functions"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Paolo Bonzini [Tue, 30 Aug 2016 12:30:11 +0000 (14:30 +0200)]
optionrom: cope with multiple -O options
Reproducer:
CFLAGS="-g3 -O0" ./configure --target-list=aarch64-softmmu,arm-softmmu --enable-vhost-net --enable-virtfs
Here CFLAGS ends up with "-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ... -g3 -O0"
and pc-bios/optionrom/Makefile forgets to add the -O2 it needs.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Paolo Bonzini [Tue, 30 Aug 2016 12:04:12 +0000 (14:04 +0200)]
Revert "Change net/socket.c to use socket_*() functions"
Since commit
7e8449594c929, the socket connect code is blocking, because
calling socket_connect() without callback is blocking. This reverts the
commit.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Christian Borntraeger [Thu, 25 Aug 2016 18:11:26 +0000 (20:11 +0200)]
translate: early exit in tb_flush if there is no tcg
tb_flush does all kind of things, which are very tcg specific. As it
is called from some places even for KVM (e.g. gdb server) it is better
to detect these cases and do an early exit.
This also fixes a crash in the gdb server that was triggered by
commit
909eaac9bbc2 ("tb hash: track translated blocks with qht").
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Reported-by: Richard Henderson <rth@twiddle.net>
Reported-by: Brent Baccala <cosine@freesoft.org>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Message-id:
1472148686-39841-1-git-send-email-borntraeger@de.ibm.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Daniel P. Berrange [Tue, 16 Aug 2016 16:30:32 +0000 (17:30 +0100)]
ui: fix refresh of VNC server surface
In previous commit
commit
c7628bff4138ce906a3620d12e0820c1cf6c140d
Author: Gerd Hoffmann <kraxel@redhat.com>
Date: Fri Oct 30 12:10:09 2015 +0100
vnc: only alloc server surface with clients connected
the VNC server was changed so that the 'vd->server' pixman
image was only allocated when a client is connected.
Since then if a client disconnects and then reconnects to
the VNC server all they will see is a black screen until
they do something that triggers a refresh. On a graphical
desktop this is not often noticed since there's many things
going on which cause a refresh. On a plain text console it
is really obvious since nothing refreshes frequently.
The problem is that the VNC server didn't update the guest
dirty bitmap, so still believes its server image is in sync
with the guest contents.
To fix this we must explicitly mark the entire guest desktop
as dirty after re-creating the server surface. Move this
logic into vnc_update_server_surface() so it is guaranteed
to be call in all code paths that re-create the surface
instead of only in vnc_dpy_switch()
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Peter Lieven <pl@kamp.de>
Tested-by: Peter Lieven <pl@kamp.de>
Message-id:
1471365032-18096-1-git-send-email-berrange@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Peter Maydell [Wed, 24 Aug 2016 16:21:03 +0000 (17:21 +0100)]
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio: fixes
some bugfixes for virtio
balloon is still broken wrt migration
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Tue 23 Aug 2016 17:33:11 BST
# gpg: using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* remotes/mst/tags/for_upstream:
virtio: decrement vq->inuse in virtqueue_discard()
virtio: recalculate vq->inuse after migration
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Ed Maste [Mon, 22 Aug 2016 14:57:13 +0000 (10:57 -0400)]
Fix bsd-user build after
d915b7bb
Must include "qemu-version.h" for the QEMU_PKGVERSION definition.
Signed-off-by: Ed Maste <emaste@freebsd.org>
Message-id:
1471877833-52343-1-git-send-email-emaste@freebsd.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Stefan Hajnoczi [Mon, 15 Aug 2016 12:54:16 +0000 (13:54 +0100)]
virtio: decrement vq->inuse in virtqueue_discard()
virtqueue_discard() moves vq->last_avail_idx back so the element can be
popped again. It's necessary to decrement vq->inuse to avoid "leaking"
the element count.
Cc: qemu-stable@nongnu.org
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Stefan Hajnoczi [Mon, 15 Aug 2016 12:54:15 +0000 (13:54 +0100)]
virtio: recalculate vq->inuse after migration
The vq->inuse field is not migrated. Many devices don't hold
VirtQueueElements across migration so it doesn't matter that vq->inuse
starts at 0 on the destination QEMU.
At least virtio-serial, virtio-blk, and virtio-balloon migrate while
holding VirtQueueElements. For these devices we need to recalculate
vq->inuse upon load so the value is correct.
Cc: qemu-stable@nongnu.org
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
SeokYeon Hwang [Tue, 23 Aug 2016 06:42:16 +0000 (15:42 +0900)]
package: update version (2.6.3)
Change-Id: I69d103e682574fcb9b2b0198844d38834d3b3e5c
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Tue, 23 Aug 2016 06:38:51 +0000 (15:38 +0900)]
input: fix null pointer dereference before device realizing
Change-Id: Ic988464da57ab65509eb28ea53effd23c1e54d73
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Peter Maydell [Mon, 22 Aug 2016 14:29:41 +0000 (15:29 +0100)]
Update version for v2.7.0-rc4 release
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Peter Maydell [Mon, 22 Aug 2016 09:02:28 +0000 (10:02 +0100)]
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Mon 22 Aug 2016 09:06:32 BST
# gpg: using RSA key 0xEF04965B398D6211
# 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:
e1000e: remove internal interrupt flag
slirp: fix segv when init failed
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Cao jin [Thu, 18 Aug 2016 14:15:54 +0000 (22:15 +0800)]
e1000e: remove internal interrupt flag
Commit
66bf7d58 removed internal msi state flag E1000E_USE_MSI, E1000E_USE_MSIX
is not necessary too, remove it now. And interrupt flag field intr_state also
can be removed now.
CC: Dmitry Fleytman <dmitry@daynix.com>
CC: Jason Wang <jasowang@redhat.com>
CC: Markus Armbruster <armbru@redhat.com>
CC: Marcel Apfelbaum <marcel@redhat.com>
CC: Michael S. Tsirkin <mst@redhat.com>
CC: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Dmitry Fleytman <dmitry@daynix.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Marc-André Lureau [Thu, 18 Aug 2016 13:44:05 +0000 (17:44 +0400)]
slirp: fix segv when init failed
Since commit
f6c2e66ae8c8a, slirp uses an exit notifier to call
slirp_smb_cleanup. However, if init() failed, the notifier isn't added,
and removing it will fail:
==18447== Invalid write of size 8
==18447== at 0x7EF2B5: notifier_remove (notify.c:32)
==18447== by 0x48E80C: qemu_remove_exit_notifier (vl.c:2661)
==18447== by 0x6A2187: net_slirp_cleanup (slirp.c:134)
==18447== by 0x69419D: qemu_cleanup_net_client (net.c:338)
==18447== by 0x69445B: qemu_del_net_client (net.c:401)
==18447== by 0x6A2B81: net_slirp_init (slirp.c:366)
==18447== by 0x6A4241: net_init_slirp (slirp.c:865)
==18447== by 0x695C6D: net_client_init1 (net.c:1051)
==18447== by 0x695F6E: net_client_init (net.c:1108)
==18447== by 0x696DBA: net_init_netdev (net.c:1498)
==18447== by 0x7F1F99: qemu_opts_foreach (qemu-option.c:1116)
==18447== by 0x696E60: net_init_clients (net.c:1516)
==18447== Address 0x0 is not stack'd, malloc'd or (recently) free'd
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
SeokYeon Hwang [Mon, 22 Aug 2016 06:53:41 +0000 (15:53 +0900)]
package: update version (2.6.2)
Change-Id: I72e9e08a049f5a0059a662f2f171f1634e92526c
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Munkyu Im [Sat, 20 Aug 2016 08:07:32 +0000 (17:07 +0900)]
build: remove kvm module
It is moved to emulator-supplements package.
Change-Id: I6b4861e4ff9dd7117948fbe8d1f4be2ea4c0b2c7
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
Paolo Bonzini [Thu, 11 Dec 2014 01:17:03 +0000 (02:17 +0100)]
linuxboot: fix loading old kernels
Old kernels that used high memory only allowed the initrd to be in the
first 896MB of memory. If you load the initrd above, they complain
that "initrd extends beyond end of memory".
In order to fix this, while not breaking machines with small amounts
of memory fixed by cdebec5 (linuxboot: compute initrd loading address,
2014-10-06), we need to distinguish two cases. If pc.c placed the
initrd at end of memory, use the new algorithm based on the e801
memory map. If instead pc.c placed the initrd at the maximum address
specified by the bzImage, leave it there.
The only interesting part is that the low-memory info block is now
loaded very early, in real mode, and thus the 32-bit address has
to be converted into a real mode segment. The initrd address is
also patched in the info block before entering real mode, it is
simpler that way.
This fixes booting the RHEL4.8 32-bit installation image with 1GB
of RAM.
Cc: qemu-stable@nongnu.org
Cc: mst@redhat.com
Cc: jsnow@redhat.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit
269e2358492b674c50160553d037702e916b9f1b)
Change-Id: I0f461f04c0a7f97dc23dc7436f98a90ac3812a20
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
Sascha Silbe [Thu, 18 Aug 2016 18:46:03 +0000 (20:46 +0200)]
test-logging: don't hard-code paths in /tmp
Since
f6880b7f [qemu-log: support simple pid substitution for logs],
test-logging creates files with hard-coded names in /tmp. In the best
case, this prevents multiple developers from running "make check" on
the same machine. In the worst case, it allows for symlink attacks,
enabling an attacker to overwrite files that are writable to the
developer running "make check".
Instead of hard-coding the paths, create a temporary directory using
g_dir_make_tmp() and clean it up afterwards.
Fixes:
f6880b7f ("qemu-log: support simple pid substitution for logs")
Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
Message-id:
1471545963-11720-3-git-send-email-silbe@linux.vnet.ibm.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Sascha Silbe [Thu, 18 Aug 2016 18:46:02 +0000 (20:46 +0200)]
glib: add compatibility implementation for g_dir_make_tmp()
We're going to make use of g_dir_make_tmp() in test-logging. Provide a
compatibility implementation of it for glib < 2.30.
May behave differently in some edge cases (e.g. pattern only at the
end of the template, the file name is not part of the error message),
but good enough in practice.
Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
Message-id:
1471545963-11720-2-git-send-email-silbe@linux.vnet.ibm.com
[PMM: removed variable "template" which caused compilation failures
when C++ files include glib-compat.h]
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Michal Privoznik [Fri, 19 Aug 2016 08:06:40 +0000 (10:06 +0200)]
syscall.c: Redefine IFLA_* enums
In
9c37146782 I've tried to fix a broken build with older
linux-headers. However, I didn't do it properly. The solution
implemented here is to grab the enums that caused the problem
initially, and rename their values so that they are "QEMU_"
prefixed. In order to guarantee matching values with actual
enums from linux-headers, the enums are seeded with starting
values from the original enums.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-id:
75c14d6e8a97c4ff3931d69c13eab7376968d8b4.
1471593869.git.mprivozn@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Michal Privoznik [Fri, 19 Aug 2016 08:06:39 +0000 (10:06 +0200)]
Revert "syscall.c: Fix build with older linux-headers"
The fix I've made there was wrong. I mean, basically what I did
there was equivalent to:
#if 0
some code;
#endif
This reverts commit
9c37146782e7850877d452da47dc451ba73aa62d.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-id:
40d61349e445c1ad5fef795da704bf7ed6e19c86.
1471593869.git.mprivozn@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
projects / sdk / emulator / qemu.git / log