Statistics
| Branch: | Revision:

root / hw @ 7bc3018b

# Date Author Comment
7bc3018b 06/18/2012 04:14 pm Paolo Bonzini

m48t59: Rename "type" property to "model"

This resolves a name conflict with the qdev "type" property that is
about to move into Object.

Signed-off-by: Paolo Bonzini <>
[AF: Add braces missing in original code.]
Signed-off-by: Andreas Färber <>

d85ba787 06/15/2012 02:08 pm Peter A. G. Crosthwaite

xilinx_axidma: (un)reversed irq initialisation

The axidma irq orders are reversed in both the device model and the instantion.
Undid both reversal (for no net change). Also needs to be reversed for
consistency with Xilinx tools IRQ listing.

Signed-off-by: Peter A. G. Crosthwaite <>...

23d6055e 06/15/2012 02:08 pm Peter A. G. Crosthwaite

xilinx_uartlite: changed device name

Changed device name to xlnx,xps-uartlite. This is the exact name of the device
in the xilinx EDK development tools.

Signed-off-by: Peter A. G. Crosthwaite <>
Signed-off-by: Edgar E. Iglesias <>

8d4eb373 06/15/2012 02:08 pm Peter A. G. Crosthwaite

xilinx_timer: added default frequency

Added a reasonable default frequency for the xilinx timer (the 62MHz from
s3adsp machine model).

Signed-off-by: Peter A. G. Crosthwaite <>
Signed-off-by: Edgar E. Iglesias <>

abe098e4 06/15/2012 02:08 pm Peter A. G. Crosthwaite

xilinx_timer: changed nr_timers to one_timer_only

The configurable property for this IP in the Xilinx tools is a boolean switch
"one-timer-only" that flicks this timer from being dual channel to single.
Updated QEMU to work the same way for better match with the IP core and its TRM....

a61e4b07 06/15/2012 02:08 pm Peter A. G. Crosthwaite

xilinx_timer: changed device name

Changed device name to xlnx,xps-timer. This is the exact name of the device
in the xilinx EDK development tools.

Signed-off-by: Peter A. G. Crosthwaite <>
Signed-off-by: Edgar E. Iglesias <>

24739ab4 06/15/2012 02:08 pm Peter A. G. Crosthwaite

xilinx_intc: changed device name

Changed device name to xlnx,xps-intc. This is the exact name of the device
in the xilinx EDK development tools.

Signed-off-by: Peter A. G. Crosthwaite <>
Signed-off-by: Edgar E. Iglesias <>

b2d85c34 06/15/2012 02:08 pm Peter A. G. Crosthwaite

xilinx_ethlite: tweaked naming of ping-pong props

Changed "txpingpong" prop to "tx-ping-pong". Same for rx. This is done to
make the property name exactly match what is output by the xilinx tools for
this IP.

Signed-off-by: Peter A. G. Crosthwaite <>...

7f4d6755 06/15/2012 02:08 pm Peter A. G. Crosthwaite

xilinx_ethlite: changed device name

Changed device name to xlnx,xps-ethernetlite. This is the exact name of the
device in the xilinx EDK development tools.

Signed-off-by: Peter A. G. Crosthwaite <>
Signed-off-by: Edgar E. Iglesias <>

ab034c26 06/15/2012 02:08 pm Peter A. G. Crosthwaite

xilinx_axienet: droped the c_ on parameters

Even though the xilinx tools do have C_ on all params by default, drop this
for consistency with all the other xilinx IP (I.E. param names are the xilinx
names without the C_ prefix)

Signed-off-by: Peter A. G. Crosthwaite <>...

cec6f8ca 06/15/2012 02:08 pm Peter A. G. Crosthwaite

xilinx_axienet: changed device name

Changed device name to xlnx,axi-ethernet. This is the exact name of the
device in the xilinx EDK development tools.

Signed-off-by: Peter A. G. Crosthwaite <>
Signed-off-by: Edgar E. Iglesias <>

da9fa17e 06/15/2012 02:08 pm Peter A. G. Crosthwaite

xilinx_axidma: changed device name

Changed device name to xlnx,axi-dma. This is the exact name of the device in the
Xilinx EDK development tools.

