sdk/emulator/qemu.git
12 years agousb-hub: implement find_device
Gerd Hoffmann [Tue, 10 Jan 2012 16:08:13 +0000 (17:08 +0100)]
usb-hub: implement find_device

Implement the find_device callback for the usb hub.  It'll loop over all
ports, calling usb_find_device for all enabled ports until it finds a
matching device.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
12 years agousb: add usb_find_device()
Gerd Hoffmann [Tue, 10 Jan 2012 15:59:28 +0000 (16:59 +0100)]
usb: add usb_find_device()

Add usb_find_device().  This function will check whenever a device with
a specific address is connected to the specified port.  Usually this
will just check state and address of the device hooked up to the port,
but in case of a hub it will ask the hub to check all hub ports for a
matching device.

This patch doesn't put the code into use yet, see the following patches
for details.

The master plan is to separate device lookup and packet processing.
Right now the usb code simply walks all devices, calls
usb_handle_packet() on each until one accepts the packet (by returning
something different that USB_RET_NODEV).  I want to have a device lookup
first, then call usb_handle_packet() once, for the device which actually
processes the packet.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
12 years agousb: kill usb_send_msg
Gerd Hoffmann [Fri, 6 Jan 2012 14:31:38 +0000 (15:31 +0100)]
usb: kill usb_send_msg

No users left.  Zap it.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
12 years agousb: kill USB_MSG_RESET
Gerd Hoffmann [Fri, 6 Jan 2012 14:23:10 +0000 (15:23 +0100)]
usb: kill USB_MSG_RESET

The USB subsystem pipes internal reset notifications through
usb_handle_packet() with a special magic PID.  This indirection
is a pretty pointless excercise as it ends up being handled by
usb_generic_handle_packet anyway.

Replace the USB_MSG_RESET with a usb_device_reset() function
which can be called directly.  Also rename the existing usb_reset()
function to usb_port_reset() to avoid confusion.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
12 years agousb: kill USB_MSG_{ATTACH,DETACH}
Gerd Hoffmann [Fri, 6 Jan 2012 14:13:34 +0000 (15:13 +0100)]
usb: kill USB_MSG_{ATTACH,DETACH}

The USB subsystem pipes internal attach/detach notifications through
usb_handle_packet() with a special magic PID.  This indirection is a
pretty pointless excercise as it ends up being handled by
usb_generic_handle_packet anyway.  Remove it.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
12 years agousb-redir: Add the posibility to filter out certain devices from redirecion
Hans de Goede [Wed, 25 Jan 2012 08:50:39 +0000 (09:50 +0100)]
usb-redir: Add the posibility to filter out certain devices from redirecion

This patch adds the posibility to filter out certain devices from redirecion.
To use this pass the filter property to -device usb-redir.  The filter
property takes a string consisting of filter rules, the format for a rule is:
<class>:<vendor>:<product>:<version>:<allow>

-1 can be used to allow any value for a field.

Muliple rules can be concatonated using | as a separator. Note that if
a device matches none of the passed in rules, redirecting it will not be
allowed!

Example:
-device usb-redir,filter='-1:0x0781:0x5567:-1:0|0x08:-1:-1:-1:1'

