qemu.git
7 years ago.travis.yml: add a new build target with non-core devlibs
Alex Bennée [Wed, 12 Mar 2014 14:13:50 +0000 (14:13 +0000)] 
.travis.yml: add a new build target with non-core devlibs

The current builds don't include all the features which are
auto-detected and then disabled when the appropriate test packages don't
exist. I've added another target that enables all known additional
packages for increased coverage. I didn't add it to the core package
list to reduce build time.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
7 years agosasl: Avoid 'Could not find keytab file' in syslog
Laszlo Ersek [Fri, 14 Mar 2014 14:39:36 +0000 (15:39 +0100)] 
sasl: Avoid 'Could not find keytab file' in syslog

The "keytab" specification in "qemu.sasl" only makes sense if "gssapi" is
selected in "mech_list". Even if the latter is not done (ie. "gssapi" is
not selected), the cyrus-sasl library tries to open the specified keytab
file, although nothing has a use for it outside the gssapi backend.

Since the default keytab file "/etc/qemu/krb5.tab" is usually absent, the
cyrus-sasl library emits a warning to syslog at startup, which tends to
annoy users (who didn't ask for gssapi in the first place).

Comment out the keytab specification per default.

"qemu-doc.texi" already correctly explains how to use "mech_list: gssapi"
together with "keytab:".

See also:
- upstream libvirt commit fe772f24,
- Red Hat Bugzilla <https://bugzilla.redhat.com/show_bug.cgi?id=1018434>.

Signed-off-by: Laszlo Ersek <lersek@redhat.com>
ACKed-By: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
7 years agoMerge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Peter Maydell [Fri, 14 Mar 2014 18:44:22 +0000 (18:44 +0000)] 
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

Block pull request

# gpg: Signature made Fri 14 Mar 2014 16:12:14 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  qemu-iotests: remove 085 and 087 from 'quick' group
  qemu-iotests: add 083 NBD client disconnect tests
  tests: add nbd-fault-injector.py utility
  nbd: close socket if connection breaks
  block: Explicitly specify 'unsigned long long' for VHDX 64-bit constants
  blockdev: Refuse to open encrypted image unless paused

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
7 years agoMerge remote-tracking branch 'remotes/bonzini/scsi-next' into staging
Peter Maydell [Fri, 14 Mar 2014 18:17:25 +0000 (18:17 +0000)] 
Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging

* remotes/bonzini/scsi-next:
  virtio-scsi: actually honor sense_size from configuration space
  scsi: Fix migration of scsi sense data
  spapr-vscsi: fix CRQ status

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
7 years agotcg-aarch64: Introduce tcg_out_insn_3405
Richard Henderson [Wed, 14 Aug 2013 22:57:36 +0000 (15:57 -0700)] 
tcg-aarch64: Introduce tcg_out_insn_3405

Cleaning up the implementation of tcg_out_movi at the same time.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Tested-by: Claudio Fontana <claudio.fontana@huawei.com>
7 years agotcg-aarch64: Support div, rem
Richard Henderson [Wed, 14 Aug 2013 22:29:18 +0000 (15:29 -0700)] 
tcg-aarch64: Support div, rem

Clean up multiply at the same time.

For remainder, generic code will produce mul+sub,
whereas we can implement with msub.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Tested-by: Claudio Fontana <claudio.fontana@huawei.com>
7 years agotcg-aarch64: Support muluh, mulsh
Richard Henderson [Wed, 14 Aug 2013 22:03:27 +0000 (15:03 -0700)] 
tcg-aarch64: Support muluh, mulsh

Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Tested-by: Claudio Fontana <claudio.fontana@huawei.com>
7 years agotcg-aarch64: Support add2, sub2
Richard Henderson [Wed, 14 Aug 2013 20:30:07 +0000 (13:30 -0700)] 
tcg-aarch64: Support add2, sub2

Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Tested-by: Claudio Fontana <claudio.fontana@huawei.com>
7 years agotcg-aarch64: Support deposit
Richard Henderson [Wed, 14 Aug 2013 20:05:07 +0000 (13:05 -0700)] 
tcg-aarch64: Support deposit

Also tidy the implementation of ubfm, sbfm, extr in order to share code.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Tested-by: Claudio Fontana <claudio.fontana@huawei.com>
7 years agotcg-aarch64: Use tcg_out_insn for setcond
Richard Henderson [Thu, 12 Sep 2013 01:54:46 +0000 (18:54 -0700)] 
tcg-aarch64: Use tcg_out_insn for setcond

Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Tested-by: Claudio Fontana <claudio.fontana@huawei.com>
7 years agotcg-aarch64: Support movcond
Richard Henderson [Sat, 10 Aug 2013 03:58:19 +0000 (23:58 -0400)] 
tcg-aarch64: Support movcond

Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Tested-by: Claudio Fontana <claudio.fontana@huawei.com>
7 years agotcg-aarch64: Support andc, orc, eqv, not, neg
Richard Henderson [Sat, 10 Aug 2013 03:15:44 +0000 (23:15 -0400)] 
tcg-aarch64: Support andc, orc, eqv, not, neg

Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Tested-by: Claudio Fontana <claudio.fontana@huawei.com>
7 years agotcg-aarch64: Handle constant operands to and, or, xor
Richard Henderson [Wed, 14 Aug 2013 18:27:03 +0000 (11:27 -0700)] 
tcg-aarch64: Handle constant operands to and, or, xor

Handle a simplified set of logical immediates for the moment.

The way gcc and binutils do it, with 52k worth of tables, and
a binary search depth of log2(5334) = 13, seems slow for the
most common cases.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Tested-by: Claudio Fontana <claudio.fontana@huawei.com>
7 years agotcg-aarch64: Handle constant operands to add, sub, and compare
Richard Henderson [Wed, 14 Aug 2013 16:56:14 +0000 (09:56 -0700)] 
tcg-aarch64: Handle constant operands to add, sub, and compare

Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Tested-by: Claudio Fontana <claudio.fontana@huawei.com>
7 years agotcg-aarch64: Implement mov with tcg_out_insn
Richard Henderson [Tue, 13 Aug 2013 21:49:18 +0000 (14:49 -0700)] 
tcg-aarch64: Implement mov with tcg_out_insn

Avoid the magic numbers in the current implementation.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Tested-by: Claudio Fontana <claudio.fontana@huawei.com>
7 years agotcg-aarch64: Introduce tcg_out_insn_3401
Richard Henderson [Tue, 13 Aug 2013 21:37:08 +0000 (14:37 -0700)] 
tcg-aarch64: Introduce tcg_out_insn_3401

This merges the implementation of tcg_out_addi and tcg_out_subi.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Tested-by: Claudio Fontana <claudio.fontana@huawei.com>
7 years agotcg-aarch64: Convert shift insns to tcg_out_insn
Richard Henderson [Tue, 13 Aug 2013 20:49:17 +0000 (13:49 -0700)] 
tcg-aarch64: Convert shift insns to tcg_out_insn

Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Tested-by: Claudio Fontana <claudio.fontana@huawei.com>
7 years agotcg-aarch64: Introduce tcg_out_insn
Richard Henderson [Tue, 13 Aug 2013 19:10:08 +0000 (12:10 -0700)] 
tcg-aarch64: Introduce tcg_out_insn

Converting the add/sub (3.5.2) and logical shifted (3.5.10) instruction
groups to the new scheme.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Tested-by: Claudio Fontana <claudio.fontana@huawei.com>
7 years agoqemu-iotests: remove 085 and 087 from 'quick' group
Stefan Hajnoczi [Thu, 13 Mar 2014 09:28:01 +0000 (10:28 +0100)] 
qemu-iotests: remove 085 and 087 from 'quick' group

The 'quick' group in qemu-iotests are not allowed to run QEMU since we
don't know which targets are available.  In other words, they may only
use qemu-img, qemu-io, and qemu-nbd.

Drop 085 and 087 from the 'quick' group since they run QEMU.  This
makes "make check-block" pass again.

Reported-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
7 years agoqemu-iotests: add 083 NBD client disconnect tests
Stefan Hajnoczi [Wed, 26 Feb 2014 14:30:20 +0000 (15:30 +0100)] 
qemu-iotests: add 083 NBD client disconnect tests

This new test case uses nbd-fault-injector.py to simulate broken TCP
connections at each stage in the NBD protocol.  This way we can exercise
block/nbd-client.c's socket error handling code paths.

In particular, this serves as a regression test to make sure
nbd-client.c doesn't cause an infinite loop by leaving its
nbd_receive_reply() fd handler registered after the connection has been
closed.  This bug was fixed in an earlier patch.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
7 years agotests: add nbd-fault-injector.py utility
Stefan Hajnoczi [Wed, 26 Feb 2014 14:30:19 +0000 (15:30 +0100)] 
tests: add nbd-fault-injector.py utility

The nbd-fault-injector.py script is a special kind of NBD server.  It
throws away all writes and produces zeroes for reads.  Given a list of
fault injection rules, it can simulate NBD protocol errors and is useful
for testing NBD client error handling code paths.

See the patch for documentation.  This scripts is modelled after Kevin
Wolf <kwolf@redhat.com>'s blkdebug block driver.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
7 years agonbd: close socket if connection breaks
Stefan Hajnoczi [Wed, 26 Feb 2014 14:30:18 +0000 (15:30 +0100)] 
nbd: close socket if connection breaks

nbd_receive_reply() is called by the event loop whenever data is
available or the socket has been closed by the remote side.

This patch closes the socket when an error occurs to prevent the
nbd_receive_reply() handler from being called indefinitely after the
connection has failed.

Note that we were already correctly returning EIO for pending requests
but leaving the nbd_receive_reply() handler registered resulted in high
CPU consumption and a flood of error messages.

Reuse nbd_teardown_connection() to close the socket.

Reported-by: Zhifeng Cai <bluewindow@h3c.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
7 years agoblock: Explicitly specify 'unsigned long long' for VHDX 64-bit constants
Jeff Cody [Fri, 14 Mar 2014 10:50:37 +0000 (06:50 -0400)] 
block: Explicitly specify 'unsigned long long' for VHDX 64-bit constants

On 32-bit hosts, some compilers will warn on too large integer constants
for constants that are 64-bit in length.  Explicitly put a 'ULL' suffix
on those defines.

Reported-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
7 years agoblockdev: Refuse to open encrypted image unless paused
Markus Armbruster [Fri, 14 Mar 2014 08:22:48 +0000 (09:22 +0100)] 
blockdev: Refuse to open encrypted image unless paused

Opening an encrypted image takes an additional step: setting the key.
Between open and the key set, the image must not be used.

We have some protection against accidental use in place: you can't
unpause a guest while we're missing keys.  You can, however, hot-plug
block devices lacking keys into a running guest just fine, or insert
media lacking keys.  In the latter case, notifying the guest of the
insert is delayed until the key is set, which may suffice to protect
at least some guests in common usage.

This patch makes the protection apply in more cases, in a rather
heavy-handed way: it doesn't let you open encrypted images unless
we're in a paused state.

It doesn't extend the protection to users other than the guest (block
jobs?).  Use of runstate_check() from block.c is disgusting.  Best I
can do right now.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
7 years agovirtio-scsi: actually honor sense_size from configuration space
Paolo Bonzini [Thu, 6 Mar 2014 10:18:53 +0000 (11:18 +0100)] 
virtio-scsi: actually honor sense_size from configuration space