Signed-off-by: Peter A. G. Crosthwaite <>
Signed-off-by: Edgar E. Iglesias <>

07f9fd48 06/15/2012 01:44 pm Andreas Färber

xilinx_axi*: Share devices between microblaze and microblazeel

Speeds up the build.

Signed-off-by: Andreas Färber <>
Signed-off-by: Edgar E. Iglesias <>

9bbfbb61 06/15/2012 01:44 pm Andreas Färber

hw/xilinx_*: Share Xilinx devices between ppc and microblaze

Speeds up the build.

xilinx_ethlite uses tswap32() and is thus target-dependent.

Signed-off-by: Andreas Färber <>
Signed-off-by: Edgar E. Iglesias <>

7677e24f 06/11/2012 08:15 pm Anthony Liguori

Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

  • qemu-kvm/uq/master:
    kvm: i8254: Fix conversion of in-kernel to userspace state
    kvm/apic: correct short memset
df332191 06/11/2012 08:15 pm Anthony Liguori

Merge remote-tracking branch 'afaerber-or/qom-next-1' into staging

  • afaerber-or/qom-next-1:
    target-i386: Use uint32 visitor for [x]level properties
    qdev: Remove PropertyInfo range checking
    qdev: Switch property accessors to fixed-width visitor interfaces...
e4d40816 06/11/2012 08:15 pm Anthony Liguori

Merge remote-tracking branch 'afaerber-or/qom-cpu-3a' into staging

  • afaerber-or/qom-cpu-3a: (27 commits)
    target-s390x: Pass S390CPU to s390_cpu_restart()
    s390-virtio: Let s390_cpu_addr2state() return S390CPU
    s390-virtio: Use cpu_s390x_init() to obtain S390CPU...
248bfdc9 06/11/2012 08:15 pm Anthony Liguori

Merge remote-tracking branch 'sstabellini/for_1.1.1' into staging

  • sstabellini/for_1.1.1:
    qemu/xendisk: set maximum number of grants to be used
39cde845 06/11/2012 08:07 pm Anthony Liguori

Merge remote-tracking branch 'kraxel/usb.52' into staging

  • kraxel/usb.52: (37 commits)
    ehci: rework frame skipping
    ehci: adaptive wakeup rate.
    ehci: create ehci_update_frindex
    ehci: remove unused attach_poll_counter
    ehci: fix halt status handling...
0cdd3d14 06/11/2012 02:18 pm Jan Kiszka

kvm: i8254: Fix conversion of in-kernel to userspace state

Due to a offset between the clock used to generate the in-kernel
count_load_time (CLOCK_MONOTONIC) and the clock used for processing this
in userspace (vm_clock), reading back the output of PIT channel 2 via...

64c27e5b 06/11/2012 01:06 pm Jan Beulich

qemu/xendisk: set maximum number of grants to be used

Legacy (non-pvops) gntdev drivers may require this to be done when the
number of grants intended to be used simultaneously exceeds a certain
driver specific default limit.

Signed-off-by: Jan Beulich <>...

0614cb82 06/11/2012 12:57 pm Jim Meyering

kvm/apic: correct short memset

kvm_put_apic_state's attempt to clear kapic before setting its
bits cleared sizeof(void
) bytes (no more than 8) rather than the
intended 1024 (KVM_APIC_REG_SIZE) bytes. Spotted by coverity.

Signed-off-by: Jim Meyering <>...

393a9eab 06/11/2012 01:23 am Andreas Färber

integratorcp: Use cpu_arm_init() to obtain ARMCPU

Needed for arm_load_kernel().

Add missing braces.

Signed-off-by: Andreas Färber <>
Acked-by: Peter Maydell <>

f25608e9 06/11/2012 01:23 am Andreas Färber

musicpal: Use cpu_arm_init() to obtain ARMCPU

Needed for arm_load_kernel().

Signed-off-by: Andreas Färber <>
Acked-by: Peter Maydell <>

20e93374 06/11/2012 01:23 am Andreas Färber

versatilepb: Use cpu_arm_init() to obtain ARMCPU

Needed for arm_load_kernel().