This example will deny the Sandisk Cruzer Blade being redirected, as it
has a usb id of 0781:5567, it will allow any other usb mass storage devices,
and it will deny any other devices (the default for devices not matching any
of the rules.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
12 years agousb-ehci: Clear the portstatus powner bit on device disconnect
Hans de Goede [Fri, 13 Jan 2012 13:28:56 +0000 (14:28 +0100)]
usb-ehci: Clear the portstatus powner bit on device disconnect

According to the EHCI spec port ownership should revert to the EHCI controller
on device disconnect. This fixes the problem of a port getting stuck on USB 1
when using redirection and plugging in a USB 2 device after a USB 1 device
has been redirected.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
12 years agousb-uhci: implement bandwidth management
Gerd Hoffmann [Thu, 26 Jan 2012 12:57:40 +0000 (13:57 +0100)]
usb-uhci: implement bandwidth management

The OS is allowed to make the UHCI Controller run in circles.  That is
usually done to serve multiple connected USB devices in a robin-round
fashion, so the available USB bandwidth is evenly distributed between
devices.

The uhci emulation handles this in a very poor way though.  When it
figures it runs in circles it stops processing unconditionally, so
it usually processes at most a single transfer desriptor per queue,
even if there are multiple transfer descriptors are queued up.

This patch makes uhci act in a more sophisticated way.  It keeps track
of successful processed transfer descriptors and transfered bytes.  Then
it will stop processing when there is nothing to do (no transfer
descriptor was completed the last round) or when the transfered data
reaches the usb bandwidth limit.

Result is that the usb-storage devices connected to uhci are ten times
faster, mkfs.vfat time for a 64M stick goes down from five seconds to
a half second.  Reason for this is that we are now processing up to 20
transfer descriptors (with 64 bytes each) per frame instead of a single
one.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
12 years agomake: Remove duplicate use of GLIB_CFLAGS
Stefan Weil [Wed, 8 Feb 2012 21:41:37 +0000 (22:41 +0100)]
make: Remove duplicate use of GLIB_CFLAGS

Makefile, Makefile.hw, Makefile.target and libcacard/Makefile
added GLIB_CFLAGS to QEMU_CFLAGS.

Makefile.objs does this, too, and is included by all other
Makefiles, so GLIB_CFLAGS were added twice (reported by malc).

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: malc <av1474@comtv.ru>
12 years agoARM devboards: Set arm_sysctl properties before init, not after
Peter Maydell [Thu, 9 Feb 2012 06:11:16 +0000 (06:11 +0000)]
ARM devboards: Set arm_sysctl properties before init, not after

The ARM devboard models (vexpress-a9, realview, versatilepb, etc)
were accidentally trying to set one of the arm_sysctl properties
after device init. This has now become a fatal error; set the property
before device init where it should be done instead.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
12 years agoMerge remote-tracking branch 'bonzini/qdev-props-for-anthony' into staging
Anthony Liguori [Wed, 8 Feb 2012 13:24:37 +0000 (07:24 -0600)]
Merge remote-tracking branch 'bonzini/qdev-props-for-anthony' into staging

* bonzini/qdev-props-for-anthony: (25 commits)
  qdev: remove unused fields from PropertyInfo
  qdev: initialize properties via QOM
  qdev: inline qdev_prop_set into qdev_prop_set_ptr
  qdev: access properties via QOM
  qdev: fix off-by-one
  qdev: let QOM free properties
  qdev: remove parse/print methods for pointer properties
  qdev: make the non-legacy pci address property accept an integer
  qdev: remove parse/print methods for mac properties
  qdev: remove print/parse methods from LostTickPolicy properties
  qdev: remove parse method for string properties
  qdev: allow reusing get/set for legacy property
  qdev: remove direct calls to print/parse
  qom: add property get/set wrappers for links
  qom: fix canonical paths vs. interfaces
  qom: use object_resolve_path_type for links
  qom: add object_resolve_path_type
  qom: fix off-by-one
  qom: add property get/set wrappers for C types
  qom: add QObject-based property get/set wrappers
  ...

12 years agoMerge remote-tracking branch 'aneesh/for-upstream' into staging
Anthony Liguori [Wed, 8 Feb 2012 13:23:55 +0000 (07:23 -0600)]
Merge remote-tracking branch 'aneesh/for-upstream' into staging

* aneesh/for-upstream:
  hw/9pfs: Remove O_NOATIME flag from 9pfs open() calls in readonly mode
  hw/9pfs: Update MAINTAINERS file
  fsdev: Fix parameter parsing for proxy helper
  hw/9pfs: Fix crash when mounting with synthfs
  hw/9pfs: Preserve S_ISGID
  hw/9pfs: Add new security model mapped-file.

12 years agoMerge remote-tracking branch 'sweil/w32' into staging
Anthony Liguori [Wed, 8 Feb 2012 13:23:23 +0000 (07:23 -0600)]
Merge remote-tracking branch 'sweil/w32' into staging

* sweil/w32:
  w32: Initialise critical section before starting thread (fix #922131)
  w32: Build windows and console executables

12 years agoRestore consistent formatting
malc [Tue, 7 Feb 2012 18:11:04 +0000 (22:11 +0400)]
Restore consistent formatting

Signed-off-by: malc <av1474@comtv.ru>
12 years agow32: Initialise critical section before starting thread (fix #922131)
Stefan Weil [Tue, 31 Jan 2012 06:14:15 +0000 (07:14 +0100)]
w32: Initialise critical section before starting thread (fix #922131)

This patch was contributed by Bogdan Harjoc. I added some assertions.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
12 years agow32: Build windows and console executables
Stefan Weil [Thu, 22 Dec 2011 10:18:53 +0000 (11:18 +0100)]
w32: Build windows and console executables

System emulation executables with SDL are typically windows
executables. Sometimes console executables are more useful,
so create both variants if linker option -mwindows was detected.

v2:
This version uses QEMU_PROGW / QEMU_PROG instead of QEMU_PROG / QEMU_PROGC.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
12 years agoqdev: remove unused fields from PropertyInfo
Paolo Bonzini [Thu, 2 Feb 2012 21:51:09 +0000 (22:51 +0100)]
qdev: remove unused fields from PropertyInfo

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqdev: initialize properties via QOM
Paolo Bonzini [Thu, 2 Feb 2012 08:43:02 +0000 (09:43 +0100)]
qdev: initialize properties via QOM

Similarly, use the object properties also to set the default
values of the qdev properties.  This requires reordering
registration and initialization.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqdev: inline qdev_prop_set into qdev_prop_set_ptr
Paolo Bonzini [Thu, 2 Feb 2012 15:58:31 +0000 (16:58 +0100)]
qdev: inline qdev_prop_set into qdev_prop_set_ptr

qdev_prop_set is not needed anymore except for hacks, simplify it and
inline it.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqdev: access properties via QOM
Paolo Bonzini [Thu, 2 Feb 2012 11:51:44 +0000 (12:51 +0100)]
qdev: access properties via QOM

Do not poke anymore in the struct when accessing qdev properties.
Instead, ask the object to set the right value.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqdev: fix off-by-one
Paolo Bonzini [Thu, 2 Feb 2012 15:19:21 +0000 (16:19 +0100)]
qdev: fix off-by-one

Integer properties did not work.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqdev: let QOM free properties
Paolo Bonzini [Thu, 2 Feb 2012 12:08:48 +0000 (13:08 +0100)]
qdev: let QOM free properties

Drop the special free callback.  Instead, register a "regular"
release method in the non-legacy property.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqdev: remove parse/print methods for pointer properties
Paolo Bonzini [Thu, 2 Feb 2012 12:01:40 +0000 (13:01 +0100)]
qdev: remove parse/print methods for pointer properties

Pointer properties (except for PROP_PTR of course) should not need a
legacy counterpart.  In the future, relative paths will ensure that
QEMU will support the same syntax as now for drives etc..

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqdev: make the non-legacy pci address property accept an integer
Paolo Bonzini [Thu, 2 Feb 2012 16:12:19 +0000 (17:12 +0100)]
qdev: make the non-legacy pci address property accept an integer

PCI addresses are set with qdev_prop_uint32.  Thus we make the QOM
property accept a device and function encoded in an 8-bit integer,
instead of the magic dd.f hex string.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqdev: remove parse/print methods for mac properties
Paolo Bonzini [Thu, 2 Feb 2012 16:08:47 +0000 (17:08 +0100)]
qdev: remove parse/print methods for mac properties

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqdev: remove print/parse methods from LostTickPolicy properties
Paolo Bonzini [Thu, 2 Feb 2012 21:09:44 +0000 (22:09 +0100)]
qdev: remove print/parse methods from LostTickPolicy properties

Also generalize the code so that we can have more enum properties
in the future.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqdev: remove parse method for string properties
Paolo Bonzini [Thu, 2 Feb 2012 12:04:45 +0000 (13:04 +0100)]
qdev: remove parse method for string properties

We need the print method to put double quotes, but parsing is not special.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqdev: allow reusing get/set for legacy property
Paolo Bonzini [Thu, 2 Feb 2012 09:17:19 +0000 (10:17 +0100)]
qdev: allow reusing get/set for legacy property

In some cases, a legacy property does need a special print method
but not a special parse method.  In this case, we can reuse the get/set
from the static (non-legacy) property.

If neither parse nor print is needed, though, do not register the
legacy property at all.  The previous patch ensures that the right
fallback will be used.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqdev: remove direct calls to print/parse
Paolo Bonzini [Thu, 2 Feb 2012 08:47:13 +0000 (09:47 +0100)]
qdev: remove direct calls to print/parse

There's no need to call into ->parse and ->print manually.  The
QOM legacy properties do that for us.

Furthermore, in some cases legacy and static properties have exactly
the same behavior, and we could drop the legacy properties right away.
Add an appropriate fallback to prepare for this.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqom: add property get/set wrappers for links
Paolo Bonzini [Thu, 2 Feb 2012 09:51:57 +0000 (10:51 +0100)]
qom: add property get/set wrappers for links

These can set a link to any object, as long as it is included in
the composition tree.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqom: fix canonical paths vs. interfaces
Paolo Bonzini [Fri, 3 Feb 2012 14:59:53 +0000 (15:59 +0100)]
qom: fix canonical paths vs. interfaces

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqom: use object_resolve_path_type for links
Paolo Bonzini [Thu, 2 Feb 2012 11:37:53 +0000 (12:37 +0100)]
qom: use object_resolve_path_type for links

This allows to restrict partial matches to objects of the expected
type.  It will let people use bare names to reference drives
even though their name might be the same as a device's (e.g.
-drive id=hd0,if=none,... -device ...,drive=hd0,id=hd0).

As a useful byproduct, this fixes a problem with links of interface
type.  When a link property's type is an interface, the code expects
the implementation object (not the parent object) to be stored in the
variable.  The parent object does not contain the right vtable.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqom: add object_resolve_path_type
Paolo Bonzini [Fri, 3 Feb 2012 10:21:01 +0000 (11:21 +0100)]
qom: add object_resolve_path_type

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqom: fix off-by-one
Paolo Bonzini [Fri, 3 Feb 2012 14:41:13 +0000 (15:41 +0100)]
qom: fix off-by-one

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqom: add property get/set wrappers for C types
Paolo Bonzini [Wed, 1 Feb 2012 16:16:22 +0000 (17:16 +0100)]
qom: add property get/set wrappers for C types

Add wrappers that let you get/set properties using normal C data types.

Reviewed-by: Anthony Liguori <anthony@aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqom: add QObject-based property get/set wrappers
Paolo Bonzini [Wed, 1 Feb 2012 15:58:47 +0000 (16:58 +0100)]
qom: add QObject-based property get/set wrappers

Move the creation of QmpInputVisitor and QmpOutputVisitor from qmp.c
to qom/object.c, since it's the only practical way to access object
properties.

Keep this isolated such that it's easy to remove.  At some point, we need
to remove all usage of QObject in the tree and replace it with GVariant.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqom: do not include qdev header file
Paolo Bonzini [Thu, 2 Feb 2012 14:14:32 +0000 (15:14 +0100)]
qom: do not include qdev header file

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqom: avoid useless conversions from string to type
Paolo Bonzini [Fri, 3 Feb 2012 10:51:39 +0000 (11:51 +0100)]
qom: avoid useless conversions from string to type

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqom: clean up/optimize object_dynamic_cast
Paolo Bonzini [Fri, 3 Feb 2012 10:57:23 +0000 (11:57 +0100)]
qom: clean up/optimize object_dynamic_cast

The interface loop can be performed only on the parent object.  It
does not need to be done on each interface.  Similarly, we can
simplify the code by switching early from the implementation
object to the parent object.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqom: more documentation on subclassing
Paolo Bonzini [Fri, 3 Feb 2012 11:51:53 +0000 (12:51 +0100)]
qom: more documentation on subclassing

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoqom: clean up cast macros
Paolo Bonzini [Fri, 3 Feb 2012 10:48:11 +0000 (11:48 +0100)]
qom: clean up cast macros

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agos390x: fix qom-ification fall-out
Anthony Liguori [Mon, 6 Feb 2012 17:07:18 +0000 (11:07 -0600)]
s390x: fix qom-ification fall-out

Tested-by: Andreas Faerber <afaerber@suse.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agoKVM: Fix breakages of QOM conversion
Jan Kiszka [Fri, 3 Feb 2012 21:06:47 +0000 (22:06 +0100)]
KVM: Fix breakages of QOM conversion

KVM APIC and PIC require instance sizes.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agousb-redir: convert to QOM
Anthony Liguori [Fri, 3 Feb 2012 23:39:57 +0000 (17:39 -0600)]
usb-redir: convert to QOM

This was missed due to the fact that it's in the top level and it uses
'struct DeviceInfo' instead of 'DeviceInfo' for some strange reason.

Tested-by: Benoît Canet <benoit.canet@gmail.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agoFix previous commit
Blue Swirl [Sat, 4 Feb 2012 17:29:00 +0000 (17:29 +0000)]
Fix previous commit

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
12 years agousb-bsd: convert to QOM
Anthony Liguori [Fri, 3 Feb 2012 23:41:59 +0000 (17:41 -0600)]
usb-bsd: convert to QOM

Simple enough.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
12 years agovga: improve documentation
Blue Swirl [Sun, 29 Jan 2012 17:29:12 +0000 (17:29 +0000)]
vga: improve documentation

Add links to chipset docs and FreeVGA site.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
12 years agovga: use constants from vga.h
Blue Swirl [Sun, 29 Jan 2012 17:02:07 +0000 (17:02 +0000)]
vga: use constants from vga.h

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
12 years agovga.h: remove unused stuff and reformat
Blue Swirl [Sun, 29 Jan 2012 15:29:02 +0000 (15:29 +0000)]
vga.h: remove unused stuff and reformat

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
12 years agoAdd vga.h unmodified from Linux
Blue Swirl [Sun, 29 Jan 2012 15:23:50 +0000 (15:23 +0000)]
Add vga.h unmodified from Linux

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
12 years agovga: move Cirrus VGA template to its own file
Blue Swirl [Wed, 25 Jan 2012 16:10:44 +0000 (16:10 +0000)]
vga: move Cirrus VGA template to its own file

Standard VGA does not use vga_draw_cursor_line_* functions.
Move the template to cirrus_vga_template.h.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
12 years agomemory: change dirty getting API to take a size
Blue Swirl [Sun, 22 Jan 2012 16:38:21 +0000 (16:38 +0000)]
memory: change dirty getting API to take a size

Instead of each device knowing or guessing the guest page size,
just pass the desired size of dirtied memory area.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
12 years agoMerge branch 'linux-user-for-upstream' of git://git.linaro.org/people/rikuvoipio...
Blue Swirl [Sat, 4 Feb 2012 12:18:36 +0000 (12:18 +0000)]
Merge branch 'linux-user-for-upstream' of git://git.linaro.org/people/rikuvoipio/qemu

* 'linux-user-for-upstream' of git://git.linaro.org/people/rikuvoipio/qemu:
  linux-user: Fix sa_flags byte swaps for mips
  linux-user: Define TARGET_QEMU_ESIGRETURN for mips64
  linux-user: Define TARGET_QEMU_ESIGRETURN for mipsn32
  linux-user: Add default configs for mips64[el]
  linux-user: Add default-configs for mipsn32[el]
  linux-user: Implement *listxattr syscalls
  linux-user/syscall.c: Implement f and l versions of set/get/removexattr
  linux-user: Allow NULL value pointer in setxattr and getxattr
  linux-user: fix wait* syscall status returns
  linux-user/strace.c: Correct errno printing for mmap etc
  linux-user: fix QEMU_STRACE=1 segfault
  linux-user: add SO_PEERCRED support for getsockopt
  linux-user/main.c: Add option to user-mode emulation so that user can specify log file name
  linux-user: fake /proc/self/auxv
  linux-user: fake /proc/self/stat
  linux-user: fake /proc/self/maps
  linux-user: add open() hijack infrastructure
  linux-user: save auxv length
  linux-user: stack_base is now mandatory on all targets

12 years agow32: Fix build with new net bridge code
Stefan Weil [Sat, 4 Feb 2012 08:24:46 +0000 (09:24 +0100)]
w32: Fix build with new net bridge code

Commit a7c36ee4920ea3acc227a0248dd161693f207357 added code for a net
bridge and explicitly said that "this is very Linux centric".

Indeed, compilation failed for w32, so the bridge code is now
conditional. Hosts which don't support it can simply remove the
definition of CONFIG_NET_BRIDGE.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
12 years agoMerge branch 'for-upstream' of git://repo.or.cz/qemu/agraf
Blue Swirl [Sat, 4 Feb 2012 09:37:55 +0000 (09:37 +0000)]
Merge branch 'for-upstream' of git://repo.or.cz/qemu/agraf

* 'for-upstream' of git://repo.or.cz/qemu/agraf: (21 commits)
  PPC: E500: Populate L1CFG0 SPR
  PPC: e500mc: Enable processor control
  PPC: E500: Implement msgsnd
  PPC: E500: Implement msgclr
  PPC: Enable doorbell excp handlers
  PPC: Add CPU feature for processor control
  PPC: E500: Add doorbell defines
  PPC: E500: Add some more excp vectors
  KVM: Fix compilation on non-x86
  PPC: booke206: move avail check to tlbwe
  PPC: booke206: Check for TLB overrun
  PPC: booke206: Implement tlbilx
  PPC: booke206: Check for min/max TLB entry size
  PPC: booke: add tlbnps handling
  PPC: booke206: allow NULL raddr in ppcmas_tlb_check
  PPC: rename msync to msync_4xx
  PPC: e500: msync is 440 only, e500 has real sync
  PPC: e500mc: add missing IVORs to bitmap
  PPC: Add IVOR 38-42
  PPC: KVM: Update HIOR code to new interface
  ...

12 years agoFix build breakage from last commit.
Anthony Liguori [Fri, 3 Feb 2012 17:22:35 +0000 (11:22 -0600)]
Fix build breakage from last commit.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agos390x: fix -drive in the absence of aliases
Anthony Liguori [Fri, 3 Feb 2012 17:13:30 +0000 (11:13 -0600)]
s390x: fix -drive in the absence of aliases

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agocontainer: make a decendent of Object
Anthony Liguori [Fri, 23 Dec 2011 15:08:05 +0000 (09:08 -0600)]
container: make a decendent of Object

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
v1 -> v2
 - Add license (Paolo)

12 years agoobject: sure up reference counting
Anthony Liguori [Fri, 23 Dec 2011 14:47:39 +0000 (08:47 -0600)]
object: sure up reference counting

Now we have the following behavior:

1) object_new() returns an object with ref = 1
2) object_initialize() does not increase the reference count (ref may be 0).
3) object_deref() will finalize the object when ref = 0.  it does not free the
   memory associated with the object.