We were always truncating the sense size to 96 bytes.

Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
7 years agoscsi: Fix migration of scsi sense data
Fam Zheng [Thu, 6 Mar 2014 08:26:02 +0000 (16:26 +0800)] 
scsi: Fix migration of scsi sense data

c5f52875 changed the size of sense array in vmstate_scsi_device by
mistake. This patch restores the old size, and add a subsection for the
remaining part of the buffer size. So that migration is not broken.

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
7 years agospapr-vscsi: fix CRQ status
Alexey Kardashevskiy [Wed, 5 Mar 2014 05:15:16 +0000 (16:15 +1100)] 
spapr-vscsi: fix CRQ status

Normally VIOSRP_OK (0) means success and non-zero value means error
except VIOSRP_OK2 (0x99) which is another success code by weird accident.

This uses 0 as success code always as some guests do not cope with
the 0x99 value well. The existing linux driver checks for both VIOSRP_OK
and VIOSRP_OK2 since 2.6.32.

This returns non-zero code (VIOSRP_ADAPTER_FAIL == 0x10) on errors which
can only happen if DMA write failed.

Suggested-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
7 years agoUpdate version for v2.0-rc0 v2.0.0-rc0
Anthony Liguori [Fri, 14 Mar 2014 03:08:15 +0000 (20:08 -0700)] 
Update version for v2.0-rc0

