Merge "virtio-pci: modified from TYPE_PCI_DEVICE to TYPE_VIRTIO_PCI." into tizen_qemu_1.5.1

Merge "merge maru_pm.c" into tizen_qemu_1.5.1

Merge changes I1466e2f7,I16959c44 into tizen_qemu_1.5.1

* changes:
  merge maruskin_operation.c & maruskin_keymap.c
  merge maru_virtio_touchscreen.c temporarily

virtio-keyboard: modified for 1.5.1 upgrade

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

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>

merge maru_pm.c

Signed-off-by: jihye kim <jihye1128.kim@samsung.com>

merge maruskin_operation.c & maruskin_keymap.c

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

merge maru_virtio_touchscreen.c temporarily

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

Merge "Merging....." into tizen_qemu_1.5.1

Merging.....

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

virtio: removed previous virtio modules.

Change-Id: Ie34a7dcea9a0f607a05437ed30f9b6f9d5fb1c23
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

virtio-pci: merged virtio-pci module and others.

Change-Id: I11b764cd55316377cffd96a6ea77d5590d43b3d6
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

Merge "merge input.c" into tizen_qemu_1.5.1

merge input.c

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

Merging : merge the maru_camera files

Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>

Merging....

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

Merging...

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

Merging...

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

merge some files, and delete some duplicated files

Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>

Merge vl.c

Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>

Merge "Merge exec.c" into tizen_qemu_1.5.1

Merge exec.c

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

Merge some conflicts

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

Merge "Merge some conflicts" into tizen_qemu_1.5.1

merge and resolve soucre conflicts.

Change-Id: I51a12628b4b36c5756988221e9f3cf411ff3c822
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

Merge some files

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

Merge coflicts related with QEMU build

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

emulator: remove conflicts in qemu-options

remove conflicts in qemu-options

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

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>

qemu1.5.1: remove conflicts to merge

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

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

Merge branch 'develop' into tizen_qemu_1.5.1

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>

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>

package: version up

1.5.61

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

skin: cancel a scrollbar timer

cancel a scrollbar timer

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

package: version up

1.5.59

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

touch: added virtio config function

added virtio config function to touchscreen device

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

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>

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>

Update VERSION for 1.5.1 release

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

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>

shm: remove unnecessary code

Signed-off-by: munkyu.im <munkyu.im@samsung.com>

package: version up

1.5.56

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

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>

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>

skin: modified default skin path

modified default skin path for qemu args

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

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>

skin: change the default skin type

general purpose skin 1btn -> 3btn

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

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>

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>

package: version up

1.5.52

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

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

Modify the method of look-up loopback interface sophisticatedly.

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

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

tcg-ppc64: rotr_i32 rotates wrong amount

rotr_i32 calculates the amount to left shift and puts it into a
temporary, but then doesn't use it when doing the shift.

Cc: qemu-stable@nongnu.org
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
(cherry picked from commit d1bdd3af49f227dd4a4b03b90cb020c55cbed440)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

tcg-ppc64: Fix add2_i64

add2_i64 was adding the lower double word to the upper double word
of each input. Fix this so we add the lower double words, then the
upper double words with carry propagation.

Cc: qemu-stable@nongnu.org
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
(cherry picked from commit 84247357104044b8c4ec4a634e84769f432cbe52)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

tcg-ppc64: bswap64 rotates output 32 bits

If our input and output is in the same register, bswap64 tries to
undo a rotate of the input. This just ends up rotating the output.

Cc: qemu-stable@nongnu.org
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
(cherry picked from commit 82e0f9170ac9307de4fc15bfb4d12d5534550322)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

tcg-ppc64: Fix RLDCL opcode

The rldcl instruction doesn't have an sh field, so the minor opcode
is shifted 1 bit. We were using the XO30 macro which shifted the
minor opcode 2 bits.

Remove XO30 and add MD30 and MDS30 macros which match the
Power ISA categories.

Cc: qemu-stable@nongnu.org
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
(cherry picked from commit 8a94cfb05ea9a8991c832236b4174d354025a7b7)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

ivshmem: add missing error exit(2)

If the user fails to specify 'chardev' or 'shm' then we cannot continue.
Exit right away so that we don't invoke shm_open(3) with a NULL pointer.

It would be nice to replace exit(1) with error returns in the PCI device
.init() function, but leave that for another patch since exit(1) is
currently used elsewhere.

Spotted by Coverity.

Cc: Cam Macdonell <cam@cs.ualberta.ca>
Cc: qemu-stable@nongnu.org
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
(cherry picked from commit baefb8bf8e4a708c601bbab898a6039cd9cd12e3)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

Makefile: Install qemu-img and qemu-nbd man pages only if built