4) both link and child properties correctly set the reference count.

The expected usage is the following:

1) child devices should generally be created via object_initialize() using
   memory from the parent device.  Adding the object as a child property will
   take ownership of the object and tie the child's life cycle to the parent.

2) If a child device is created via qdev_create() or some other form of
   object_new(), there must be an object_delete() call in the parent device's
   finalize function.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agoinfo qdm: do not require a parent_bus to be set
Anthony Liguori [Fri, 23 Dec 2011 14:16:58 +0000 (08:16 -0600)]
info qdm: do not require a parent_bus to be set

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agoqdev: implement cleanup logic in finalize
Anthony Liguori [Fri, 23 Dec 2011 14:38:56 +0000 (08:38 -0600)]
qdev: implement cleanup logic in finalize

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agoqom: accept any compatible type when setting a link property
Anthony Liguori [Fri, 23 Dec 2011 14:35:43 +0000 (08:35 -0600)]
qom: accept any compatible type when setting a link property

Links had limited utility before as they only allowed a concrete type to be
specified.  Now we can support abstract types and interfaces which means it's
now possible to have a link<PCIDevice>.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agoqom: move properties from qdev to object
Anthony Liguori [Mon, 30 Jan 2012 14:55:55 +0000 (08:55 -0600)]
qom: move properties from qdev to object