Signed-off-by: Andreas Färber <>
Acked-by: Peter Maydell <>

9543b0cd 06/11/2012 01:23 am Andreas Färber

arm_boot: Pass ARMCPU to arm_boot_info::write_secondary_boot()

Adapt exynos4210 and highbank accordingly.
The parameter itself is unused.

Signed-off-by: Andreas Färber <>
Acked-by: Peter Maydell <>
Acked-by: Igor Mitsyanko <> (for exynos)

5d309320 06/11/2012 01:23 am Andreas Färber

arm_boot: Pass ARMCPU to arm_boot_info::secondary_cpu_reset_hook()

Adapt highbank accordingly.

Signed-off-by: Andreas Färber <>
Acked-by: Peter Maydell <>

9077f01b 06/11/2012 01:23 am Andreas Färber

realview: Use cpu_arm_init() to obtain ARMCPU

Needed for arm_pic_init_cpu().

Signed-off-by: Andreas Färber <>
Acked-by: Peter Maydell <>

64c9e297 06/11/2012 01:23 am Andreas Färber

vexpress: Use cpu_arm_init() to obtain ARMCPU

Needed for arm_pic_init_cpu().

Signed-off-by: Andreas Färber <>
Acked-by: Peter Maydell <>

ef6cbcc5 06/11/2012 01:23 am Andreas Färber

exynos4210: Use cpu_arm_init() to store ARMCPU

Needed for arm_pic_init_cpu().

Signed-off-by: Andreas Färber <>
Acked-by: Peter Maydell <>
Acked-by: Igor Mitsyanko <>

f161bcd0 06/11/2012 01:23 am Andreas Färber

pxa2xx: Pass ARMCPU to pxa2xx_pic_init()

Cleans up after storing ARMCPU in PXA2xxState.
Prepares for storing ARMCPU in PXA2xxPICState.

Signed-off-by: Andreas Färber <>
Acked-by: Peter Maydell <>

e9d872cf 06/11/2012 01:23 am Andreas Färber

pxa2xx_pic: Store ARMCPU in PXA2xxPICState

Prepares for moving halted field to CPUState.

Add missing braces.

Signed-off-by: Andreas Färber <>
Acked-by: Peter Maydell <>

95d42bb5 06/11/2012 01:23 am Andreas Färber

pxa2xx_gpio: Store ARMCPU in PXA2xxGPIOInfo

Prepares for moving halted field into CPUState.

Add missing braces.

Signed-off-by: Andreas Färber <>
Acked-by: Peter Maydell <>

17c2f0bf 06/11/2012 01:23 am Andreas Färber

xilinx_zynq: Use cpu_arm_init() to obtain ARMCPU

Needed for arm_load_kernel().

Signed-off-by: Andreas Färber <>
Acked-by: Peter A.G. Crosthwaite <>

3aaa8dfa 06/11/2012 01:23 am Andreas Färber

arm_boot: Pass ARMCPU to arm_load_kernel()

In particular this simplifies the &s->mpu->cpu->env expression again.

first_cpu and ->next_cpu are expected to be QOM'ified later.

Signed-off-by: Andreas Färber <>
Acked-by: Igor Mitsyanko <> (for exynos)...

4bd74661 06/11/2012 01:23 am Andreas Färber

arm_pic: Pass ARMCPU to arm_pic_init_cpu()

Pass it through to arm_pic_cpu_handler().

Signed-off-by: Andreas Färber <>
Acked-by: Peter Maydell <>
Acked-by: Igor Mitsyanko <> (for exynos)

a0595d9e 06/11/2012 01:23 am Andreas Färber

xen_machine_pv: Use cpu_x86_init() to obtain X86CPU

Needed for moving halted field to CPUState.

Signed-off-by: Andreas Färber <>
Tested-by: Stefano Stabellini <>

6fc150de 06/11/2012 01:23 am Andreas Färber

s390-virtio: Use cpu_s390x_init() to obtain S390CPU

Needed to store S390CPU in ipi_states[].

Signed-off-by: Andreas Färber <>

45fa769b 06/11/2012 01:23 am Andreas Färber

s390-virtio: Let s390_cpu_addr2state() return S390CPU