When splitting openSUSE's qemu and qemu-linux-user packages we noticed
that for linux-user-only builds unrelated man pages got installed.
It's surely possible to delete them before packaging, but not installing
them in the first place seems more logical.

Cc: qemu-stable@nongnu.org
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
(cherry picked from commit 8a3e8f7fd8144343f6c83e810b988c1e8a99d50a)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

tap: fix NULL dereference when passing invalid parameters to tap

This patch forbid the following invalid parameters to tap:

1) fd and vhostfds were specified but vhostfd were not specified
2) vhostfds were specified but fds were not specified
3) fds and vhostfd were specified

For 1 and 2, net_init_tap_one() will still pass NULL as vhostfdname to
monitor_handle_fd_param(), which may crash the qemu.

Also remove the unnecessary has_fd check.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Stefan Hajnoczi <shajnocz@redhat.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
(cherry picked from commit c87826a878be05208c3906eb9d5e1f37cff5e98e)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

package : Added a build-dependency for Windows OS.

Downloads a pixman library package when build with the DIBS.
package version up to 1.5.51.

Change-Id: I68f8c4c0f0d6a4ccfff8a1e98306df843c6ab1fe
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>

create qemu_openpty_raw() helper function and move it to a separate file

In two places qemu uses openpty() which is very system-dependent,
and in both places the pty is switched to raw mode as well.
Make a wrapper function which does both steps, and move all the
system-dependent complexity into a separate file, together
with static/local implementations of openpty() and cfmakeraw()
from qemu-char.c.

It is in a separate file, not part of oslib-posix.c, because
openpty() often resides in -lutil which is not linked to
every program qemu builds.

This change removes #including of <pty.h>, <termios.h>
and other rather specific system headers out of qemu-common.h,
which isn't a place for such specific headers really.

This version has been verified to build correctly on Linux,
OpenBSD, FreeBSD and OpenIndiana.  On the latter it lets qemu
to be built with gtk gui which were not possible there due to
missing openpty() and cfmakeraw().

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Tested-by: Andreas Färber <andreas.faerber@web.de>
(cherry picked from commit 4efeabbbe8441cc327052304976c7b9b86309d72)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

Merge "display : Modified to use the pixman library." into develop

display : Modified to use the pixman library.

Now, display update function makes a scaled/rotated screen using the pixman APIs.

Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>

package: version up

1.5.50

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

blockdev: reset werror/rerror on drive_del

Paolo Bonzini <pbonzini@redhat.com> suggested the following test case:

1. Launch a guest and wait at the GRUB boot menu:

  qemu-system-x86_64 -enable-kvm -m 1024 \
   -drive if=none,cache=none,file=test.img,id=foo,werror=stop,rerror=stop
   -device virtio-blk-pci,drive=foo,id=virtio0,addr=4

2. Hot unplug the device:

  (qemu) drive_del foo

3. Select the first boot menu entry

Without this patch the guest pauses due to ENOMEDIUM.  The guest is
stuck in a continuous pause loop since the I/O request is retried and
fails immediately again when the guest is resumed.

With this patch the error is reported to the guest.

Note that this scenario actually happens sometimes during libvirt disk
hot unplug, where device_del is followed by drive_del.  I/O may still be
submitted to the drive after drive_del if the guest does not process the
PCI hot unplug notification.

Reported-by: Dafna Ron <dron@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit 293c51a6ee369228633a8428ab689f14c045ff98)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

skin: modified keycode for 480x800-3btn

modified keycode for 480x800-3btn

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

q35: set fw_name

PCI host bridges need to set fw_name to be discoverable
by bios for boot device selection.

In particular, seabios expects root device to be called
"/pci/@i0cf8", so let's set it up like that for Q35.

Cc: qemu-stable@nongnu.org
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Amos Kong <akong@redhat.com>
(cherry picked from commit 68c0e134a090666246b467deaf9046e573b089f2)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

target-i386: Fix aflag logic for CODE64 and the 0x67 prefix

The code reorganization in commit 4a6fd938 broke handling of PREFIX_ADR.
While fixing this, tidy and comment the code so that it's more obvious
what's going on in setting both aflag and dflag.

The TARGET_X86_64 ifdef can be eliminated because CODE64 expands to the
constant zero when TARGET_X86_64 is undefined.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Reported-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1369855851-21400-1-git-send-email-rth@twiddle.net
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit dec3fc9657e0682637de4d5a29d947284d01985c)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

qemu-char: don't issue CHR_EVENT_OPEN in a BH

When CHR_EVENT_OPENED was initially added, it was CHR_EVENT_RESET,
and it was issued as a bottom-half:

86e94dea5b740dad65446c857f6959eae43e0ba6