This is mostly code movement although not entirely.  This makes properties part
of the Object base class which means that we can now start using Object in a
meaningful way outside of qdev.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agoqdev: nuke qdev_init_chardev()
Anthony Liguori [Thu, 22 Dec 2011 21:29:25 +0000 (15:29 -0600)]
qdev: nuke qdev_init_chardev()

I'm sure the intentions were good here, but there's no reason this should be in
qdev.  Move it to qemu-char where it belongs.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agoqdev: split out UI portions into a new function
Anthony Liguori [Thu, 22 Dec 2011 21:24:20 +0000 (15:24 -0600)]
qdev: split out UI portions into a new function

qdev-monitor.c deals with the -device, device_add, and info qdm/qtree
interfaces.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agoqdev: refactor away qdev_create_from_info
Anthony Liguori [Thu, 22 Dec 2011 21:14:27 +0000 (15:14 -0600)]
qdev: refactor away qdev_create_from_info

Note that the FIXME gets fixed in series 4/4.  We need to convert BusState to
QOM before we can make parent_bus a link.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agoqdev: split out common init to instance_init
Anthony Liguori [Thu, 22 Dec 2011 21:06:37 +0000 (15:06 -0600)]
qdev: split out common init to instance_init

This gets us closer to being able to object_new() a qdev type and have a
functioning object verses having to call qdev_create().

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agoqom: add new command to search for types
Anthony Liguori [Thu, 22 Dec 2011 20:40:54 +0000 (14:40 -0600)]
qom: add new command to search for types