Convert ipi_states to S390CPU**.

Needed for s390_cpu_restart() in handle_sigp().

Signed-off-by: Andreas Färber <>

518ec134 06/11/2012 01:23 am Andreas Färber

nseries: Rename n800_s::cpu to mpu

omap_mpu_state_s::env was renamed to cpu while changing its type.
With n800_s::cpu of type omap_mpu_state_s* this leads to s->cpu->cpu.

Rename the field to "mpu" to avoid this ugliness.

Signed-off-by: Andreas Färber <>...

59b91996 06/11/2012 01:23 am Andreas Färber

omap_sx1: Rename omap_mpu_state_s variable

Avoid cpu->cpu by using "mpu" as variable name.

Signed-off-by: Andreas Färber <>
Acked-by: Peter Maydell <>

f1eea068 06/11/2012 01:23 am Andreas Färber

palm: Rename omap_mpu_state_s variable

Avoid cpu->cpu by using "mpu" as variable name.

Signed-off-by: Andreas Färber <>
Acked-by: Peter Maydell <>

1c88de67 06/11/2012 01:23 am Andreas Färber

mainstone: Rename PXA2xxState variable

Avoid cpu->cpu by using "mpu" as variable name.

Signed-off-by: Andreas Färber <>
Acked-by: Peter Maydell <>

2e7ad760 06/11/2012 01:23 am Andreas Färber

spitz: Rename PXA2xxState variable

Avoid cpu->cpu by using "mpu" as variable name.

Signed-off-by: Andreas Färber <>
Acked-by: Peter Maydell <>

8efa35e0 06/11/2012 01:23 am Andreas Färber

tosa: Rename PXA2xxState variable

Avoid cpu->cpu by using "mpu" as variable name.

Signed-off-by: Andreas Färber <>
Acked-by: Peter Maydell <>

5c6f4f17 06/11/2012 01:23 am Andreas Färber

z2: Rename PXA2xxState variable

Avoid cpu->cpu by using "mpu" as variable name.

Signed-off-by: Andreas Färber <>
Acked-by: Peter Maydell <>

8bf502e2 06/11/2012 01:23 am Andreas Färber

strongarm: Use cpu_arm_init() to store ARMCPU in StrongARMState

Adapt collie accordingly.

Signed-off-by: Andreas Färber <>
Acked-by: Peter Maydell <>

7c760cbc 06/09/2012 01:20 pm Andreas Färber

target-ppc: Unbreak kvm_ppc.c build

The file is located in target-ppc/, not hw/.

Signed-off-by: Andreas Färber <>
Cc: Paolo Bonzini <>
Cc: Anthony Liguori <>
Cc: Blue Swirl <>...

4e27e819 06/08/2012 05:11 pm Michael Roth

qapi: Add Visitor interfaces for uint*_t and int*_t

This adds visitor interfaces for fixed-width integers types.
Implementing these in visitors is optional, otherwise we fall back to
visit_type_int() (int64_t) with some additional bounds checking to avoid...

09f1bbcd 06/08/2012 05:11 pm Michael Roth

qdev: Use int32_t container for devfn property

Valid range for devfn is -1 to 255 (-1 for automatic assignment). We do
not currently validate this due to devfn being stored as a uint32_t.
This can lead to segfaults and other strange behavior.

We could technically just cast it to int32_t to implement the checking,...

c08fb2ac 06/08/2012 05:11 pm Michael Roth

qdev: Switch property accessors to fixed-width visitor interfaces

This introduces {get,set}_uint{8,16,32,64}() functions for the
respective qdev types.
TADDR and VLAN are switched to explicit int64, BLOCKSIZE to uint16.

Signed-off-by: Michael Roth <>...

27712df9 06/08/2012 05:11 pm Paolo Bonzini

qdev: Remove PropertyInfo range checking

Range checking in PropertyInfo is now used only for pci_devfn
properties and some error reporting. Remove all code that implements
it in the various property types, and the now unused fields.

Signed-off-by: Paolo Bonzini <>...

ec807d12 06/07/2012 11:02 am Gerd Hoffmann

ehci: add ehci_*_enabled() helpers

