mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-24 07:59:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,321 Commits 53 Branches 375 Tags
0851c9f75ccb0baf28f5bf901b9ffe3c91fcf969
Commit Graph

52 Commits

Author SHA1 Message Date
Andreas Färber
203439ce0a virtio-console: Use exitfn for virtserialport, too 
virtconsole and virtserialport are identical in every other aspect
except for the distinguishing VirtIOSerialPortClass::is_console field.

Cc: qemu-stable@nongnu.org
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Message-id: 1375313326-14966-1-git-send-email-afaerber@suse.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 2013-08-01 11:18:32 -05:00
Heinz Graalfs
2e14211476 s390/sclpconsole: handle char layer busy conditions 
Handle busy conditions (errno=EAGAIN) in char layer by using
the new char layer in the sclp console.

Signed-off-by: Heinz Graalfs <graalfs@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
 2013-07-30 16:10:59 +02:00
Andreas Färber
71ffe1a01f pl011: QOM'ify pl011 and pl011_luminary 
Let the Luminary variant inherit from the ARM one, overwriting its ID on
instance_init. Introduce type constant and use QOM casts. Replace
triplicated SysBusDevice initfn with QOM realizefn and instance_init.

Signed-off-by: Andreas Färber <afaerber@suse.de>
 2013-07-29 21:06:28 +02:00
Andreas Färber
ab640bfc2e pl011: Rename pl011_state 
Signed-off-by: Andreas Färber <afaerber@suse.de>
 2013-07-29 21:06:28 +02:00
Andreas Färber
79bbe8bf3d milkymist-uart: QOM cast cleanup 
Signed-off-by: Andreas Färber <afaerber@suse.de>
 2013-07-29 21:06:28 +02:00
Andreas Färber
85f3d30245 lm32_uart: QOM cast cleanup 
Signed-off-by: Andreas Färber <afaerber@suse.de>
 2013-07-29 21:06:28 +02:00
Andreas Färber
a0b97927e3 lm32_juart: QOM cast cleanup 
Signed-off-by: Andreas Färber <afaerber@suse.de>
 2013-07-29 21:06:28 +02:00
Andreas Färber
0ee10242fd lm32_juart: Relocate and tidy header 
Signed-off-by: Andreas Färber <afaerber@suse.de>
 2013-07-29 21:06:27 +02:00
Andreas Färber
8d8e34815e imx_serial: QOM cast cleanup 
Signed-off-by: Andreas Färber <afaerber@suse.de>
 2013-07-29 21:06:27 +02:00
Andreas Färber
ae8e049031 grlib_apbuart: QOM cast cleanup 
Signed-off-by: Andreas Färber <afaerber@suse.de>
 2013-07-29 21:06:27 +02:00
Andreas Färber
61149ff687 exynos4210_uart: QOM cast cleanup 
Signed-off-by: Andreas Färber <afaerber@suse.de>
 2013-07-29 21:06:27 +02:00
Andreas Färber
81069b2054 escc: QOM cast cleanup 
Signed-off-by: Andreas Färber <afaerber@suse.de>
 2013-07-29 21:06:27 +02:00
Andreas Färber
534f6ff925 cadence_uart: QOM cast cleanup 
Signed-off-by: Andreas Färber <afaerber@suse.de>
 2013-07-29 21:06:27 +02:00
Andreas Färber
24bf6c1f2a xilinx_uartlite: QOM cast cleanups 
Introduce type constant and use QOM casts.

Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
 2013-07-29 20:45:45 +02:00
Andreas Färber
144712ca14 xilinx_uartlite: Rename xlx_uartlite to XilinxUARTLite 
Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
 2013-07-29 20:45:41 +02:00
Andreas Färber
b85423fe75 etraxfs_ser: QOM cast cleanups 
Rename etrax_serial to ETRAXSerial, introduce type constant and use QOM
casts.

Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
 2013-07-29 20:45:33 +02:00