This adds a command that allows searching for types that implement a property.
This allows you to do things like search for all available PCIDevices.  In the
future, we'll also have a standard interface for things with a BlockDriverState
property that a PCIDevice could implement.

This will enable search queries like, "any type that implements the BlockDevice
interface" which would allow management tools to present available block devices
without having to hard code device names.  Since an object can implement
multiple interfaces, one device could act both as a BlockDevice and a
NetworkDevice.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agoqdev: remove baked in notion of aliases (v2)
Anthony Liguori [Thu, 22 Dec 2011 17:05:00 +0000 (11:05 -0600)]
qdev: remove baked in notion of aliases (v2)

Limit them to the device_add functionality.  Device aliases were a hack based
on the fact that virtio was modeled the wrong way.  The mechanism for aliasing
is very limited in that only one alias can exist for any device.

We have to support it for the purposes of compatibility but we only need to
support it in device_add so restrict it to that piece of code.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
v1 -> v2
 - Use a table for aliases (Paolo)

12 years agoqdev: kill off DeviceInfo
Anthony Liguori [Fri, 9 Dec 2011 21:02:56 +0000 (15:02 -0600)]
qdev: kill off DeviceInfo

It is no longer used in the tree since everything is done natively through
QEMU Object Model.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agoqdev: register all types natively through QEMU Object Model
Anthony Liguori [Thu, 8 Dec 2011 03:34:16 +0000 (21:34 -0600)]
qdev: register all types natively through QEMU Object Model