Signed-off-by: Anthony Liguori <aliguori@amazon.com>
7 years agoMerge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.0' into staging
Peter Maydell [Thu, 13 Mar 2014 21:50:39 +0000 (21:50 +0000)] 
Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.0' into staging

QOM/QTest infrastructure fixes

* QOM cast fix for virtserialport and regression test
* QTest error handling fix
* QTest output cleanup

# gpg: Signature made Thu 13 Mar 2014 20:43:34 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/qom-devices-for-2.0:
  main-loop: Suppress "I/O thread spun" warnings for qtest
  qtest: Fix crash if SIGABRT during qtest_init()
  virtio-console-test: Test virtserialport as well
  virtio-console: Fix VIRTIO_CONSOLE() cast macro

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
7 years agoMerge remote-tracking branch 'remotes/afaerber/tags/ppc-for-2.0' into staging
Peter Maydell [Thu, 13 Mar 2014 21:27:54 +0000 (21:27 +0000)] 
Merge remote-tracking branch 'remotes/afaerber/tags/ppc-for-2.0' into staging

PowerPC queue for 2.0

* Fixes for -device VGA

# gpg: Signature made Thu 13 Mar 2014 19:57:12 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/ppc-for-2.0:
  spapr: Fix return value of vga initialization
  Fix vga_interface_type for command line argument '-device VGA'

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
7 years agomain-loop: Suppress "I/O thread spun" warnings for qtest
Peter Maydell [Thu, 13 Mar 2014 14:17:29 +0000 (14:17 +0000)] 
main-loop: Suppress "I/O thread spun" warnings for qtest

When running under qtest we don't actually have any vcpu threads
to be starved, so the warning about the I/O thread spinning isn't
relevant, and the way qtest manipulates the simulated clock means
the warning is produced a lot as a false positive. Suppress it if
qtest_enabled(), so 'make check' output is less noisy.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agoqtest: Fix crash if SIGABRT during qtest_init()
Stefan Hajnoczi [Thu, 13 Mar 2014 09:41:34 +0000 (10:41 +0100)] 
qtest: Fix crash if SIGABRT during qtest_init()

If an assertion fails during qtest_init() the SIGABRT handler is
invoked.  This is the correct behavior since we need to kill the QEMU
process to avoid leaking it when the test dies.

The global_qtest pointer used by the SIGABRT handler is currently only
assigned after qtest_init() returns.  This results in a segfault if an
assertion failure occurs during qtest_init().

Move global_qtest assignment inside qtest_init().  Not pretty but let's
face it - the signal handler depends on global state.

Reported-by: Marcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Tested-by: Marcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agovirtio-console-test: Test virtserialport as well
Andreas Färber [Thu, 13 Mar 2014 15:47:24 +0000 (16:47 +0100)] 
virtio-console-test: Test virtserialport as well

A test is only as good as its coverage - testing virtserialport in
addition to virtconsole showed that commit
0399a3819b27083ba69b88a9baa9025facab85bd (virtio-console: QOM cast
cleanup for VirtConsole) broke virtserialport.

Acked-by: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agovirtio-console: Fix VIRTIO_CONSOLE() cast macro
Andreas Färber [Thu, 13 Mar 2014 16:12:53 +0000 (17:12 +0100)] 
virtio-console: Fix VIRTIO_CONSOLE() cast macro

Commit 0399a3819b27083ba69b88a9baa9025facab85bd (virtio-console: QOM
cast cleanup for VirtConsole) broke virtserialport since it shares
functions and state struct with virtconsole. Let virtconsole inherit
from virtserialport, and use virtserialport type for casting.

