SeokYeon Hwang [Wed, 10 Jul 2013 04:38:57 +0000 (13:38 +0900)]
Merge "emulator: modified error popup message" into tizen_qemu_1.5.1
GiWoong Kim [Wed, 10 Jul 2013 04:14:12 +0000 (13:14 +0900)]
emulator: modified error popup message
modified error popup message when emulator failed to
load a bios file.
Change-Id: I6b9d1d8e824dca37b387d9afd36c534fff4fb3c9
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
Kitae Kim [Wed, 10 Jul 2013 04:38:37 +0000 (13:38 +0900)]
maru_usb_touchsreen: removed compile warings.
Change-Id: Ie2ef3f461930e68058427bf46201d12b0e40da1a
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
Kitae Kim [Wed, 10 Jul 2013 04:35:11 +0000 (13:35 +0900)]
virtio-esm: removed unnecessary macro and structure.
Change-Id: I1c7ab90bdac6c9db61d6e6b651d83c11e05a5ad3
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
Sangjin Kim [Wed, 10 Jul 2013 03:15:14 +0000 (12:15 +0900)]
virtio-gl: Additional merge of virtio-gl.
Change-Id: I94dfd1368fc48a191aaf477ee95cb8c6f7488db8
Signed-off-by: Sangjin Kim <sangjin3.kim@samsung.com>
SeokYeon Hwang [Wed, 10 Jul 2013 02:57:27 +0000 (11:57 +0900)]
Enhancement API for PCI hot-plugging.
Change-Id: I3bd792abd1e5c01a1b5ac768339f4740a8009580
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Wed, 10 Jul 2013 02:42:36 +0000 (11:42 +0900)]
Merge "maru_sdl_rotozoom : Remove unused rotozoom files" into tizen_qemu_1.5.1
SeokYeon Hwang [Wed, 10 Jul 2013 02:42:22 +0000 (11:42 +0900)]
Merge "touch: usb touchscreen are excluded" into tizen_qemu_1.5.1
GiWoong Kim [Wed, 10 Jul 2013 02:29:25 +0000 (11:29 +0900)]
touch: usb touchscreen are excluded
usb touchscreen are excluded from Makefile
Change-Id: I8fc0954d517d2a99303a065af3e15e431a297f47
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
sungmin ha [Wed, 10 Jul 2013 02:48:51 +0000 (11:48 +0900)]
virtio-hwkey, virtio-keyboard: modified for 1.5.1 upgrade
Change-Id: I17fa1c1cb25c827e0bc82828eda2883e5c8ff947
Signed-off-by: Sungmin Ha <sungmin82.ha@samsung.com>
jinhyung.jo [Wed, 10 Jul 2013 02:20:58 +0000 (11:20 +0900)]
maru_sdl_rotozoom : Remove unused rotozoom files
Remove unused maru_sdl_rotozoom.h and SDL_gfx dir.
Now, scaling & rotation processing use the pixman library.
Change-Id: I3b1617c1c64e8f5522e034a860d7b5aa31554627
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Kitae Kim [Wed, 10 Jul 2013 01:42:02 +0000 (10:42 +0900)]
virtio-pci: modified instance size of virtio-gl-pci.
Change-Id: I833564a47e29984ceb3a934ca0b78a01f902e057
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
Sangjin Kim [Tue, 9 Jul 2013 13:43:20 +0000 (22:43 +0900)]
virtio-gl: merge virtio-gl device.
Change-Id: I62f3713c03e12c4c7c5964aeb1b212fb3ae0cb98
Signed-off-by: Sangjin Kim <sangjin3.kim@samsung.com>
SeokYeon Hwang [Tue, 9 Jul 2013 13:15:27 +0000 (22:15 +0900)]
Fix compilation warning.
Change-Id: I6bc8320531ed3ddd20fc58cdbde6479859ca6085
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Tue, 9 Jul 2013 13:12:15 +0000 (22:12 +0900)]
Disable arm build by default.
Change-Id: I8ae9faeb3d6347635760018fdd368879b6775d2e
SeokYeon Hwang [Tue, 9 Jul 2013 13:00:06 +0000 (22:00 +0900)]
Merge "virtio-esm: merged virtio-esm." into tizen_qemu_1.5.1
SeokYeon Hwang [Tue, 9 Jul 2013 13:09:29 +0000 (22:09 +0900)]
Merging......
Change-Id: I69779db2bca37a79a5ed95f89cbeb7dec0fae072
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Kitae Kim [Tue, 9 Jul 2013 13:09:09 +0000 (22:09 +0900)]
virtio-esm: merged virtio-esm.
Change-Id: I16023c102e0cd56b0ae852519521d31f0a52f58a
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
SeokYeon Hwang [Tue, 9 Jul 2013 12:46:42 +0000 (21:46 +0900)]
Merge "touchscreen: added virtio_touchscreen_class_init" into tizen_qemu_1.5.1
GiWoong Kim [Tue, 9 Jul 2013 12:54:45 +0000 (21:54 +0900)]
touchscreen: added virtio_touchscreen_class_init
Change-Id: I9d22018adf7649d7db05ccc191fec903a6c5dabc
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
SeokYeon Hwang [Tue, 9 Jul 2013 12:29:21 +0000 (21:29 +0900)]
Merge "virtio-hwkey: modified for 1.5.1 upgrade" into tizen_qemu_1.5.1
sungmin ha [Tue, 9 Jul 2013 12:29:40 +0000 (21:29 +0900)]
virtio-hwkey: modified for 1.5.1 upgrade
Change-Id: Ic543505601fe55d0f73a654173b53cdb19ba6136
Signed-off-by: Sungmin Ha <sungmin82.ha@samsung.com>
Kitae Kim [Tue, 9 Jul 2013 12:27:44 +0000 (21:27 +0900)]
emulator: removed compile warnings.
Change-Id: I6851ad5d1afadba3824118b4c1327ceff90fe7c4
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
jinhyung.jo [Tue, 9 Jul 2013 12:11:07 +0000 (21:11 +0900)]
maru_vga : remove modlue
This modlue is no more needed.
Change-Id: I285382299f1be3872a6191087f45b982b6e1ceb6
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
jinhyung.jo [Tue, 9 Jul 2013 11:46:15 +0000 (20:46 +0900)]
display : modified the display sources
modified the source to allow the changed display structure
Change-Id: Iea72e612e5cb19edf1fab4080354f29a064036e5
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
SeokYeon Hwang [Tue, 9 Jul 2013 10:51:04 +0000 (19:51 +0900)]
Merge "virtio-pci: modified from TYPE_PCI_DEVICE to TYPE_VIRTIO_PCI." into tizen_qemu_1.5.1
SeokYeon Hwang [Tue, 9 Jul 2013 10:42:08 +0000 (19:42 +0900)]
Merge "merge maru_pm.c" into tizen_qemu_1.5.1
Sangjin Kim [Tue, 9 Jul 2013 09:03:43 +0000 (18:03 +0900)]
Merge changes I1466e2f7,I16959c44 into tizen_qemu_1.5.1
* changes:
merge maruskin_operation.c & maruskin_keymap.c
merge maru_virtio_touchscreen.c temporarily
sungmin ha [Tue, 9 Jul 2013 09:08:34 +0000 (18:08 +0900)]
virtio-keyboard: modified for 1.5.1 upgrade
Change-Id: I8e04c569750c16f3e819941974ba2f67f870c197
Signed-off-by: Sungmin Ha <sungmin82.ha@samsung.com>
Kitae Kim [Tue, 9 Jul 2013 08:56:24 +0000 (17:56 +0900)]
virtio-pci: modified from TYPE_PCI_DEVICE to TYPE_VIRTIO_PCI.
Those macro is required to register each device to pci-bus.
Change-Id: I43541a8f38426afc6a994a4429fa5a06ce6c1474
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
jihye kim [Tue, 9 Jul 2013 08:43:45 +0000 (17:43 +0900)]
merge maru_pm.c
Signed-off-by: jihye kim <jihye1128.kim@samsung.com>
GiWoong Kim [Tue, 9 Jul 2013 08:35:12 +0000 (17:35 +0900)]
merge maruskin_operation.c & maruskin_keymap.c
Change-Id: I1466e2f7306f2cf674f818e40eaf8c37050b401e
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
GiWoong Kim [Tue, 9 Jul 2013 08:14:50 +0000 (17:14 +0900)]
merge maru_virtio_touchscreen.c temporarily
Change-Id: I16959c443e132b4777f9729c15300865f73c592b
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
SeokYeon Hwang [Tue, 9 Jul 2013 07:50:39 +0000 (16:50 +0900)]
Merge "Merging....." into tizen_qemu_1.5.1
SeokYeon Hwang [Tue, 9 Jul 2013 08:01:50 +0000 (17:01 +0900)]
Merging.....
Change-Id: I01a183cc782d5266abc1bf782a5ac86bc2f4b3dd
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Kitae Kim [Tue, 9 Jul 2013 07:41:16 +0000 (16:41 +0900)]
virtio: removed previous virtio modules.
Change-Id: Ie34a7dcea9a0f607a05437ed30f9b6f9d5fb1c23
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
Kitae Kim [Tue, 9 Jul 2013 07:09:18 +0000 (16:09 +0900)]
virtio-pci: merged virtio-pci module and others.
Change-Id: I11b764cd55316377cffd96a6ea77d5590d43b3d6
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
SeokYeon Hwang [Tue, 9 Jul 2013 06:55:39 +0000 (15:55 +0900)]
Merge "merge input.c" into tizen_qemu_1.5.1
GiWoong Kim [Tue, 9 Jul 2013 06:51:28 +0000 (15:51 +0900)]
merge input.c
Change-Id: Iaf9ffcbb6418c25cf934a04493d61b72d0b9977c
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
jinhyung.jo [Tue, 9 Jul 2013 06:38:27 +0000 (15:38 +0900)]
Merging : merge the maru_camera files
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
SeokYeon Hwang [Tue, 9 Jul 2013 05:48:29 +0000 (14:48 +0900)]
Merging....
Change-Id: Ic464b6e1b0a1039a56d9db5ed7cbe8338cc7e80f
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Tue, 9 Jul 2013 05:23:01 +0000 (14:23 +0900)]
Merging...
Change-Id: I9446bb9dc49d36b9f07a05ff12fadc8d45a48884
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Tue, 9 Jul 2013 04:04:58 +0000 (13:04 +0900)]
Merging...
Change-Id: I8faa7608115d79f4ecc75da0fe2de21d8f1c2b26
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
jinhyung.jo [Mon, 8 Jul 2013 07:18:03 +0000 (16:18 +0900)]
merge some files, and delete some duplicated files
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
jinhyung.jo [Thu, 4 Jul 2013 06:17:05 +0000 (15:17 +0900)]
Merge vl.c
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
SeokYeon Hwang [Thu, 4 Jul 2013 05:27:00 +0000 (14:27 +0900)]
Merge "Merge exec.c" into tizen_qemu_1.5.1
SeokYeon Hwang [Thu, 4 Jul 2013 05:37:38 +0000 (14:37 +0900)]
Merge exec.c
Change-Id: Ia7f1c7cd2310db10bb7bbbabd1b9f8f0a14c9d27
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Thu, 4 Jul 2013 05:29:02 +0000 (14:29 +0900)]
Merge some conflicts
Change-Id: Ifbd26ccbfa77a2beba870907a626771b45b0580a
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Thu, 4 Jul 2013 05:18:11 +0000 (14:18 +0900)]
Merge "Merge some conflicts" into tizen_qemu_1.5.1
Kitae Kim [Thu, 4 Jul 2013 05:01:21 +0000 (14:01 +0900)]
merge and resolve soucre conflicts.
Change-Id: I51a12628b4b36c5756988221e9f3cf411ff3c822
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
SeokYeon Hwang [Thu, 4 Jul 2013 04:16:49 +0000 (13:16 +0900)]
Merge some files
Change-Id: Icacfd942bbdef1d5c57a50e3c7a4df756ac6d874
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Thu, 4 Jul 2013 03:29:33 +0000 (12:29 +0900)]
Merge coflicts related with QEMU build
Change-Id: Ied530b6f41979f4b1b2eda77e62fbca4779cbd01
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Wed, 3 Jul 2013 01:42:41 +0000 (10:42 +0900)]
emulator: remove conflicts in qemu-options
remove conflicts in qemu-options
Change-Id: Ic38e2af2884cfa33f46d6870c9ed5dc84d8b744b
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
Sangjin Kim [Wed, 3 Jul 2013 01:53:35 +0000 (10:53 +0900)]
configure: Merge qemu 1.5.1 main branch to tizen.
Merge qemu 1.5.1 main branch to tizen except librt check.
Change-Id: I2229995f62e342910ebda77393ddfb82d6cfc834
Signed-off-by: Sangjin Kim <sangjin3.kim@samsung.com>
sungmin ha [Tue, 2 Jul 2013 10:48:24 +0000 (19:48 +0900)]
qemu1.5.1: remove conflicts to merge
Signed-off-by: Sungmin Ha <sungmin82.ha@samsung.com>
test [Tue, 2 Jul 2013 08:51:55 +0000 (17:51 +0900)]
Merge 'qemu 1.5.1' into tizen_qemu_1.5.1
Conflicts:
Makefile
arch_init.h
block/raw-win32.c
blockdev.c
configure
console.h
cpu-defs.h
cpu-exec.c
cpus.c
default-configs/arm-softmmu.mak
exec-all.h
exec.c
fpu/softfloat.h
hw/9pfs/virtio-9p-device.c
hw/Makefile.objs
hw/acpi_piix4.c
hw/apic_common.c
hw/arm/Makefile.objs
hw/exynos4210.c
hw/exynos4210.h
hw/exynos4210_fimd.c
hw/exynos4210_gic.c
hw/exynos4210_uart.c
hw/pc.c
hw/pc_sysfw.c
hw/pci-hotplug.c
hw/pci.c
hw/pci.h
hw/pl050.c
hw/ps2.c
hw/qdev-properties.c
hw/qdev.c
hw/qdev.h
hw/vga-pci.c
hw/vga-pci.h
hw/vga_int.h
hw/virtio-balloon.c
hw/virtio-balloon.h
hw/virtio-blk.c
hw/virtio-blk.h
hw/virtio-net.c
hw/virtio-net.h
hw/virtio-pci.c
hw/virtio-pci.h
hw/virtio-serial-bus.c
hw/virtio-serial.h
hw/virtio.c
hw/virtio.h
input.c
kvm.h
main-loop.c
main-loop.h
os-win32.c
oslib-posix.c
oslib-win32.c
qemu-char.c
qemu-options.hx
qemu-sockets.c
softmmu_defs.h
softmmu_template.h
sysemu.h
tcg/i386/tcg-target.c
tcg/tcg.c
tcg/tcg.h
vl.c
test [Tue, 2 Jul 2013 08:30:26 +0000 (17:30 +0900)]
Merge branch 'develop' into tizen_qemu_1.5.1
jinhyung.jo [Tue, 2 Jul 2013 04:21:45 +0000 (13:21 +0900)]
display : reduce the spend-time when the display rotate/scale.(for SDL method)
remove unnecessary realloc routine for the display surface.
modified to create the SDL surface before send a event to emuld.
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
GiWoong Kim [Mon, 1 Jul 2013 06:56:03 +0000 (15:56 +0900)]
display: disable the request for additional updating
disable the request for additional updating of sdl display
while skipping of framebuffer drawing
Change-Id: I2aa7db664894cc61dcbee4985797219136fd234c
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
GiWoong Kim [Mon, 1 Jul 2013 05:43:12 +0000 (14:43 +0900)]
package: version up
1.5.61
Change-Id: I1e6175ffb3d4a1eb6a03e878f198e62ec1e8229f
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
GiWoong Kim [Sat, 29 Jun 2013 13:09:39 +0000 (22:09 +0900)]
skin: cancel a scrollbar timer
cancel a scrollbar timer
Change-Id: I669425cdb2e3dc6eac47d6a6f9f5ece9cc27cabd
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
GiWoong Kim [Sat, 29 Jun 2013 02:46:22 +0000 (11:46 +0900)]
package: version up
1.5.59
Change-Id: I4b98b01a6fe29e4517c69eb7b33f1a57dd6d0bf3
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
giwoong.kim [Thu, 27 Jun 2013 12:53:27 +0000 (21:53 +0900)]
touch: added virtio config function
added virtio config function to touchscreen device
Change-Id: I06598cb488de672dcd78c8404a2d0d4ef0c46d93
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
munkyu.im [Fri, 28 Jun 2013 09:14:05 +0000 (18:14 +0900)]
sdb: remove notifying to sdb server
not qemu but sdb daemon will notify to sdb server
Signed-off-by: munkyu.im <munkyu.im@samsung.com>
giwoong.kim [Thu, 27 Jun 2013 03:43:07 +0000 (12:43 +0900)]
skin: Set the background color of the shaft
Set the background color of the shaft in CustomScrollBar
Change-Id: I0e4c14d7bb8eeb24d287d42af73984adab6b4854
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
Anthony Liguori [Wed, 26 Jun 2013 21:46:50 +0000 (16:46 -0500)]
Update VERSION for 1.5.1 release
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
giwoong.kim [Wed, 26 Jun 2013 03:03:10 +0000 (12:03 +0900)]
keyboard: keep the multi-touching when rotation
keep the multi-touching when rotation
Change-Id: Ic5823bae8bcc013ddfa28fd4322debced7b2bced
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
munkyu.im [Tue, 25 Jun 2013 08:47:59 +0000 (17:47 +0900)]
shm: remove unnecessary code
Signed-off-by: munkyu.im <munkyu.im@samsung.com>
giwoong.kim [Mon, 24 Jun 2013 06:15:35 +0000 (15:15 +0900)]
package: version up
1.5.56
Change-Id: Ia2953d263fa98ab5e85a473c72175743b1d8de9a
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
giwoong.kim [Mon, 24 Jun 2013 05:09:46 +0000 (14:09 +0900)]
skin: added long press handler to CustomScrollBar
added long press handler to CustomScrollBar
Change-Id: I392a5e118f173166441cbc1d06939fde09bbf527
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
giwoong.kim [Fri, 21 Jun 2013 10:16:05 +0000 (19:16 +0900)]
skin: apply a custom scrollbar to KeyWindow
apply a custom scrollbar to KeyWindow
Change-Id: I11ae94b0593be6b94bdc680d01d1195635203e06
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
giwoong.kim [Thu, 20 Jun 2013 05:46:30 +0000 (14:46 +0900)]
skin: modified default skin path
modified default skin path for qemu args
Change-Id: I6b5856d57e349c14c5b7f1f825f67f9607a0445d
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
giwoong.kim [Thu, 20 Jun 2013 05:34:44 +0000 (14:34 +0900)]
emulator: registered the .project file in gitignore
registered the .project file in gitignore list
Change-Id: Ia10fc0412fe58632105f6b71cd30ff1d9deabae8
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
giwoong.kim [Thu, 20 Jun 2013 04:23:33 +0000 (13:23 +0900)]
skin: change the default skin type
general purpose skin 1btn -> 3btn
Change-Id: I61401d1844c397f42ac675c09189334535a55b77
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
giwoong.kim [Thu, 20 Jun 2013 04:16:00 +0000 (13:16 +0900)]
skin: hide the set of 1btn skin type from Manager
hide the set of 1btn skin type from Emulator Manager
Change-Id: Iaf6fb75b28a6294b3066c472d534ebae80a0ce2a
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
munkyu.im [Thu, 20 Jun 2013 02:38:31 +0000 (11:38 +0900)]
tizen: fix emulator name is showing unknown
Fix that Emulator name in showing unknown in connection
explorer after restarting IDE
Signed-off-by: munkyu.im <munkyu.im@samsung.com>
giwoong.kim [Wed, 19 Jun 2013 01:22:51 +0000 (10:22 +0900)]
package: version up
1.5.52
Change-Id: I9fb83de52ee1ef92d95f0cf5f4477f3cfa6db005
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
Michael Roth [Wed, 22 May 2013 16:32:51 +0000 (11:32 -0500)]
wdt_i6300esb: fix vmstate versioning
When this VMSD was introduced it's version fields were set to
sizeof(I6300State), making them essentially random from build to build,
version to version.
To fix this, we lock in a high version id and low minimum version id to
support old->new migration from all prior versions of this device's
state. This should work since the device state has not changed since
its introduction.
The potentially breaks migration from 1.5+ to 1.5, but since the
versioning was essentially random prior to this patch, new->old
migration was not consistently functional to begin with.
Reported-by: Nicholas Thomas <nick@bytemark.co.uk>
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-stable@nongnu.org
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit
c1990468d5a13c8f1d9111fcca0a78a6adad062b)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Cole Robinson [Fri, 31 May 2013 18:12:48 +0000 (14:12 -0400)]
virtio-rng: Fix crash with non-default backend
'default_backend' isn't always set, but 'rng' is, so use that.
$ ./x86_64-softmmu/qemu-system-x86_64 -object rng-random,id=rng0,filename=/dev/random -device virtio-rng-pci,rng=rng0
Segmentation fault (core dumped)
Regressed with virtio refactoring in
59ccd20a9ac719cff82180429458728f03ec612f
CC: qemu-stable@nongnu.org
Signed-off-by: Cole Robinson <crobinso@redhat.com>
Acked-by: Amit Shah <amit.shah@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Message-id:
bf4505014a0a941dbd3c62068f3cf2c496b69e6a.
1370023944.git.crobinso@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit
5b456438f5bb395ed6b1eec95e18ce7a7a884a0a)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Paolo Bonzini [Fri, 31 May 2013 11:56:24 +0000 (13:56 +0200)]
iscsi: reorganize iscsi_readcapacity_sync
Avoid the goto, and use the same retry logic for the 10- and 16-
byte versions.
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit
1288844e7c4ede59509bf697a4cca0f2215a1ce3)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Paolo Bonzini [Fri, 31 May 2013 11:47:08 +0000 (13:47 +0200)]
iscsi: simplify freeing of tasks
Always free them in the iscsi_aio_*_acb functions and remove the
checks in their callers. Remove ifs when the task struct was
previously dereferenced (spotted by Coverity).
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit
f0d2a4d4d63dd2f0f3ecb2d591b979b0e7f24a22)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Stefan Hajnoczi [Thu, 30 May 2013 14:14:44 +0000 (16:14 +0200)]
vhost-scsi: fix k->set_guest_notifiers() NULL dereference
Coverity picked up a copy-paste bug. In vhost_scsi_start() we check for
!k->set_guest_notifiers and error out. The check probably got copied
but instead of erroring we actually use the function pointer!
Cc: Nicholas Bellinger <nab@linux-iscsi.org>
Cc: Asias He <asias@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit
0e22a2d18998fd183c8181663981eb681ca977e9)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Pavel Hrdina [Wed, 29 May 2013 13:47:23 +0000 (15:47 +0200)]
scsi-disk: scsi-block device for scsi pass-through should not be removable
This patch adds a new SCSI_DISK_F_NO_REMOVABLE_DEVOPS feature. By this
feature we can set that the scsi-block (scsi pass-through) device will still
be removable from the guest side, but from monitor it cannot be removed.
Cc: qemu-stable@nongnu.org
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit
18e673b8f350e1d789b8a50d209eb4a4252ebbda)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Pavel Hrdina [Wed, 29 May 2013 12:12:10 +0000 (14:12 +0200)]
scsi-generic: check the return value of bdrv_aio_ioctl in execute_command
This fixes the bug introduced by this commit
ad54ae80c73f.
The bdrv_aio_ioctl() still could return null and we should return an error
in that case.
Cc: qemu-stable@nongnu.org
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit
d836f8d35dc418e24c3b11e2ea67d361b867b650)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Paolo Bonzini [Tue, 21 May 2013 12:08:53 +0000 (14:08 +0200)]
scsi-generic: fix sign extension of READ CAPACITY(10) data
Issuing the READ CAPACITY(10) command in the guest will cause QEMU
to update its knowledge of the maximum accessible LBA in the disk.
The recorded maximum LBA will be wrong if the disk is bigger than
1TB, because ldl_be_p returns a signed int.
When this is fixed, a latent bug will be unmasked. If the READ
CAPACITY(10) command reported an overflow (0xFFFFFFFF), we must
not overwrite the previously-known maximum accessible LBA, or the guest
will fail to access the disk above the first 2TB.
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit
53254e569f8e07501f3e0098bd57d2b780e52faa)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Pavel Hrdina [Mon, 20 May 2013 11:06:47 +0000 (13:06 +0200)]
scsi: reset cdrom tray statuses on scsi_disk_reset
Tray statuses should be also reset. Some guests may lock the tray and
right after resetting the guest it should be unlocked and closed. This
is done on power-on, reset and resume from suspend/hibernate on bare-metal.
This fix is already committed for IDE CD.
Check the commit
a7f3d65b65b8c86a5ff0c0abcfefb45e2ec6fe4c.
Test results on bare-metal:
- on reset/power-on the CD-ROM tray is closed even before the monitor
is turned on
- on resume from suspend/hibernate the tray is also closed before
the monitor is turned on
From test results it seems that this behavior is OS and probably BIOS
independent.
Cc: qemu-stable@nongnu.org
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit
7721c7f7c272fd2ed9d58500b7e99c33ab8a1af1)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Ján Tomko [Mon, 3 Jun 2013 15:54:56 +0000 (17:54 +0200)]
nbd: strip braces from literal IPv6 address in URI
Otherwise they would get passed to getaddrinfo and fail with:
address resolution failed for [::1]:1234: Name or service not known
(Broken by commit
v1.4.0-736-gf17c90b)
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit
23307908790cd8fad91220863d7712c571ddc977)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Ján Tomko [Mon, 3 Jun 2013 15:54:55 +0000 (17:54 +0200)]
qemu-socket: allow hostnames starting with a digit
According to RFC 1123 [1], hostnames can start with a digit too.
[1] http://tools.ietf.org/html/rfc1123#page-13
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Cc: qemu-stable@nongnu.org
[Use strspn, not strcspn. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit
391b7b9701ba3318e890ec0cba97a3c654bfa667)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
SeokYeon Hwang [Tue, 18 Jun 2013 08:16:15 +0000 (17:16 +0900)]
Modify the method of look-up loopback interface sophisticatedly.
Change-Id: I83ff19a1bfc32de5f70b22ca9ce09cc3b8ec5dde
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
giwoong.kim [Tue, 18 Jun 2013 10:14:05 +0000 (19:14 +0900)]
skin: The negative bounds of monitor is considered
The negative bounds of monotor is considered
for window position
Change-Id: Ia1dc7a658aa5bdc2a25a5f97fbc4c5bb052b23cd
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
giwoong.kim [Tue, 18 Jun 2013 08:08:56 +0000 (17:08 +0900)]
skin: position correction for emulator window
To prevent a emulator window vanishing from monitor,
Emulator modifies its window position itself after
rotating or resizing.
Change-Id: I48550d084a86dcca7a12a028900cbd4765bcaf44
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
Stefan Hajnoczi [Mon, 10 Jun 2013 09:07:33 +0000 (11:07 +0200)]
vmdk: byteswap VMDK4Header.desc_offset field
Remember to byteswap VMDK4Header.desc_offset on big-endian machines.
Cc: qemu-stable@nongnu.org
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit
5a394b9e96eb3c39676353bdf8a230180ae8d6f4)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Igor Mammedov [Mon, 3 Jun 2013 16:23:27 +0000 (18:23 +0200)]
target-i386: cpu: Fix potential buffer overrun in get_register_name_32()
Spotted by Coverity,
x86_reg_info_32[] is CPU_NB_REGS32 elements long, so accessing
x86_reg_info_32[CPU_NB_REGS32] will be one element off array.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: liguang <lig.fnst@cn.fujitsu.com>
Reviewed by: Jesse Larrew <jlarrew@linux.vnet.ibm.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
(cherry picked from commit
31ccdde298d98b08526dc23059071c9086dec6c2)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Igor Mammedov [Thu, 30 May 2013 15:09:34 +0000 (17:09 +0200)]
pc: Fix crash when attempting to hotplug CPU with negative ID
QMP command "{ 'execute': 'cpu-add', 'arguments': { 'id': -1 }}" may cause
QEMU SIGSEGV at:
piix4_cpu_hotplug_req ()
...
g->sts[cpu_id / 8] |= (1 << (cpu_id % 8));
...
Since for PC in current implementation id should be in range [0...maxcpus)
and maxcpus is already checked, add check for lower bound and error out
on incorrect value.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
(cherry picked from commit
8de433cb0820dc1f387a2d580d255744aacd60cc)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Markus Armbruster [Fri, 7 Jun 2013 13:00:36 +0000 (15:00 +0200)]
smbios: Check R in -smbios type=0, release=R parses okay
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Laszlo "ever the optimist" Ersek <lersek@redhat.com>
Message-id:
1370610036-10577-7-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit
6e5c4540d18d1e9a5253104df161a7e0d408ca95)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Markus Armbruster [Fri, 7 Jun 2013 13:00:35 +0000 (15:00 +0200)]
smbios: Fix -smbios type=0, release=... for big endian hosts
Classic endianness bug due to careless dirty coding: assuming reading
a byte from an int variable gets the least significant byte.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Laszlo "ever the optimist" Ersek <lersek@redhat.com>
Message-id:
1370610036-10577-6-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit
527cd96f15348f4454d5bb71f69aaeb95461c90e)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Markus Armbruster [Fri, 7 Jun 2013 13:00:34 +0000 (15:00 +0200)]
smbios: Clean up smbios_add_field() parameters
Having size precede the associated pointer is odd. Swap them, and fix
up the types.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Laszlo "ever the optimist" Ersek <lersek@redhat.com>
Message-id:
1370610036-10577-5-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit
ebc85e3f724d17530e74df665d1a30fb9b0041b5)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Markus Armbruster [Fri, 7 Jun 2013 13:00:33 +0000 (15:00 +0200)]
smbios: Convert to error_report()
Improves diagnistics from ad hoc messages like
Invalid SMBIOS UUID string
to
qemu-system-x86_64: -smbios type=1,uuid=gaga: Invalid UUID
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Laszlo "ever the optimist" Ersek <lersek@redhat.com>
Message-id:
1370610036-10577-4-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit
5bb95e41868b461f37159efb48908828ebd7ab36)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Markus Armbruster [Fri, 7 Jun 2013 13:00:32 +0000 (15:00 +0200)]
log.h: Supply missing includes
<stdio.h> has always been missing. Rest missed in commit
eeacee4.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Laszlo "ever the optimist" Ersek <lersek@redhat.com>
Message-id:
1370610036-10577-3-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit
f3eededb2fbc73c73daf08f791f0407b8541f4f4)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Markus Armbruster [Fri, 7 Jun 2013 13:00:31 +0000 (15:00 +0200)]
error-report.h: Supply missing include
Missed in commit
e5924d8.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Laszlo "ever the optimist" Ersek <lersek@redhat.com>
Message-id:
1370610036-10577-2-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit
b293796fd71009ecffe4343713a4e4e568c33fb0)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
projects / sdk / emulator / qemu.git / log