Add helper functions to query whenever the async / periodic schedule
is enabled or not. Put them into use too.

Signed-off-by: Gerd Hoffmann <>

b53f685d 06/07/2012 11:02 am Gerd Hoffmann

ehci: update status bits in ehci_set_state

Update the status register in the ehci_set_state function, to make sure
the guest-visible register is in sync with our internal schedule state.

Signed-off-by: Gerd Hoffmann <>

daf25307 06/07/2012 11:02 am Gerd Hoffmann

ehci: fix halt status handling

When the enable bits for controller / async schedule / periodic schedule
change just make sure we kick the frame timer and let
ehci_advance_periodic_state and ehci_advance_async_state handle the
controller state changes.

This will make ehci set USBSTS_HALT when the controller shutdown is...

863b4741 06/07/2012 11:02 am Gerd Hoffmann

ehci: remove unused attach_poll_counter

Signed-off-by: Gerd Hoffmann <>

6ceced0b 06/07/2012 11:02 am Gerd Hoffmann

ehci: create ehci_update_frindex

Factor out code from ehci_frame_timer.

Signed-off-by: Gerd Hoffmann <>

3a215326 06/07/2012 11:02 am Gerd Hoffmann

ehci: adaptive wakeup rate.

Adapt the frame timer sleeps according to the actual needs. With the
periodic schedule being active we'll have to wakeup 1000 times per
second and go check for work. In case only the async schedule is active
we can be more lazy though. When idle ehci will increate the sleep time...

f020ed36 06/07/2012 11:02 am Gerd Hoffmann

ehci: rework frame skipping

Move the framecount check out of the loop and use the new
ehci_update_frindex function to skip frames if needed.

Signed-off-by: Gerd Hoffmann <>

0703a4a7 06/07/2012 11:02 am Gerd Hoffmann

xhci: trace: ring fetch

Signed-off-by: Gerd Hoffmann <>

c1f6b493 06/07/2012 11:02 am Gerd Hoffmann

xhci: trace: endpoints

Signed-off-by: Gerd Hoffmann <>

97df650b 06/07/2012 11:02 am Gerd Hoffmann

xhci: trace: transfers

Signed-off-by: Gerd Hoffmann <>

348f1037 06/07/2012 11:02 am Gerd Hoffmann

xhci: trace: slots

Signed-off-by: Gerd Hoffmann <>

eb36a88e 06/07/2012 11:02 am Gerd Hoffmann

ehci: add EHCIPacket

Add a separate EHCIPacket struct and move fields over from EHCIQueue.
Preparing for supporting multiple packets per queue being in flight at
the same time. No functional changes yet.

Fix some codestyle issues along the way.

Signed-off-by: Gerd Hoffmann <>

4224558f 06/07/2012 11:02 am Gerd Hoffmann

ehci: make ehci_execute work on EHCIPacket instead of EHCIQueue

This way it is possible to use ehci_execute to submit others than the
first EHCIPacket of the EHCIQueue.

Signed-off-by: Gerd Hoffmann <>

e59928b3 06/07/2012 11:02 am Gerd Hoffmann

ehci: cache USBDevice in EHCIQueue

Keep a USBDevice pointer in EHCIQueue so we don't have to lookup the
device on each usb packet submission.

Signed-off-by: Gerd Hoffmann <>

cd665715 06/07/2012 11:02 am Gerd Hoffmann

ehci: move ehci_flush_qh

Move ehci_flush_qh() function up in the source code.
No code change.

Signed-off-by: Gerd Hoffmann <>

773dc9cd 06/07/2012 11:02 am Gerd Hoffmann

ehci: add queuing support

Add packet queuing. Follow the qTD chain to see if there are more
packets we can submit. Improves performance on larger transfers,
especially with usb-host, as we don't have to wait for a packet to
finish before sending the next one to the host for processing....

8f6d5e26 06/07/2012 11:02 am Gerd Hoffmann

ehci: tweak queue initialization

Little tweak for the queue initialization, set the QH address in the
allocation function.

Signed-off-by: Gerd Hoffmann <>

ae0138a8 06/07/2012 11:02 am Gerd Hoffmann