This was done in a mostly automated fashion.  I did it in three steps and then
rebased it into a single step which avoids repeatedly touching every file in
the tree.

The first step was a sed-based addition of the parent type to the subclass
registration functions.

The second step was another sed-based removal of subclass registration functions
while also adding virtual functions from the base class into a class_init
function as appropriate.

Finally, a python script was used to convert the DeviceInfo structures and
qdev_register_subclass functions to TypeInfo structures, class_init functions,
and type_register_static calls.

We are almost fully converted to QOM after this commit.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agoqdev: kill off DeviceInfo list
Anthony Liguori [Wed, 1 Feb 2012 15:34:28 +0000 (09:34 -0600)]
qdev: kill off DeviceInfo list

Teach the various bits of code that need to walk through available devices to
do so via QOM.

Signed-off-by: Anthony Liguori
12 years agoqom: allow object_class_foreach to take additional parameters to refine search
Anthony Liguori [Thu, 22 Dec 2011 20:11:53 +0000 (14:11 -0600)]
qom: allow object_class_foreach to take additional parameters to refine search

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agoqdev: refactor device creation to allow bus_info to be set only in class
Anthony Liguori [Fri, 9 Dec 2011 18:08:01 +0000 (12:08 -0600)]
qdev: refactor device creation to allow bus_info to be set only in class

As we use class_init to set class members, DeviceInfo no longer holds this
information.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agoqdev: allow classes to overload qdev functions
Anthony Liguori [Fri, 9 Dec 2011 17:22:58 +0000 (11:22 -0600)]
qdev: allow classes to overload qdev functions

This allows us to drop per-Device registration functions by allowing the
class_init functions to overload qdev methods.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agoqdev: remove info from class
Anthony Liguori [Fri, 9 Dec 2011 17:06:57 +0000 (11:06 -0600)]
qdev: remove info from class