Marcel Apfelbaum
125ee0ed9c devices: Associate devices to their logical category 
The category will be used to sort the devices displayed in
the command line help.

Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
Message-id: 1375107465-25767-4-git-send-email-marcel.a@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 2013-07-29 10:37:09 -05:00
David Gibson
db1b58e937 pseries: savevm support for PAPR VIO logical tty 
This patch adds the necessary VMStateDescription information to support
savevm/loadvm for the spapr_tty (PAPR logical serial) device.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Message-id: 1374175984-8930-5-git-send-email-aliguori@us.ibm.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 2013-07-29 10:37:08 -05:00
Peter Crosthwaite
9121d02cb3 char/cadence_uart: Fix reset for unattached instances 
commit 1db8b5efe0 introduced an issue
where QEMU would segfault if you have an unattached Cadence UART.

Fix by guarding the flush-on-reset logic on there being a qemu_chr
attachment.

Reported-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Tested-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Message-id: 9009578ee10a50d994b2e10aa2840d73765f5968.1370577272.git.peter.crosthwaite@xilinx.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
 2013-07-15 12:28:07 +01:00
Paolo Bonzini
300b1fc68c hw/c*: pass owner to memory_region_init* functions 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 2013-07-04 17:42:47 +02:00
Paolo Bonzini
3cf63ff25c escc: rename struct to ESCCState 
We are using the same struct name for two devices.  8250 is widespread
enough that this causes some confusion, rename the other instance.

Reviewed-by: Andreas Faerber <afaerber@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 2013-07-04 17:42:46 +02:00
Paolo Bonzini
2c9b15cab1 memory: add owner argument to initialization functions 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 2013-07-04 17:42:44 +02:00
Edgar E. Iglesias
b52df46551 cadence_uart: Handle backend tx errors 
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
 2013-06-24 16:26:52 +02:00
Vladimir Senkov
b165b0d8e6 char/serial: fix copy&paste error (fifo8_is_full vs empty) 
Copy&paste error in serial.c causes a crash when attempting
to read from UART (if there is no data to be read)

Signed-off-by: Vladimir Senkov <hangup@gmail.com>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
 2013-06-17 12:57:50 +04:00
Blue Swirl
371a775dc1 Merge branch 'realize-isa.v2' of git://github.com/afaerber/qemu-cpu 
* 'realize-isa.v2' of git://github.com/afaerber/qemu-cpu:
  qdev: Drop FROM_QBUS() macro
  isa: QOM'ify ISADevice
  isa: QOM'ify ISABus
  i8259: Convert PICCommonState to use QOM realizefn
  kvm/i8259: QOM'ify some more
  i8259: QOM'ify some more
  i8254: Convert PITCommonState to QOM realizefn
  kvm/i8254: QOM'ify some more
  i8254: QOM'ify some more
  isa: Use realizefn for ISADevice
  cs4231a: QOM'ify some more
  gus: QOM'ify some more
 2013-06-15 10:53:44 +00:00
Peter Crosthwaite
b5601df762 char/serial: serial_ioport_write: Factor out common code 
These three lines are common to both FIFO and regular mode. Just factor
them out to outside the if rather than replicate the same lines inside
both if and else.

Cc: qemu-trivial@nongnu.org

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
 2013-06-11 23:45:44 +04:00
Peter Crosthwaite
8e8638fa87 char/serial: Use generic Fifo8 
Use the generic Fifo8 helper provided by QEMU, rather than re-implement
privately.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
 2013-06-11 23:45:44 +04:00
Peter Crosthwaite
7f4f0a227f char/serial: cosmetic fixes. 
Some cosmetic fixes to char/serial fixing some checkpatch errors.

Cc: qemu-trivial@nongnu.org

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
 2013-06-11 23:45:44 +04:00
Andreas Färber
4a17cc4f28 isa: QOM'ify ISADevice 
Rename its parent field and use DEVICE() where necessary.

Signed-off-by: Andreas Färber <afaerber@suse.de>
 2013-06-07 14:55:33 +02:00
Andreas Färber
db895a1e6a isa: Use realizefn for ISADevice 
Drop ISADeviceClass::init and the resulting no-op initfn and let
children implement their own realizefn. Adapt error handling.
Split off an instance_init where sensible.

Signed-off-by: Andreas Färber <afaerber@suse.de>
 2013-06-07 12:14:45 +02:00
liguang
668fca91d4 debugcon: fix compiler warning when open DEBUG_DEBUGCON 
compiler warnings:
  CC    hw/char/debugcon.o