Note that virtio-serial-port is the abstract base type in
virtio-serial-bus.c, whereas virtserialport is the user-instantiatable
type in virtio-console.c. Therefore using TYPE_VIRTIO_CONSOLE_SERIAL_PORT.

Reported-by: Richard W.M. Jones <rjones@redhat.com>
Acked-by: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agoMerge remote-tracking branch 'remotes/afaerber/tags/prep-for-2.0' into staging
Peter Maydell [Thu, 13 Mar 2014 20:09:11 +0000 (20:09 +0000)] 
Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-2.0' into staging

PReP machine and devices

* ppc_rom.bin update
* Raven PCI host bridge preparations for OpenBIOS

# gpg: Signature made Thu 13 Mar 2014 19:28:37 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/prep-for-2.0:
  raven: Move BIOS loading from board code to PCI host
  prep: Update ppc_rom.bin

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
7 years agospapr: Fix return value of vga initialization
Mark Wu [Mon, 10 Mar 2014 14:37:41 +0000 (22:37 +0800)] 
spapr: Fix return value of vga initialization

Before spapr_vga_init will returned false if the vga is specified by
the command '-device VGA' because vga_interface_type was evaluated to
VGA_NONE. With the change in previous patch of this series,
spapr_vga_init should return true if it's told that the vga will be
initialized in flow of the generic devices initialization.

To keep '-nodefaults' have the semantics of bare minimum, it adds a
check of 'has_defaults' in usb_enabled() to avoid that a USB controller
is added by '-nodefautls, -device VGA' implicitly.

This patch also makes two cleanups:
1. skip initialization for VGA_NONE
2. remove the useless 'break'

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Mark Wu <wudxw@linux.vnet.ibm.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agoFix vga_interface_type for command line argument '-device VGA'
Mark Wu [Mon, 10 Mar 2014 14:37:40 +0000 (22:37 +0800)] 
Fix vga_interface_type for command line argument '-device VGA'

Some machine (like pseries) initialization code determines if it has
graphics according to vga_interface_type. In the original code,
vga_interface_type is evaluated to VGA_NONE even if a VGA is added
via '-device VGA'. It causes the machine not aware of the graphics
device configured. Add a new VGA device type to indicate that it has a
VGA device, which will be initialized in QOM device initialization.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Mark Wu <wudxw@linux.vnet.ibm.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agoraven: Move BIOS loading from board code to PCI host
Hervé Poussineau [Mon, 4 Nov 2013 23:09:45 +0000 (00:09 +0100)] 
raven: Move BIOS loading from board code to PCI host

Raven datasheet explains where firmware lives in system memory, so do
it there instead of in board code. Other boards using the same PCI
host will not have to copy the firmware loading code.

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
[AF: Drop BIOS size workaround in favor of replacing our firmware blob]
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
7 years agoprep: Update ppc_rom.bin
Andreas Färber [Wed, 12 Mar 2014 17:43:01 +0000 (18:43 +0100)] 
prep: Update ppc_rom.bin

This increases file size from 512 KiB to 1 MiB.

Signed-off-by: Andreas Färber <andreas.faerber@web.de>
7 years agoMerge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-2.0' into staging
Peter Maydell [Thu, 13 Mar 2014 19:13:33 +0000 (19:13 +0000)] 
Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-2.0' into staging

QOM CPUState refactorings / X86CPU

* Deadlock fix for exit requests around CPU reset
* X86CPU x2apic for KVM
* X86CPU model subclasses
* SPARCCPU preparations for model subclasses
* -cpu arguments for arm, cris, lm32, moxie, openrisc, ppc, sh4, uc32
* m68k assertion cleanups
* CPUClass hooks for cpu.h inline functions
* Field movements from CPU_COMMON to CPUState and follow-up cleanups

# gpg: Signature made Thu 13 Mar 2014 19:06:56 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/qom-cpu-for-2.0: (58 commits)
  user-exec: Change exception_action() argument to CPUState
  cputlb: Change tlb_set_page() argument to CPUState
  cputlb: Change tlb_flush() argument to CPUState
  cputlb: Change tlb_flush_page() argument to CPUState
  target-microblaze: Replace DisasContext::env field with MicroBlazeCPU
  target-cris: Replace DisasContext::env field with CRISCPU
  exec: Change cpu_abort() argument to CPUState
  exec: Change memory_region_section_get_iotlb() argument to CPUState
  cputlb: Change tlb_unprotect_code_phys() argument to CPUState
  cpu-exec: Change cpu_resume_from_signal() argument to CPUState
  exec: Change cpu_breakpoint_{insert,remove{,_by_ref,_all}} argument
  exec: Change cpu_watchpoint_{insert,remove{,_by_ref,_all}} argument
  target-ppc: Use PowerPCCPU in PowerPCCPUClass::handle_mmu_fault hook
  translate-all: Change tb_flush_jmp_cache() argument to CPUState
  translate-all: Change tb_gen_code() argument to CPUState
  translate-all: Change cpu_io_recompile() argument to CPUState
  translate-all: Change tb_check_watchpoint() argument to CPUState
  translate-all: Change cpu_restore_state_from_tb() argument to CPUState
  translate-all: Change cpu_restore_state() argument to CPUState
  cpu-exec: Change cpu_loop_exit() argument to CPUState
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
7 years agouser-exec: Change exception_action() argument to CPUState
Andreas Färber [Wed, 4 Sep 2013 06:54:24 +0000 (08:54 +0200)] 
user-exec: Change exception_action() argument to CPUState

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocputlb: Change tlb_set_page() argument to CPUState
Andreas Färber [Tue, 3 Sep 2013 11:59:37 +0000 (13:59 +0200)] 
cputlb: Change tlb_set_page() argument to CPUState

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocputlb: Change tlb_flush() argument to CPUState
Andreas Färber [Wed, 4 Sep 2013 00:19:44 +0000 (02:19 +0200)] 
cputlb: Change tlb_flush() argument to CPUState

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocputlb: Change tlb_flush_page() argument to CPUState
Andreas Färber [Tue, 3 Sep 2013 23:29:02 +0000 (01:29 +0200)] 
cputlb: Change tlb_flush_page() argument to CPUState

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-microblaze: Replace DisasContext::env field with MicroBlazeCPU
Andreas Färber [Tue, 3 Sep 2013 18:02:48 +0000 (20:02 +0200)] 
target-microblaze: Replace DisasContext::env field with MicroBlazeCPU