Now DeviceInfo is no longer used after object construction.  All of the
relevant members have been moved to DeviceClass.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agoqdev: make DeviceInfo private
Anthony Liguori [Fri, 9 Dec 2011 16:51:49 +0000 (10:51 -0600)]
qdev: make DeviceInfo private

Introduce accessors and remove any code that directly accesses DeviceInfo
members.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agousb: separate out legacy usb registration from type registration
Anthony Liguori [Thu, 8 Dec 2011 20:56:53 +0000 (14:56 -0600)]
usb: separate out legacy usb registration from type registration

Type registeration is going to get turned into a QOM call so decouple the
legacy support.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agousb-hid: simplify class initialization a bit
Anthony Liguori [Sun, 4 Dec 2011 22:13:14 +0000 (16:13 -0600)]
usb-hid: simplify class initialization a bit

We can probably model USBHidDevice as a base class to get even better code
sharing but for now, just use a common function to initialize the common class
members.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
12 years agolinux-user: Fix sa_flags byte swaps for mips
Andreas Färber [Thu, 29 Dec 2011 15:55:43 +0000 (16:55 +0100)]
linux-user: Fix sa_flags byte swaps for mips

sa_flags is uint32_t for mips{,n32,64}, so don't use tswapal().

edited by Riku Voipio: likewise on alpha

Reported-by: Khansa Butt <khansa@kics.edu.pk>
Suggested-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Cc: Ehsan Ul Haq <ehsan.ulhaq@kics.edu.pk>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
12 years agolinux-user: Define TARGET_QEMU_ESIGRETURN for mips64
Andreas Färber [Thu, 29 Dec 2011 15:55:42 +0000 (16:55 +0100)]
linux-user: Define TARGET_QEMU_ESIGRETURN for mips64

Copied from mips/syscall.h.

Signed-off-by: Khansa Butt <khansa@kics.edu.pk>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
12 years agolinux-user: Define TARGET_QEMU_ESIGRETURN for mipsn32
Andreas Färber [Thu, 29 Dec 2011 15:55:41 +0000 (16:55 +0100)]
linux-user: Define TARGET_QEMU_ESIGRETURN for mipsn32

Copied from mips/syscall.h.

Signed-off-by: Ulrich Hecht <uli@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
12 years agolinux-user: Add default configs for mips64[el]
Andreas Färber [Thu, 29 Dec 2011 15:55:40 +0000 (16:55 +0100)]
linux-user: Add default configs for mips64[el]

Prepares for mips64[el]-linux-user targets.

Signed-off-by: Khansa Butt <khansa@kics.edu.pk>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
12 years agolinux-user: Add default-configs for mipsn32[el]
Andreas Färber [Thu, 29 Dec 2011 15:55:39 +0000 (16:55 +0100)]
linux-user: Add default-configs for mipsn32[el]

Prepares for mipsn32[el]-linux-user targets.

Signed-off-by: Ulricht Hecht <uli@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
12 years agolinux-user: Implement *listxattr syscalls
Peter Maydell [Wed, 14 Dec 2011 15:37:19 +0000 (15:37 +0000)]
linux-user: Implement *listxattr syscalls

Implement listxattr, flistxattr and llistxattr syscalls.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
12 years agolinux-user/syscall.c: Implement f and l versions of set/get/removexattr
Peter Maydell [Wed, 14 Dec 2011 15:37:18 +0000 (15:37 +0000)]
linux-user/syscall.c: Implement f and l versions of set/get/removexattr