Which we basically used to print out a greeting/prompt for the
monitor.

AFAICT the only reason this was ever done in a BH was because in
some cases we'd modify the chr_write handler for a new chardev
backend *after* the site where we issued the reset (see:
86e94d:qemu_chr_open_stdio())

At some point this event was renamed to CHR_EVENT_OPENED, and we've
maintained the use of this BH ever since.

However, due to 9f939df955a4152aad69a19a77e0898631bb2c18, we schedule
the BH via g_idle_add(), which is causing events to sometimes be
delivered after we've already begun processing data from backends,
leading to:

 known bugs:

  QMP:
    session negotation resets with OPENED event, in some cases this
    is causing new sessions to get sporadically reset

 potential bugs:

  hw/usb/redirect.c:
    can_read handler checks for dev->parser != NULL, which may be
    true if CLOSED BH has not been executed yet. In the past, OPENED
    quiesced outstanding CLOSED events prior to us reading client
    data. If it's delayed, our check may allow reads to occur even
    though we haven't processed the OPENED event yet, and when we
    do finally get the OPENED event, our state may get reset.

  qtest.c:
    can begin session before OPENED event is processed, leading to
    a spurious reset of the system and irq_levels

  gdbstub.c:
    may start a gdb session prior to the machine being paused

To fix these, let's just drop the BH.

Since the initial reasoning for using it still applies to an extent,
work around that by deferring the delivery of CHR_EVENT_OPENED until
after the chardevs have been fully initialized, toward the end of
qmp_chardev_add() (or some cases, qemu_chr_new_from_opts()). This
defers delivery long enough that we can be assured a CharDriverState
is fully initialized before CHR_EVENT_OPENED is sent.

Also, rather than requiring each chardev to do an explicit open, do it
automatically, and allow the small few who don't desire such behavior to
suppress the OPENED-on-init behavior by setting a 'explicit_be_open'
flag.

We additionally add missing OPENED events for stdio backends on w32,
which were previously not being issued, causing us to not recieve the
banner and initial prompts for qmp/hmp.

Reported-by: Stefan Priebe <s.priebe@profihost.ag>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Message-id: 1370636393-21044-1-git-send-email-mdroth@linux.vnet.ibm.com
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 bd5c51ee6c4f1c79cae5ad2516d711a27b4ea8ec)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

emulator: registered the virtfs-proxy-helper in gitignore

registered the virtfs-proxy-helper in gitignore

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

Merge "package: version up." into develop

xilinx_axidma: Do not set DMA .notify to NULL after notify

If a stream notify function is not ready, it may re-populate the notify call-
back to indicate it should be re-polled later. This break in this usage, as
immediately following the notify() call, .notify is set to NULL. reverse the
ordering of the notify call and NULL assignment accordingly.

[PC: Reworked commit message]

Signed-off-by: Wendy Liang <jliang@xilinx.com>
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
(cherry picked from commit 4f293bd6e53739e089f33b458f70a9c4ac136b92)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

virtio-ccw: Fix unsetting of indicators.

Interpretation of the ccws to register (configuration) indicators contained
a thinko: We want to disallow reading from 0, but setting the indicator
pointer to 0 is fine.

Let's fix the handling for CCW_CMD_SET{,_CONF}_IND.

Cc: qemu-stable@nongnu.org
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
(cherry picked from commit d1db1fa8dfcea9c62643f624f2a07d2fd375ce45)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

s390x/css: Fix concurrent sense.

Fix an off-by-one error when indicating availablity of concurrent
sense data.

Cc: qemu-stable@nongnu.org
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
(cherry picked from commit 8312976e73fce9689ab831c1da565ec413680cff)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

ui/gtk.c: Fix *BSD build of Gtk+ UI

Fix the build of the Gtk+ UI on *BSD systems.

Signed-off-by: Brad Smith <brad@comstyle.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Message-id: 20130521161324.GA29977@rox.home.comstyle.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 17bf9735dd5a46d829cfb175703c6a2c254a9aa2)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

vmxnet3: fix NICState cleanup

Use qemu_del_nic() instead of qemu_del_net_client() to correctly free
the entire NICState.

Cc: qemu-stable@nongnu.org
Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
(cherry picked from commit 3ffee3cd5fb29de2115bdcbde0a02f47ce69a24c)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

Fix usage of USB_DEV_FLAG_IS_HOST flag.

USB_DEV_FLAG_IS_HOST is the bit number, not value. Booting with a
"Fitbit Base Station" USB dongle was triggering this assert.

Signed-off-by: Michael Marineau <mike@marineau.org>
Cc: qemu-stable@nongnu.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
(cherry picked from commit 756335292f2b46775992c314cc70b54480a46d26)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>