ehci: add async field to EHCIQueue

Keep track whenever a EHCIQueue is part of the async or periodic
schedule. This way we don't have to pass around the async flag
everywhere but can look it up from the EHCIQueue struct when needed.

Signed-off-by: Gerd Hoffmann <>

0fb3e299 06/07/2012 11:02 am Gerd Hoffmann

ehci: move async schedule to bottom half

This way we can kick the async schedule independant from the
periodic frame timer.

Signed-off-by: Gerd Hoffmann <>

ae710b99 06/07/2012 11:02 am Gerd Hoffmann

ehci: schedule async bh on async packet completion

When a packet completes which happens to be part of the async schedule
kick the async bottom half for processing,

Signed-off-by: Gerd Hoffmann <>

0f588df8 06/07/2012 11:02 am Gerd Hoffmann

ehci: kick async schedule on wakeup

Kick async schedule when we get a wakeup
notification from a usb device.

Signed-off-by: Gerd Hoffmann <>

7046530c 06/07/2012 11:02 am Gerd Hoffmann

ehci: fix reset

Check for the reset bit first when processing USBCMD register writes.
Also break out of the switch, there is no need to check the other bits.

Signed-off-by: Gerd Hoffmann <>

18eef3bc 06/07/2012 11:02 am Gerd Hoffmann

scsi: prepare migration code for usb-storage support

usb-storage can't handle requests in one go as the data transfer can be
splitted into lots of usb packets. Because of that there can be
normal in-flight requests at savevm time and we need to handle that....

0659879e 06/07/2012 11:02 am Gerd Hoffmann

usb-storage: remove MSDState->residue

We have the field twice, once in MSDState directly and one in the status
word struct. Drop one.

Signed-off-by: Gerd Hoffmann <>

1e6ed80b 06/07/2012 11:02 am Gerd Hoffmann

usb-storage: add usb_msd_packet_complete()

Factor out packet completion to a separate function which
cares to get the MSDState->packet update right.

Signed-off-by: Gerd Hoffmann <>

1dc90367 06/07/2012 11:02 am Gerd Hoffmann

usb-storage: add scsi_off, remove scsi_buf

Repace the running buffer pointer (scsi_buf) with a buffer offset
field (scsi_off). The later is alot easier to live-migrate.

Signed-off-by: Gerd Hoffmann <>

5de88b1d 06/07/2012 11:02 am Gerd Hoffmann

usb-storage: migration support

With all scsi migration support bits in place the
final step is pretty simple ;)

Signed-off-by: Gerd Hoffmann <>

64619739 06/07/2012 11:02 am Jan Kiszka

xhci: Clean up reset function

Properly register reset function via the device class.

Signed-off-by: Jan Kiszka <>
Signed-off-by: Gerd Hoffmann <>

2d754a10 06/07/2012 11:02 am Gerd Hoffmann

xhci: trace: mmio reads+writes

Signed-off-by: Gerd Hoffmann <>

fc0ddaca 06/07/2012 11:02 am Gerd Hoffmann

xhci: trace: run+stop

Signed-off-by: Gerd Hoffmann <>

7acd279f 06/07/2012 11:02 am Gerd Hoffmann

xhci: trace: irq + events

Signed-off-by: Gerd Hoffmann <>

4aed20e2 06/07/2012 11:02 am Gerd Hoffmann

uhci: fix bandwidth management

uhci_process_frame() can be invoked multiple times per frame, so
accounting usb bandwith in a local variable doesn't fly, use a variable
in UHCIState instead. Also check the limit more frequently.

Signed-off-by: Gerd Hoffmann <>

9a16c595 06/07/2012 11:02 am Gerd Hoffmann

uhci: use bottom half

Schedule bottom half on completion of async packets instead of calling
uhci_process_frame directly. This way we run uhci_process_frame only
once in case multiple packets finish in a row. Also check whenever
there is bandwidth left before scheduling uhci_process_frame....

40141d12 06/07/2012 11:02 am Gerd Hoffmann

uhci: make bandwidth tunable

Add a property for the uhci bandwidth. Can be used to make uhci
emulation run faster than real hardware.

Signed-off-by: Gerd Hoffmann <>