Implement the f and l versions (operate on fd, don't follow links)
of the setxattr, getxattr and removexattr syscalls.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
12 years agolinux-user: Allow NULL value pointer in setxattr and getxattr
Peter Maydell [Wed, 14 Dec 2011 15:37:17 +0000 (15:37 +0000)]
linux-user: Allow NULL value pointer in setxattr and getxattr

It's valid to pass a NULL value pointer to setxattr, so don't
fail this case EFAULT.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
12 years agolinux-user: fix wait* syscall status returns
Alexander Graf [Wed, 23 Nov 2011 23:44:43 +0000 (00:44 +0100)]
linux-user: fix wait* syscall status returns

When calling wait4 or waitpid with a status pointer and WNOHANG, the
syscall can potentially not modify the status pointer input. Now if we
have guest code like:

  int status = 0;
  waitpid(pid, &status, WNOHANG);
  if (status)
     <breakage>

then we have to make sure that in case status did not change we actually
return the guest's initialized status variable instead of our own uninitialized.
We fail to do so today, as we proxy everything through an uninitialized status
variable which for me ended up always containing the last error code.

This patch fixes some test cases when building yast2-core in OBS for ARM.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
12 years agolinux-user/strace.c: Correct errno printing for mmap etc
Peter Maydell [Mon, 21 Nov 2011 12:21:19 +0000 (12:21 +0000)]
linux-user/strace.c: Correct errno printing for mmap etc

Correct the printing of errnos for syscalls which are handled
via print_syscall_ret_addr (mmap, mmap2, brk, shmat): errnos
are returned as negative returned values at this level, not
via the host 'errno' variable.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
12 years agolinux-user: fix QEMU_STRACE=1 segfault
Alexander Graf [Mon, 21 Nov 2011 11:04:07 +0000 (12:04 +0100)]
linux-user: fix QEMU_STRACE=1 segfault

While debugging some issues with QEMU_STRACE I stumbled over segmentation
faults that were pretty reproducible. Turns out we tried to treat a
normal return value as errno, resulting in an access over array boundaries
for the resolution.

Fix this by allowing failure to resolve invalid errnos into strings.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
12 years agolinux-user: add SO_PEERCRED support for getsockopt
Akos PASZTORY [Mon, 14 Nov 2011 13:09:49 +0000 (15:09 +0200)]
linux-user: add SO_PEERCRED support for getsockopt

Signed-off-by: Akos PASZTORY <akos.pasztory@gmail.com>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
12 years agolinux-user/main.c: Add option to user-mode emulation so that user can specify log...
陳韋任 [Tue, 8 Nov 2011 09:46:44 +0000 (17:46 +0800)]
linux-user/main.c: Add option to user-mode emulation so that user can specify log file name

  QEMU linux user-mode's default log file name is "/tmp/qemu.log". In order to
change the log file name, user need to modify the source code then recompile
QEMU. This patch allow user use "-D logfile" option to specify the log file
name.

Signed-off-by: Chen Wen-Ren <chenwj@iis.sinica.edu.tw>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
12 years agolinux-user: fake /proc/self/auxv
Alexander Graf [Wed, 2 Nov 2011 19:23:26 +0000 (20:23 +0100)]
linux-user: fake /proc/self/auxv

Gtk tries to read /proc/self/auxv to find its auxv table instead of
taking it from its own program memory space.

However, when running with linux-user, we see the host's auxv which
clearly exposes wrong information. so let's instead expose the guest
memory backed auxv tables via /proc/self/auxv as well.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
12 years agolinux-user: fake /proc/self/stat
Alexander Graf [Wed, 2 Nov 2011 19:23:25 +0000 (20:23 +0100)]
linux-user: fake /proc/self/stat

The boehm gc finds the program's stack starting pointer by
checking /proc/self/stat. Unfortunately, so far it reads
qemu's stack pointer which clearly is wrong.

So let's instead fake the file so the guest program sees the
right address.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
12 years agolinux-user: fake /proc/self/maps
Alexander Graf [Wed, 2 Nov 2011 19:23:24 +0000 (20:23 +0100)]
linux-user: fake /proc/self/maps

glibc's pthread_attr_getstack tries to find the stack range from
/proc/self/maps. Unfortunately, /proc is usually the host's /proc
which means linux-user guests see qemu's stack there.

Fake the file with a constructed maps entry that exposes the guest's
stack range.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
12 years agolinux-user: add open() hijack infrastructure
Alexander Graf [Wed, 2 Nov 2011 19:23:23 +0000 (20:23 +0100)]
linux-user: add open() hijack infrastructure

There are a number of files in /proc that expose host information
to the guest program. This patch adds infrastructure to override
the open() syscall for guest programs to enable us to on the fly
generate guest sensible files.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
12 years agolinux-user: save auxv length
Alexander Graf [Sat, 28 Jan 2012 19:12:14 +0000 (21:12 +0200)]
linux-user: save auxv length

We create our own AUXV segment on stack and save a pointer to it.
However we don't save the length of it, so any code that wants to
do anything useful with it later on has to walk it again.

Instead, let's remember the length of our AUXV segment. This
simplifies later uses by a lot.

(edited by Riku to apply to qemu HEAD)

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
12 years agolinux-user: stack_base is now mandatory on all targets
Riku Voipio [Sat, 28 Jan 2012 20:00:17 +0000 (22:00 +0200)]
linux-user: stack_base is now mandatory on all targets

Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
12 years agoPPC: E500: Populate L1CFG0 SPR
Alexander Graf [Tue, 31 Jan 2012 02:46:55 +0000 (03:46 +0100)]
PPC: E500: Populate L1CFG0 SPR

When running Linux on e500 with powersave-nap enabled, Linux tries to
read out the L1CFG0 register and calculates some things from it. Passing
0 there ends up in a division by 0, resulting in -1, resulting in badness.

So let's populate the L1CFG0 register with reasonable defaults. That way
guests aren't completely confused.

Reported-by: Shrijeet Mukherjee <shm@cumulusnetworks.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
12 years agoPPC: e500mc: Enable processor control
Alexander Graf [Tue, 31 Jan 2012 02:20:31 +0000 (03:20 +0100)]
PPC: e500mc: Enable processor control

The e500mc implements Embedded.Processor Control, so enable it and
thus enable guests to IPI each other. This makes -smp work with -cpu
e500mc.

Signed-off-by: Alexander Graf <agraf@suse.de>