hw/char/debugcon.c: In function ‘debugcon_ioport_write’:
hw/char/debugcon.c:58: warning: format ‘%02x’ expects type ‘unsigned int’, but argument 3 has type ‘uint64_t’
hw/char/debugcon.c: In function ‘debugcon_ioport_read’:
hw/char/debugcon.c:70: warning: format ‘%04x’ expects type ‘unsigned int’, but argument 2 has type ‘hwaddr’

Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
 2013-06-01 14:25:38 +04:00
liguang
e6ee28469f debugcon: make debug message more readable 
before change:
Bdebugcon: write addr=0x0000 val=0x6f
odebugcon: write addr=0x0000 val=0x6f
odebugcon: write addr=0x0000 val=0x74
tdebugcon: write addr=0x0000 val=0x69
idebugcon: write addr=0x0000 val=0x6e
ndebugcon: write addr=0x0000 val=0x67
gdebugcon: write addr=0x0000 val=0x20
 debugcon: write addr=0x0000 val=0x66

after change:
B [debugcon: write addr=0x0000 val=0x6f]
o [debugcon: write addr=0x0000 val=0x6f]
o [debugcon: write addr=0x0000 val=0x74]
t [debugcon: write addr=0x0000 val=0x69]
i [debugcon: write addr=0x0000 val=0x6e]
n [debugcon: write addr=0x0000 val=0x67]
g [debugcon: write addr=0x0000 val=0x20]
  [debugcon: write addr=0x0000 val=0x66]

Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
 2013-06-01 14:25:38 +04:00
liguang
8c1f72da6b debugcon: fix always print "addr=0x0, val=0x0" bug when use DEBUG_DEBUGCON 
when use DEBUG_DEBUGCON, screen spits:
debugcon: write addr=0x0000 val=0x00
Rdebugcon: write addr=0x0000 val=0x00
udebugcon: write addr=0x0000 val=0x00
ndebugcon: write addr=0x0000 val=0x00
ndebugcon: write addr=0x0000 val=0x00
idebugcon: write addr=0x0000 val=0x00
ndebugcon: write addr=0x0000 val=0x00
gdebugcon: write addr=0x0000 val=0x00
 debugcon: write addr=0x0000 val=0x00
odebugcon: write addr=0x0000 val=0x00
pdebugcon: write addr=0x0000 val=0x00
tdebugcon: write addr=0x0000 val=0x00
idebugcon: write addr=0x0000 val=0x00
odebugcon: write addr=0x0000 val=0x00
ndebugcon: write addr=0x0000 val=0x00
 debugcon: write addr=0x0000 val=0x00
rdebugcon: write addr=0x0000 val=0x00
odebugcon: write addr=0x0000 val=0x00
mdebugcon: write addr=0x0000 val=0x00
 debugcon: write addr=0x0000 val=0x00
adebugcon: write addr=0x0000 val=0x00
tdebugcon: write addr=0x0000 val=0x00
 debugcon: write addr=0x0000 val=0x00

Oh, that's wrong, val is not always be 0.
this bug caused by lack of length modifier
for specifier 'x'.

Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
 2013-06-01 14:25:38 +04:00
KONRAD Frederic
80270a1968 virtio-serial: fix command line compatibility. 
The bus name is wrong since the refactoring.

This keeps the behaviour of the command line.

Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
Tested-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Message-id: 1367330931-12994-5-git-send-email-fred.konrad@greensocs.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 2013-05-03 12:05:15 -05:00
Andreas Färber
eeceb0849d serial: QOM'ify ISA serial 
Introduce type constant and cast macro to obsolete DO_UPCAST().

Prepares for ISA realizefn.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Message-id: 1367093935-29091-16-git-send-email-afaerber@suse.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 2013-04-29 08:27:49 -05:00
Andreas Färber
b0dc5ee6bd parallel: QOM'ify 
Introduce type constant and cast macro to obsolete DO_UPCAST().

Prepares for ISA realizefn.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Message-id: 1367093935-29091-11-git-send-email-afaerber@suse.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 2013-04-29 08:27:48 -05:00
David Gibson
fd506b4f61 pseries: Convert VIO code to QOM style type safe(ish) casts 
Curerntly the pseries VIO device code contains quite a few explicit
uses of DO_UPCAST and plain C casts.  This is (obviously) type unsafe,
and not the conventional way of doing things in the QOM model.  This
patch converts the code to use the QOM convention of per-type macros
to do verified casts with OBJECT_CHECK().

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
 2013-04-26 23:02:41 +02:00