This cleans up some mb_env_get_cpu() needed for cpu_abort().

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-cris: Replace DisasContext::env field with CRISCPU
Andreas Färber [Tue, 3 Sep 2013 16:42:27 +0000 (18:42 +0200)] 
target-cris: Replace DisasContext::env field with CRISCPU

This cleans up repeated cris_env_get_cpu() for cpu_abort().

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agoexec: Change cpu_abort() argument to CPUState
Andreas Färber [Tue, 3 Sep 2013 15:38:47 +0000 (17:38 +0200)] 
exec: Change cpu_abort() argument to CPUState

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agoMerge remote-tracking branch 'remotes/kraxel/tags/pull-input-6' into staging
Peter Maydell [Thu, 13 Mar 2014 18:37:00 +0000 (18:37 +0000)] 
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-6' into staging

input: activate legacy kbd
gtk: Add mouse wheel support

# gpg: Signature made Thu 13 Mar 2014 10:34:17 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-input-6:
  gtk: Add mouse wheel support
  input: activate legacy kbd

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
7 years agoexec: Change memory_region_section_get_iotlb() argument to CPUState
Andreas Färber [Tue, 3 Sep 2013 11:32:01 +0000 (13:32 +0200)] 
exec: Change memory_region_section_get_iotlb() argument to CPUState

It no longer needs CPUArchState since moving watchpoints to CPUState.

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocputlb: Change tlb_unprotect_code_phys() argument to CPUState
Andreas Färber [Tue, 3 Sep 2013 08:51:26 +0000 (10:51 +0200)] 
cputlb: Change tlb_unprotect_code_phys() argument to CPUState

Note that the argument is unused.

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocpu-exec: Change cpu_resume_from_signal() argument to CPUState
Andreas Färber [Tue, 3 Sep 2013 00:12:23 +0000 (02:12 +0200)] 
cpu-exec: Change cpu_resume_from_signal() argument to CPUState

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agoexec: Change cpu_breakpoint_{insert,remove{,_by_ref,_all}} argument
Andreas Färber [Mon, 2 Sep 2013 15:26:20 +0000 (17:26 +0200)] 
exec: Change cpu_breakpoint_{insert,remove{,_by_ref,_all}} argument

Use CPUState. Allows to clean up CPUArchState in gdbstub.

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agoexec: Change cpu_watchpoint_{insert,remove{,_by_ref,_all}} argument
Andreas Färber [Mon, 2 Sep 2013 14:57:02 +0000 (16:57 +0200)] 
exec: Change cpu_watchpoint_{insert,remove{,_by_ref,_all}} argument

Use CPUState. This lets us drop a few local env usages.

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-ppc: Use PowerPCCPU in PowerPCCPUClass::handle_mmu_fault hook
Andreas Färber [Mon, 2 Sep 2013 12:14:24 +0000 (14:14 +0200)] 
target-ppc: Use PowerPCCPU in PowerPCCPUClass::handle_mmu_fault hook

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotranslate-all: Change tb_flush_jmp_cache() argument to CPUState
Andreas Färber [Sun, 1 Sep 2013 15:52:07 +0000 (17:52 +0200)] 
translate-all: Change tb_flush_jmp_cache() argument to CPUState

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotranslate-all: Change tb_gen_code() argument to CPUState
Andreas Färber [Sun, 1 Sep 2013 15:43:17 +0000 (17:43 +0200)] 
translate-all: Change tb_gen_code() argument to CPUState

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotranslate-all: Change cpu_io_recompile() argument to CPUState
Andreas Färber [Sun, 1 Sep 2013 15:21:47 +0000 (17:21 +0200)] 
translate-all: Change cpu_io_recompile() argument to CPUState

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotranslate-all: Change tb_check_watchpoint() argument to CPUState
Andreas Färber [Sun, 1 Sep 2013 15:12:23 +0000 (17:12 +0200)] 
translate-all: Change tb_check_watchpoint() argument to CPUState

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotranslate-all: Change cpu_restore_state_from_tb() argument to CPUState
Andreas Färber [Sun, 1 Sep 2013 15:02:58 +0000 (17:02 +0200)] 
translate-all: Change cpu_restore_state_from_tb() argument to CPUState

And normalize the argument order.

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotranslate-all: Change cpu_restore_state() argument to CPUState
Andreas Färber [Sun, 1 Sep 2013 14:51:34 +0000 (16:51 +0200)] 
translate-all: Change cpu_restore_state() argument to CPUState