5852d3bf 06/07/2012 11:02 am Gerd Hoffmann

uhci: zap uhci_pre_save

Cancel transactions before saving vmstate is pretty pointless and just
causes disruptions. We need to cancel them before loading vmstate,
but in that case uhci_reset() handles it already and no special action
is needed.

Signed-off-by: Gerd Hoffmann <>

973002c1 06/07/2012 11:02 am Gerd Hoffmann

uhci: fix irq routing

The multifunction ich9 ehci controller with uhci companions uses a
different interrupt pin for each function. The three uhci devices
get pins A, B and C, whereas ehci uses pin D. This way the guest
can assign different IRQ lines to each controller....

49ac9e0a 06/07/2012 10:21 am Paolo Bonzini

build: move device tree to per-target Makefile.objs

Signed-off-by: Paolo Bonzini <>

be1029ec 06/07/2012 10:21 am Paolo Bonzini

build: convert libhw to nested Makefile.objs

After this patch, the libhw* directories will have a hierarchy
that mimics the source tree. This is useful because we do have
a couple of files there that are in the top source directory.

Signed-off-by: Paolo Bonzini <>

c353f261 06/07/2012 10:21 am Paolo Bonzini

build: move per-target hw/ objects to nested Makefile.objs

This completes the move to nested Makefiles for virtio and a few
other files that were not part of obj-TARGET-y, but still were
compiled separately for each target.

Signed-off-by: Paolo Bonzini <>

3d5a3f9a 06/07/2012 10:21 am Paolo Bonzini

build: move target-independent hw/ objects to nested Makefile.objs

This patch starts converting the hw/ directory. Some files in hw/
are compiled once, some twice (32-/64-bit), some once per target.
Each category is moved in a separate patch.

After this patch, the files that are compiled once will show the...

5e8861a0 06/07/2012 08:17 am Paolo Bonzini

build: move obj-TARGET-y variables to nested Makefile.objs

Also drop duplicate occurrence of device-hotplug.o.

Signed-off-by: Paolo Bonzini <>

34941700 06/06/2012 03:57 pm Anthony Liguori

Merge remote-tracking branch 'qmp/queue/qmp' into staging

  • qmp/queue/qmp: (29 commits)
    Add 'query-events' command to QMP to query async events
    qapi: convert netdev_del
    qapi: convert netdev_add
    net: net_client_init(): use error_set()
    net: purge the monitor object from all init functions...
e1ae9a7a 06/06/2012 12:55 pm Anthony Liguori

Merge remote-tracking branch 'afaerber-or/qom-cpu-3' into staging

  • afaerber-or/qom-cpu-3: (74 commits)
    Kill off cpu_state_reset()
    linux-user: Use cpu_reset() after cpu_init() / cpu_copy()
    bsd-user: Use cpu_reset() in after cpu_init()
    leon3: Store SPARCCPU in ResetData...
721589dd 06/05/2012 04:05 am Anthony Liguori

Revert "Revert "rtl8139: do the network/host communication only in normal operating mode""

This reverts commit 9c92bf7f6c3f675e60b8ba8a5287bb88ea1eac36.

Per Jason's request.

Signed-off-by: Anthony Liguori <>

f9d1465f 06/05/2012 12:00 am Andreas Färber

sun4u: Let cpu_devinit() return SPARCCPU

Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <>
Acked-by: Blue Swirl <>

403d7a2d 06/05/2012 12:00 am Andreas Färber

sun4u: Store SPARCCPU in ResetData

We can now use cpu_reset() in place of cpu_state_reset() in
main_cpu_reset().

Signed-off-by: Andreas Färber <>
Acked-by: Blue Swirl <>

60ad0733 06/05/2012 12:00 am Andreas Färber

leon3: Use cpu_sparc_init() to obtain SPARCCPU

Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <>
Acked-by: Blue Swirl <>

c537d79c 06/05/2012 12:00 am Andreas Färber

leon3: Store SPARCCPU in ResetData

Allows us to use cpu_reset() in place of cpu_state_reset() in
main_cpu_reset().

Signed-off-by: Andreas Färber <>
Acked-by: Blue Swirl <>