KONRAD Frederic
6a1a8cc7af virtio: cleanup: init and exit function. 
This clean the init and the exit functions and rename virtio_common_cleanup
to virtio_cleanup.

Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
Message-id: 1366791683-5350-7-git-send-email-fred.konrad@greensocs.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 2013-04-24 11:50:21 -05:00
KONRAD Frederic
181103cd52 virtio: remove the function pointer. 
This remove the function pointer in VirtIODevice, and use only
VirtioDeviceClass function pointer.

Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
Message-id: 1366791683-5350-5-git-send-email-fred.konrad@greensocs.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 2013-04-24 11:50:20 -05:00
Hans de Goede
c3d6b96ebb virtio-console: Remove any pending watches on close 
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
 2013-04-16 11:52:09 +02:00
Hans de Goede
f9fb0532fb virtio-console: Also throttle when less was written then requested 
This is necessary so that we get properly woken up to write the rest.

This patch also changes the len argument to the have_data callback, to
avoid doing an unsigned signed comparison.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
 2013-04-16 11:52:09 +02:00
Anthony Liguori
4ceb193d30 Merge remote-tracking branch 'bonzini/hw-dirs' into staging 
* bonzini/hw-dirs:
  exec: remove useless declarations from memory-internal.h
  memory: move core typedefs to qemu/typedefs.h
  include: avoid useless includes of exec/ headers
  sysemu: avoid proliferation of include/ subdirectories
  tpm: reorganize headers and split hardware part
  configure: fix TPM logic
  acpi.h: make it self contained
  acpi: move declarations from pc.h to acpi.h
  hw: Add lost ARM core again
  Fix failure to create q35 machine
  Add linux-headers to QEMU_INCLUDES
  arm: fix location of some include files

Conflicts:
	configure

aliguori: trivial conflict in configure output

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 2013-04-15 17:06:04 -05:00
Paolo Bonzini
dccfcd0e5f sysemu: avoid proliferation of include/ subdirectories 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 2013-04-15 18:19:25 +02:00
KONRAD Frederic
d5990ff467 virtio-serial: cleanup: remove qdev field. 
The qdev field is no longer needed, just drop it.

Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: Amit Shah <amit.shah@redhat.com>
Message-id: 1365512016-21944-8-git-send-email-fred.konrad@greensocs.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 2013-04-15 10:22:05 -05:00
KONRAD Frederic
76017fd2ea virtio-serial: cleanup: use QOM casts. 
As the virtio-serial-pci and virtio-serial-s390 are switched to the new
API, we can use QOM casts.

Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: Amit Shah <amit.shah@redhat.com>
Message-id: 1365512016-21944-7-git-send-email-fred.konrad@greensocs.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 2013-04-15 10:22:05 -05:00
KONRAD Frederic
34b95b2c64 virtio-serial: cleanup: init and exit functions. 
This remove old init and exit function as they are no longer needed.

Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: Amit Shah <amit.shah@redhat.com>
Message-id: 1365512016-21944-6-git-send-email-fred.konrad@greensocs.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 2013-04-15 10:22:05 -05:00
KONRAD Frederic
2cd2b016a1 virtio-serial: add the virtio-serial device. 
Create virtio-serial which extends virtio-device, so it can be connected
on virtio-bus.

Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: Amit Shah <amit.shah@redhat.com>
Message-id: 1365512016-21944-2-git-send-email-fred.konrad@greensocs.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 2013-04-15 10:22:04 -05:00
Paolo Bonzini
47b43a1f41 hw: move private headers to hw/ subdirectories. 
Many headers are used only in a single directory.  These can be
kept in hw/.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 2013-04-08 18:13:16 +02:00
Paolo Bonzini
9944d32001 hw: move char devices to hw/char/, configure via default-configs/ 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 2013-04-08 18:13:14 +02:00
Paolo Bonzini
6e7907468f hw: move virtio devices to hw/ subdirectories 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 2013-04-08 18:13:12 +02:00