This lets us drop some local variables in tlb_fill() functions.

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocpu-exec: Change cpu_loop_exit() argument to CPUState
Andreas Färber [Tue, 27 Aug 2013 15:52:12 +0000 (17:52 +0200)] 
cpu-exec: Change cpu_loop_exit() argument to CPUState

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agoexec: Change tlb_fill() argument to CPUState
Andreas Färber [Mon, 26 Aug 2013 22:28:06 +0000 (00:28 +0200)] 
exec: Change tlb_fill() argument to CPUState

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocpu: Move breakpoints field from CPU_COMMON to CPUState
Andreas Färber [Mon, 26 Aug 2013 19:22:53 +0000 (21:22 +0200)] 
cpu: Move breakpoints field from CPU_COMMON to CPUState

Most targets were using offsetof(CPUFooState, breakpoints) to determine
how much of CPUFooState to clear on reset. Use the next field after
CPU_COMMON instead, if any, or sizeof(CPUFooState) otherwise.

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocpu: Move watchpoint fields from CPU_COMMON to CPUState
Andreas Färber [Mon, 26 Aug 2013 16:23:18 +0000 (18:23 +0200)] 
cpu: Move watchpoint fields from CPU_COMMON to CPUState

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocpu: Move opaque field from CPU_COMMON to CPUState
Andreas Färber [Mon, 26 Aug 2013 16:14:44 +0000 (18:14 +0200)] 
cpu: Move opaque field from CPU_COMMON to CPUState

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocpu: Move exception_index field from CPU_COMMON to CPUState
Andreas Färber [Mon, 26 Aug 2013 06:31:06 +0000 (08:31 +0200)] 
cpu: Move exception_index field from CPU_COMMON to CPUState

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocpu: Move jmp_env field from CPU_COMMON to CPUState
Andreas Färber [Mon, 26 Aug 2013 04:22:03 +0000 (06:22 +0200)] 
cpu: Move jmp_env field from CPU_COMMON to CPUState

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocpu: Move tb_jmp_cache field from CPU_COMMON to CPUState
Andreas Färber [Mon, 26 Aug 2013 04:03:38 +0000 (06:03 +0200)] 
cpu: Move tb_jmp_cache field from CPU_COMMON to CPUState

Clear it on reset.

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocpu: Move icount_decr field from CPU_COMMON to CPUState
Andreas Färber [Mon, 26 Aug 2013 03:51:49 +0000 (05:51 +0200)] 
cpu: Move icount_decr field from CPU_COMMON to CPUState

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocpu: Move icount_extra field from CPU_COMMON to CPUState
Andreas Färber [Mon, 26 Aug 2013 03:39:29 +0000 (05:39 +0200)] 
cpu: Move icount_extra field from CPU_COMMON to CPUState

Reset it.

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocpu: Move can_do_io field from CPU_COMMON to CPUState
Andreas Färber [Mon, 26 Aug 2013 03:15:23 +0000 (05:15 +0200)] 
cpu: Move can_do_io field from CPU_COMMON to CPUState

Rename can_do_io() to cpu_can_do_io() and change argument to CPUState.

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocpu: Move mem_io_{pc,vaddr} fields from CPU_COMMON to CPUState
Andreas Färber [Mon, 26 Aug 2013 01:41:01 +0000 (03:41 +0200)] 
cpu: Move mem_io_{pc,vaddr} fields from CPU_COMMON to CPUState

Reset them.

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocpu: Turn cpu_handle_mmu_fault() into a CPUClass hook
Andreas Färber [Mon, 26 Aug 2013 01:01:33 +0000 (03:01 +0200)] 
cpu: Turn cpu_handle_mmu_fault() into a CPUClass hook

Note that while such functions may exist both for *-user and softmmu,
only *-user uses the CPUState hook, while softmmu reuses the prototype
for calling it directly.

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-m68k: Remove custom qemu_assert() function
Peter Maydell [Wed, 12 Mar 2014 13:24:49 +0000 (13:24 +0000)] 
target-m68k: Remove custom qemu_assert() function

Remove the custom qemu_assert() function defined by target-m68k/translate.c
in favour of either using glib g_assert_not_reached() (for the genuinely
can't-happen cases) or cpu_abort() (for the "this isn't implemented",
in line with other unimplemented cases in the target).

This has the benefit of silencing some clang warnings about
variables used while uninitialized (which are emitted because
clang can't figure out that qemu_assert(0, something) never
returns.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocpu: Factor out cpu_generic_init()
Andreas Färber [Tue, 4 Mar 2014 02:17:10 +0000 (03:17 +0100)] 
cpu: Factor out cpu_generic_init()

All targets using it gain the ability to set -cpu name,key=value,...
options via the default TYPE_CPU CPUClass::parse_features() implementation.

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocpu: Implement CPUClass::parse_features() for the rest of CPUs
Andreas Färber [Mon, 3 Mar 2014 22:33:51 +0000 (23:33 +0100)] 
cpu: Implement CPUClass::parse_features() for the rest of CPUs

CPUs who do not provide their own implementation of feature parsing
will treat each option as a QOM property and set it to the supplied
value.

Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-sparc: Defer SPARCCPU feature inference to QOM realize
Andreas Färber [Tue, 4 Mar 2014 00:26:33 +0000 (01:26 +0100)] 
target-sparc: Defer SPARCCPU feature inference to QOM realize

Gets it out of cpu_sparc_register() and aligns with target-arm.

Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-sparc: Implement CPUClass::parse_features() for SPARCCPU
Andreas Färber [Mon, 3 Mar 2014 23:38:58 +0000 (00:38 +0100)] 
target-sparc: Implement CPUClass::parse_features() for SPARCCPU

Factor cpu_model parsing out of cpu_sparc_find_by_name() by passing
cpu_sparc_find_by_name() the name portion only and calling
CPUClass::parse_features() from cpu_sparc_register() afterwards.

Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-sparc: Use error_report() for CPU error reporting
Andreas Färber [Mon, 3 Mar 2014 22:47:54 +0000 (23:47 +0100)] 
target-sparc: Use error_report() for CPU error reporting

Replace non-debug fprintf() with error_report().

Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocpu: Introduce CPUClass::parse_features() hook
Andreas Färber [Mon, 3 Mar 2014 22:19:19 +0000 (23:19 +0100)] 
cpu: Introduce CPUClass::parse_features() hook

Adapt the X86CPU implementation to suit the generic hook.
This involves a cleanup of error handling to cope with NULL errp.

Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-i386: X86CPU model subclasses
Eduardo Habkost [Mon, 10 Feb 2014 10:21:30 +0000 (08:21 -0200)] 
target-i386: X86CPU model subclasses

Register separate QOM types for each x86 CPU model.

This will allow management code to more easily probe what each CPU model
provides, by simply creating objects using the appropriate class name,
without having to restart QEMU.

This also allows us to eliminate the qdev_prop_set_globals_for_type()
hack to set CPU-model-specific global properties.

Instead of creating separate class_init functions for each class, I just
used class_data to store a pointer to the X86CPUDefinition struct for
each CPU model. This should make the patch shorter and easier to review.
Later we can gradually convert each X86CPUDefinition field to lists of
per-class property defaults.

The "host" CPU model is special, as the feature flags depend on KVM
being initialized. So it has its own class_init and instance_init
function, and feature flags are set on instance_init instead of
class_init.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-by: Eduardo Habkost <ehabkost@redhat.com>
[AF: Limit the host CPU type to CONFIG_KVM as build fix]
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-i386: Prepare CPUClass::class_by_name for X86CPU
Andreas Färber [Mon, 10 Feb 2014 21:02:44 +0000 (22:02 +0100)] 
target-i386: Prepare CPUClass::class_by_name for X86CPU

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-i386: Enable x2apic by default on KVM
Eduardo Habkost [Wed, 19 Feb 2014 14:58:12 +0000 (11:58 -0300)] 
target-i386: Enable x2apic by default on KVM

When on KVM mode, enable x2apic by default on all CPU models.

Normally we try to keep the CPU model definitions as close as the real
CPUs as possible, but x2apic can be emulated by KVM without host CPU
support for x2apic, and it improves performance by reducing APIC access
overhead. x2apic emulation is available on KVM since 2009 (Linux
2.6.32-rc1), there's no reason for not enabling x2apic by default when
running KVM.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-i386: Introduce x86_cpu_compat_disable_kvm_features()
Eduardo Habkost [Wed, 19 Feb 2014 14:58:11 +0000 (11:58 -0300)] 
target-i386: Introduce x86_cpu_compat_disable_kvm_features()

Instead of the feature-specific disable_kvm_pv_eoi() function, create a
more general function that can be used to disable other feature bits in
machine-type compat code.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-i386: Make kvm_default_features an array
Eduardo Habkost [Wed, 19 Feb 2014 14:58:10 +0000 (11:58 -0300)] 
target-i386: Make kvm_default_features an array

We will later make the KVM-specific code affect other feature words,
too.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-i386: Don't declare variables in the middle of blocks
Eduardo Habkost [Wed, 19 Feb 2014 19:39:21 +0000 (16:39 -0300)] 
target-i386: Don't declare variables in the middle of blocks

Some of my recent changes introduced variable declarations in the middle
of code blocks.

Fix the code so that it compiles without warnings when using
-Wdeclaration-after-statement.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-i386: Rename x86_def_t to X86CPUDefinition
Eduardo Habkost [Thu, 30 Jan 2014 19:48:58 +0000 (17:48 -0200)] 
target-i386: Rename x86_def_t to X86CPUDefinition

As the new X86CPU subclass code is going to change lots of the code
invoving x86_def_t, let's rename the struct to match coding style first.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-i386: Call x86_cpu_load_def() earlier
Eduardo Habkost [Thu, 30 Jan 2014 19:48:57 +0000 (17:48 -0200)] 
target-i386: Call x86_cpu_load_def() earlier

As we will initialize the X86CPU fields on instance_init eventually,
move the code that initializes the X86CPU data based on the CPU model
name closer to the object_new() call.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-i386: Rename cpu_x86_register() to x86_cpu_load_def()
Eduardo Habkost [Thu, 30 Jan 2014 19:48:56 +0000 (17:48 -0200)] 
target-i386: Rename cpu_x86_register() to x86_cpu_load_def()

There isn't any kind of "registration" involved in cpu_x86_register()
anymore: it is simply looking up a CPU model name and loading the model
definition data into the X86CPU object. Rename it to x86_cpu_load_def()
to reflect what it does.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocpu: Turn cpu_has_work() into a CPUClass hook
Andreas Färber [Sun, 25 Aug 2013 16:53:55 +0000 (18:53 +0200)] 
cpu: Turn cpu_has_work() into a CPUClass hook

Default to false.

Tidy variable naming and inline cast uses while at it.

Tested-by: Jia Liu <proljc@gmail.com> (or32)
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-xtensa: Clean up ENV_GET_CPU() usage
Andreas Färber [Sun, 9 Mar 2014 19:02:29 +0000 (20:02 +0100)] 
target-xtensa: Clean up ENV_GET_CPU() usage

Commits a00817cc4c18b7872e92765a4736fb2227cc237b and
fdfba1a298ae26dd44bcfdb0429314139a0bc55a added usages of ENV_GET_CPU()
macro in target-specific code.

Use xtensa_env_get_cpu() instead.

Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-unicore32: Clean up ENV_GET_CPU() usage
Andreas Färber [Sun, 9 Mar 2014 18:58:13 +0000 (19:58 +0100)] 
target-unicore32: Clean up ENV_GET_CPU() usage

Commit fdfba1a298ae26dd44bcfdb0429314139a0bc55a added a usage of
ENV_GET_CPU() macro in target-specific code.

Use uc32_env_get_cpu() instead.

Cc: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-sparc: Clean up ENV_GET_CPU() usage
Andreas Färber [Sun, 9 Mar 2014 18:51:00 +0000 (19:51 +0100)] 
target-sparc: Clean up ENV_GET_CPU() usage

Commits fdfba1a298ae26dd44bcfdb0429314139a0bc55a,
2c17449b3022ca9623c4a7e2a504a4150ac4ad30 and
f606604f1c10b60ef294f1b9b229426521a365e3 added usages of ENV_GET_CPU()
macro in target-specific code.

Use sparc_env_get_cpu() instead and reuse the variables.

Cc: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-s390x: Clean up ENV_GET_CPU() usage
Andreas Färber [Sun, 9 Mar 2014 18:40:08 +0000 (19:40 +0100)] 
target-s390x: Clean up ENV_GET_CPU() usage

Commits f606604f1c10b60ef294f1b9b229426521a365e3,
2c17449b3022ca9623c4a7e2a504a4150ac4ad30 and
5ce5944dc0ffdc43c11b5cad11e526f699aabe4c added usages of ENV_GET_CPU()
macro in target-specific code.

Use s390_env_get_cpu() instead.

Cc: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-ppc: Clean up ENV_GET_CPU() usage
Andreas Färber [Sun, 9 Mar 2014 18:29:41 +0000 (19:29 +0100)] 
target-ppc: Clean up ENV_GET_CPU() usage

Commits fdfba1a298ae26dd44bcfdb0429314139a0bc55a,
ab1da85791340e504d10487e1add81b9988afa98,
f606604f1c10b60ef294f1b9b229426521a365e3 and
2c17449b3022ca9623c4a7e2a504a4150ac4ad30 added usages of ENV_GET_CPU()
macro in target-specific code.

Use ppc_env_get_cpu() instead.

Cc: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-i386: Clean up ENV_GET_CPU() usage
Andreas Färber [Sun, 9 Mar 2014 18:15:27 +0000 (19:15 +0100)] 
target-i386: Clean up ENV_GET_CPU() usage

Commits fdfba1a298ae26dd44bcfdb0429314139a0bc55a,
f606604f1c10b60ef294f1b9b229426521a365e3 and
2c17449b3022ca9623c4a7e2a504a4150ac4ad30 added usages of ENV_GET_CPU()
macro in target-specific code.

Use x86_env_get_cpu() or reuse existing X86CPU variable instead.

Cc: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-arm: Clean up ENV_GET_CPU() usage
Andreas Färber [Sun, 9 Mar 2014 18:10:29 +0000 (19:10 +0100)] 
target-arm: Clean up ENV_GET_CPU() usage

Commits ab1da85791340e504d10487e1add81b9988afa98,
fdfba1a298ae26dd44bcfdb0429314139a0bc55a,
2c17449b3022ca9623c4a7e2a504a4150ac4ad30 added usages of ENV_GET_CPU()
macro to target-specific code.

Use arm_env_get_cpu() instead and enforce separating variable
declarations.

Cc: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agotarget-alpha: Clean up ENV_GET_CPU() usage
Andreas Färber [Sun, 9 Mar 2014 17:58:57 +0000 (18:58 +0100)] 
target-alpha: Clean up ENV_GET_CPU() usage

Commits 2c17449b3022ca9623c4a7e2a504a4150ac4ad30,
fdfba1a298ae26dd44bcfdb0429314139a0bc55a,
ab1da85791340e504d10487e1add81b9988afa98 and
f606604f1c10b60ef294f1b9b229426521a365e3 added usages of ENV_GET_CPU()
macro in target-specific code.

Use alpha_env_get_cpu() instead.

Cc: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agocpu: Don't clear cpu->exit_request on reset
Edgar E. Iglesias [Thu, 13 Feb 2014 05:07:14 +0000 (15:07 +1000)] 
cpu: Don't clear cpu->exit_request on reset

cpu->exit_request is part of the execution environment and should
not be cleared when a CPU resets.

Otherwise, we might deadlock QEMU if a CPU resets while there is
I/O going on.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
7 years agoMerge remote-tracking branch 'remotes/kraxel/tags/pull-chardev-1' into staging
Peter Maydell [Thu, 13 Mar 2014 17:19:14 +0000 (17:19 +0000)] 
Merge remote-tracking branch 'remotes/kraxel/tags/pull-chardev-1' into staging

char: restore read callback on a reattached (hotplug) chardev

# gpg: Signature made Thu 13 Mar 2014 10:29:34 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-chardev-1:
  char: restore read callback on a reattached (hotplug) chardev

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