Statistics
| Branch: | Revision:

root @ 371c6489

# Date Author Comment
371c6489 03/11/2012 01:27 pm Stefan Weil

w64: Don't redefine lseek, ftruncate

MinGW-w64 already defines lseek and ftruncate (and uses the 64 bit
variants). The conditional compilation avoids redefinitions
(which would be wrong) and compiler warnings.

Signed-off-by: Stefan Weil <>...

e04b2899 03/11/2012 01:25 pm Stefan Weil

cache-utils: Add missing include file for uintptr_t

Commit 021ecd8b9db37927059f5d3234b51ed766706437 breaks the build for
PPC hosts because it uses uintptr_t without the necessary include file.

uintptr_t is defined in stdint.h, so add this include.

Cc: Alexander Graf <>...

250b086e 03/11/2012 01:24 pm Lluís Vilanova

build: Include config-host.mak as soon as possible

Current code depends on variables defined in config-host.mak before it is
actually included.

Reviewed-by: Peter Maydell <>
Signed-off-by: Lluís Vilanova <>
Cc: Anthony Liguori <>...

00e94dbc 03/11/2012 01:23 pm Jan Kiszka

gdbstub: Do not kill target in system emulation mode

Too many VM kittens were killed since 7d03f82f81. Another one just died
under my fat fingers.

When you quit a kgdb session, does the Linux kernel power off? Or when
you terminate gdb attached to a hardware debugger, does your board...

3f2cbf0d 03/11/2012 01:22 pm Jan Kiszka

target-i386: Mask NX bit from cpu_get_phys_page_debug result

This was a long pending bug, now revealed by the assert in
phys_page_find that stumbled over the large page index returned by
cpu_get_phys_page_debug for NX-marked pages: We need to mask out NX and...

dac6b1b2 03/09/2012 08:30 pm Anthony Liguori

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

  • stefanha/trivial-patches:
    configure: Quote the configure args printed in config.log
    osdep: Remove local definition of macro offsetof
    libcacard: Spelling and grammar fixes in documentation...
bf75fec1 03/09/2012 08:29 pm Anthony Liguori

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

  • qemu-kvm/uq/master:
    kvm: fill in padding to help valgrind
    kvm: x86: Add user space part for in-kernel i8254
    kvm: Add kvm_has_pit_state2 helper
    i8254: Open-code timer restore
    i8254: Factor out base class for KVM reuse
9f1d43b1 03/09/2012 08:29 pm Anthony Liguori

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

  • kraxel/usb.42:
    xhci: fix port status
    xhci: fix control xfers
    usb: add shortcut for control transfers
    usb-host: enable pipelineing for bulk endpoints.
    usb: add pipelining option to usb endpoints...
0d10f627 03/09/2012 03:02 pm Anthony Liguori

xilinx_zynq: fix the build

Signed-off-by: Anthony Liguori <>

02021812 03/09/2012 03:02 pm Hans de Goede

libcacard: Fix compilation with gcc-4.7

VCARD_ATR_PREFIX is used as part of an array initializer so it should
not have () around it, so far this happened to work, but gcc-4.7 does
not like it.

Signed-off-by: Hans de Goede <>
Signed-off-by: Anthony Liguori <>

82246040 03/08/2012 05:22 pm Stefan Weil

osdep: Remove local definition of macro offsetof

The macro offsetof is defined in stddef.h. It is conforming to
the standards C89, C99 and POSIX.1-2001 (see man page), so it
is a sufficiently old standard.

Therefore chances are very high that QEMU never needs a local...

979ae168 03/08/2012 05:22 pm Peter Maydell

configure: Quote the configure args printed in config.log

Use the same mechanism we use for printing the configure command
line to config-host.mak to print it to config.log. This fixes a
bug where the config.log version didn't quote arguments with spaces....

ba79c886 03/08/2012 05:22 pm Stefan Weil

libcacard: Use format specifier %u instead of %d for unsigned values

splint reported warnings for those code statements.

Signed-off-by: Stefan Weil <>
Signed-off-by: Stefan Hajnoczi <>

0ea5c0cd 03/08/2012 05:22 pm Stefan Weil

vnc: Add break statement

This was not a bug, but it is not common practice to omit the break statement
from the last case statement before an empty default case.

Any change of the default case would introduce a bug.

This was reported as a warning by splint....

93148aa5 03/08/2012 05:22 pm Stefan Weil

Spelling fixes in comments (it's -> its)

  • it's -> its (fixed for all files)
  • dont -> don't (only fixed in a line which was touched by the previous fix)
  • distrub -> disturb (fixed in the same line)

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

4a84ebe6 03/08/2012 05:22 pm Stefan Weil

libcacard: Spelling and grammar fixes in documentation

  • it's -> its
  • it's -> it is (that's no fix, but makes future checks easier)
  • this functions -> this function
  • replacable -> replaceable
  • reader's -> readers
  • logins into -> logs into

v2:
Also replace 'aid' by 'AID' (thanks to Peter Maydell for this hint)....

441dd5eb 03/07/2012 03:03 pm Stefan Weil

qom: Fix spelling in documentation

This fixes a new spelling issue which was detected by codespell.

Signed-off-by: Stefan Weil <>
Signed-off-by: Stefan Hajnoczi <>

beae9d79 03/07/2012 03:03 pm Stefan Weil

qmp: Fix spelling fourty -> forty

This was found by codespell.

Signed-off-by: Stefan Weil <>
Acked-by: Luiz Capitulino <>
Signed-off-by: Stefan Hajnoczi <>

75d12341 03/07/2012 03:03 pm Stefan Weil

block/vmdk: Fix warning from splint (comparision of unsigned value)

l1_entry_sectors will never be less than 0.

Signed-off-by: Stefan Weil <>
Signed-off-by: Stefan Hajnoczi <>

1c467855 03/07/2012 03:03 pm Stefan Weil

Fix sign of sscanf format specifiers

All values read by sscanf are unsigned, so replace %d by %u.

This signed / unsigned mismatch was detected by splint.

Signed-off-by: Stefan Weil <>
Signed-off-by: Stefan Hajnoczi <>

12f30833 03/07/2012 03:03 pm Stefan Weil

sh7750: Remove redundant 'struct' from MemoryRegionOps

The 'struct' is not needed, and all other MemoryRegionOps don't use it.

Signed-off-by: Stefan Weil <>
Signed-off-by: Stefan Hajnoczi <>

eb9d4673 03/07/2012 01:28 pm Gerd Hoffmann

usb: queue can have async packets

This can happen today in case the ->complete() callback queues up the
next packet. Also we'll support pipelining soon, which allows to have
multiple packets per queue in flight (aka ASYNC) state.

Signed-off-by: Gerd Hoffmann <>

7936e0f0 03/07/2012 01:28 pm Gerd Hoffmann

usb: add pipelining option to usb endpoints

With this patch applied USB drivers can enable pipelining per endpoint.
With pipelining enabled the usb core will continue submitting packets
even when there are still async transfers in flight instead of passing...

9424d4e7 03/07/2012 01:28 pm Gerd Hoffmann

usb-host: enable pipelineing for bulk endpoints.

We really don't want to wait for packets finish before submitting the
next, we want keep the data flow running.

Signed-off-by: Gerd Hoffmann <>

1b4b29a1 03/07/2012 01:28 pm Gerd Hoffmann

usb: add shortcut for control transfers

Add a more direct code path to submit control transfers. Instead of
feeding three usb packets (setup, data, ack) to usb_handle_packet and
have the do_token_* functions in usb.c poke the control transfer
parameters out of it just submit a single packet carrying the actual...

2850ca9e 03/07/2012 01:28 pm Gerd Hoffmann

xhci: fix control xfers

Use the new, direct control transfer submission method instead of
bypassing the usb core by calling usb_device_handle_control directly.
The later fails for async control transfers.

This patch gets xhci + usb-host combo going.

cf21a4ae 03/07/2012 01:28 pm Gerd Hoffmann

xhci: fix port status

Don't signal port status change if the usb device isn't in attached
state. Happens with usb-host devices with the pass-through device
being plugged out at the host.

Signed-off-by: Gerd Hoffmann <>

aa73fcdc 03/07/2012 01:28 pm Hans de Goede

usb-ehci: Remove dead nakcnt code

This patch removes 2 bits of dead nakcnt code:

1) usb_ehci_execute calls ehci_qh_do_overlay which does:
nakcnt = reload;
and then has a block of code which is conditional on:
if (reload && !nakcnt) {
which ofcourse is never true now as nakcnt == reload....

553a6a59 03/07/2012 01:28 pm Hans de Goede

usb-ehci: Fix and simplify nakcnt handling

The nakcnt code in ehci_execute_complete() marked transactions as finished
when a packet completed with a result of USB_RET_NAK, but USB_RET_NAK
means that the device cannot receive / send data at that time and that...

5eafd438 03/07/2012 01:28 pm Hans de Goede

usb-ehci: Cleanup itd error handling

All error statuses except for NAK are handled in a switch case, move the
handling of NAK into the same switch case.

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>

4d819a9b 03/07/2012 01:28 pm Hans de Goede

usb: return BABBLE rather then NAK when we receive too much data

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>

d61000a8 03/07/2012 01:28 pm Hans de Goede

usb: add USB_RET_IOERROR

We already have USB_RET_NAK, but that means that a device does not want
to send/receive right now. But with host / network redirection we can
actually have a transaction fail due to some io error, rather then ie
the device just not having any data atm....

7c308b7e 03/07/2012 01:28 pm Gerd Hoffmann

uhci_fill_queue: zap debug printf

df5d5c5c 03/07/2012 01:28 pm Hans de Goede

usb-ehci: split our qh queue into async and periodic queues

qhs can be part of both the async and the periodic schedule, as is shown
in later patches in this series it is useful to keep track of the qhs on
a per schedule basis.

Signed-off-by: Hans de Goede <>...

7bce354e 03/07/2012 01:28 pm Hans de Goede

usb-ehci: always call ehci_queues_rip_unused for period queues

Before this patch USB 2 devices with interrupt endpoints were not working
properly. The problem is that to avoid loops we stop processing as soon
as we encounter a queue-head (qh) we've already seen since qhs can be linked...

4be23939 03/07/2012 01:28 pm Hans de Goede

usb-ehci: Drop cached qhs when the doorbell gets rung

The purpose of the IAAD bit / the doorbell is to make the ehci controller
forget about cached qhs, this is mainly used when cancelling transactions,
the qh is unlinked from the async schedule and then the doorbell gets rung,...

e850c2b4 03/07/2012 01:28 pm Hans de Goede

usb-ehci: Rip the queues when the async or period schedule is halted

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>

2763cbc7 03/07/2012 01:28 pm Hans de Goede

usb-ehci: Any packet completion except for NAK should set the interrupt

As clearly stated in the 2.3.2 of the EHCI spec, any time USBERRINT get
sets then if the td has its IOC bit set USBINT should be set as well.

This means that for any status except for USB_RET_NAK we should set...

dd54cfe0 03/07/2012 01:28 pm Hans de Goede

usb-ehci: Fix cerr tracking

cerr should only be decremented on errors which cause XactErr to be set, and
when that happens the failing transaction should be retried until cerr reaches
0 and only then should USBSTS_ERRINT be set (and inactive cleared and
USBSTS_INT set if requested)....

0454b611 03/07/2012 01:28 pm Hans de Goede

usb-redir: Set ep type and interface

Since we don't use usb_desc.c we need to do this ourselves. This fixes
iso transfers no longer working for USB 2 devices due to the ep->type
check in ehci.c

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>

2a5ff735 03/07/2012 01:28 pm Hans de Goede

usb-ehci: Never follow table entries with the T-bit set

Before this patch the T-bit was not checked in 2 places, while it should be.

Once we properly check the T-bit everywhere we no longer need the weird
entry < 0x1000 and entry > 0x1000 checks, so this patch removes them....

7e680753 03/07/2012 12:31 pm Michael S. Tsirkin

kvm: fill in padding to help valgrind

valgrind warns about padding fields which are passed
to vcpu ioctls uninitialized.
This is not an error in practice because kvm ignored padding.
Since the ioctls in question are off data path and
the cost is zero anyway, initialize padding to 0...

5d17c0d2 03/07/2012 12:27 pm Jan Kiszka

kvm: x86: Add user space part for in-kernel i8254

This provides the required user space stubs to enable the in-kernel
i8254 emulation of KVM.

The in-kernel model supports lost tick compensation according to the
"delay" policy. This is enabled by default and can be switched off via a...

8a7c7393 03/07/2012 12:27 pm Jan Kiszka

kvm: Add kvm_has_pit_state2 helper

To be used for in-kernel PIT emulation.

Signed-off-by: Jan Kiszka <>
Signed-off-by: Avi Kivity <>

3fbc1c0c 03/07/2012 12:27 pm Jan Kiszka

i8254: Open-code timer restore

Same as for the APIC: To enable migration between accelerated and
non-accelerated models, we need to arm the channel 0 timer only inside
the emulated PIT model. The common code just saves/restores that timer
to the the next_transition_time field....

d11e859e 03/07/2012 12:27 pm Jan Kiszka

i8254: Factor out base class for KVM reuse

Applying the concept used for the *PICs once again: establish a base
class for the i8254 that can be used both by the current user space
emulation and the upcoming KVM in-kernel version. We share most of the
public interface of the i8254, specifically to the pcspk, vmstate, reset...

35548b06 03/07/2012 03:20 am Peter A. G. Crosthwaite

cadence_uart: initial version of device model

Implemented cadence UART serial controller

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

f3a6cc07 03/07/2012 03:20 am Peter A. G. Crosthwaite

cadence_ttc: initial version of device model

Implemented cadence Triple Timer Counter (TCC)

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

e9f186e5 03/07/2012 03:20 am Peter A. G. Crosthwaite

cadence_gem: initial version of device model

Device model for cadence gem ethernet controller.

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

e3260506 03/07/2012 03:20 am Peter A. G. Crosthwaite

xilinx_zynq: machine model initial version

Xilinx zynq-7000 machine model. Also includes device model for the zynq-specific
system level control register (SLCR) module.

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

cba1fd36 03/06/2012 12:00 am Peter A. G. Crosthwaite

petalogix_s2adsp1800: macro'd magic numbers

defined macros for the addresses of the peripherals in machine model

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

379b5c7c 03/06/2012 12:00 am Peter A. G. Crosthwaite

qemu-options.hx: allow -dtb argument for all archs

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

da71ebd1 03/06/2012 12:00 am Peter A. G. Crosthwaite

microblaze_boot: enabled -dtb argument

Use the -dtb argument for passing is a custom dtb rather than the old
hardcoded "mb.dtb"

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

d94e7434 03/06/2012 12:00 am Peter A. G. Crosthwaite

microblaze: factored out common boot code

factored out the copy-pasted common boot code from the two microblaze platforms
into a dedicated microblaze bootloader (microblaze_boot.o).

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

1f28fac8 03/06/2012 12:00 am Peter A. G. Crosthwaite

petalogix_s2adsp1800: moved rst logic to rst fn

This belongs in the machine specific reset function

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

27a9476c 03/05/2012 08:55 pm Blue Swirl

Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf

  • 's390-for-upstream' of git://repo.or.cz/qemu/agraf:
    Move helpers.h to helper.h
    s390: Rework kernel loading: supports elf and newer kernels
1edb4934 03/05/2012 08:51 pm Christian Borntraeger

s390: Rework kernel loading: supports elf and newer kernels

This reworks the image loading on s390.

Newer kernels will not always have a 0dd0 (basr 13,0) at address 0x10000.
We must not rely on specific code at certain addresses. This check was
introduced to warn users that tried to load vmlinux, since ELF loading...

3208afbe 03/05/2012 08:51 pm Lluís Vilanova

Move helpers.h to helper.h

Provides a file naming scheme consistent with other targets.

Signed-off-by: Lluís Vilanova <>
Signed-off-by: Alexander Graf <>

a2d33521 03/05/2012 05:40 pm Avi Kivity

memory: fix I/O port aliases

Commit e58ac72b6a0 ("ioport: change portio_list not to use
memory_region_set_offset()") started using aliases of I/O memory
regions. Since the IORange used for the I/O was contained in the
target region, the alias information (specifically, the offset...

c5b703ac 03/05/2012 05:36 pm Avi Kivity

ioport: add destructor method to IORange

Previously all callers had a containing object with a destructor that
could be used to trigger cleanup of the IORange objects (typically
just freeing the containing object), but a forthcoming memory API
change doesn't fit this pattern. Rather than setting up a new global...

2aeabc08 03/03/2012 08:10 pm Stefan Weil

w64: fix type casts when calling flush_icache_range

Signed-off-by: Stefan Weil <>
Signed-off-by: Blue Swirl <>

021ecd8b 03/03/2012 08:10 pm Stefan Weil

cache-utils: Change data type of parameters for flush_icache_range

The TCG targets i386 and tci needed a change of the function
prototype for w64.

This change is currently not needed here, but it can be applied
to avoid code differences.

Cc: Alexander Graf <>...

dba4f1bc 03/03/2012 08:10 pm Stefan Weil

w64: Change data type of parameters for flush_icache_range

The TCG targets i386 and tci needed a change of the function
prototype for w64.

This change is currently not needed for the other TCG targets,
but it can be applied to avoid code differences.

Cc: Blue Swirl <>...

f57a5160 03/03/2012 08:10 pm Stefan Weil

w64: Fix data type of parameters for flush_icache_range

flush_icache_range takes two address parameters which must be large
enough to address any address of the host.

For hosts with sizeof(unsigned long) == sizeof(void *), this patch
changes nothing. All currently supported hosts fall into this category....

c38bb94a 03/03/2012 08:10 pm Stefan Weil

tcg: Rearrange definitions and include statements

This change makes tcg_target_ulong available in tcg-target.h.

Signed-off-by: Stefan Weil <>
Signed-off-by: Blue Swirl <>

53576999 03/03/2012 08:10 pm Stefan Weil

w64: Fix size of ram_addr_t

ram_addr_t must be large enough to address any address of the host.

For hosts with sizeof(unsigned long) == sizeof(void *), this patch
changes nothing. All currently supported hosts fall into this category.

For w64 hosts, sizeof(unsigned long) is 4 while sizeof(void *) is 8,...

5a30d3f1 03/03/2012 07:59 pm Blue Swirl

Merge branch 'upstream' of git://qemu.weilnetz.de/qemu

  • 'upstream' of git://qemu.weilnetz.de/qemu:
    Move definition of HOST_LONG_BITS to qemu-common.h
    target-xtensa: Clean includes
    target-unicore32: Clean includes
    target-sh4: Clean includes
    target-s390x: Clean includes...
41e37c33 03/03/2012 07:54 pm Jan Kiszka

usb: Fix signature of stub usb_host_device_open

This was a breakage of 3741715cf2.

Signed-off-by: Jan Kiszka <>
Acked-by: Gerd Hoffmann <>
Signed-off-by: Blue Swirl <>

d9bafcd1 03/03/2012 07:53 pm Blue Swirl

Merge branch 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm

  • 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm:
    hw/arm11mpcore: Fix broken realview_mpcore/arm11mpcore_priv properties
    arm: add device tree support...
b3e54c68 03/03/2012 07:53 pm Blue Swirl

Merge branch 'xtensa' of git://jcmvbkbc.spb.ru/dumb/qemu-xtensa

  • 'xtensa' of git://jcmvbkbc.spb.ru/dumb/qemu-xtensa:
    target-xtensa: add breakpoint tests
    target-xtensa: add DEBUG_SECTION to overlay tool
    target-xtensa: add DBREAK data breakpoints
    exec: let cpu_watchpoint_insert accept larger watchpoints...
0f58a188 03/02/2012 01:56 pm Peter Maydell

hw/arm11mpcore: Fix broken realview_mpcore/arm11mpcore_priv properties

Fix confusion in the Property arrays for the "arm11mpcore_priv"
(per-CPU devices for the ARM11MPcore CPU) and "realview_mpcore"
(realview-eb board specific device encapsulating CPU and some...

69253800 03/02/2012 01:56 pm Rusty Russell

arm: clean up GIC constants

Interrupts numbers 0-31 are private to the processor interface, 32-1019 are
general interrupts. Add GIC_INTERNAL and substitute everywhere.

Signed-off-by: Rusty Russell <>
[Peter Maydell: converted some tabs to spaces]...

41c1e2f5 03/02/2012 01:56 pm Rusty Russell

arm: make sure that number of irqs can be represented in GICD_TYPER.

We currently assume that the number of interrupts (ITLinesNumber in
the architecture reference manual) is divisible by 32, since we
present it to the guest when it reads GICD_TYPER (in gic_dist_readb())...

412beee6 03/02/2012 01:56 pm Grant Likely

arm: add device tree support

If compiled with CONFIG_FDT, allow user to specify a device tree file using
the -dtb argument. If the machine supports it then the dtb will be loaded
into memory and passed to the kernel on boot.

Signed-off-by: Jeremy Kerr <>...

88e6c606 03/01/2012 11:26 pm Anthony Liguori

Merge remote-tracking branch 'qemu-kvm/memory/urgent' into staging

  • qemu-kvm/memory/urgent:
    kvm: fix unaligned slots
14655e48 03/01/2012 11:26 pm Anthony Liguori

Merge remote-tracking branch 'qemu-kvm/memory/core' into staging

  • qemu-kvm/memory/core: (30 commits)
    memory: allow phys_map tree paths to terminate early
    memory: unify PhysPageEntry::node and ::leaf
    memory: change phys_page_set() to set multiple pages...
5918ff68 03/01/2012 11:26 pm Anthony Liguori

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

  • qemu-kvm/uq/master:
    pc-bios: update kvmvapic.bin
    kvmvapic: Use optionrom helpers
    optionsrom: Reserve space for checksum
    kvmvapic: Simplify mp/up_set_tpr
    kvmvapic: Introduce TPR access optimization for Windows guests...
8f6f962b 03/01/2012 02:50 pm Avi Kivity

kvm: fix unaligned slots

kvm_set_phys_mem() may be passed sections that are not aligned to a page
boundary. The current code simply brute-forces the alignment which leads
to an inconsistency and an abort().

Fix by aligning the start and the end of the section correctly, discarding...

5b6fb069 03/01/2012 12:58 pm Avi Kivity

pc-bios: update kvmvapic.bin

Signed-off-by: Avi Kivity <>

7c51c1aa 02/29/2012 08:57 pm Anthony Liguori

Merge remote-tracking branch 'kwolf/for-anthony' into staging

  • kwolf/for-anthony: (27 commits)
    qemu-img: fix segment fault when the image format is qed
    qemu-io: fix segment fault when the image format is qed
    qemu-tool: revert cpu_get_clock() abort(3)...
f06d0f07 02/29/2012 08:54 pm Anthony Liguori

Merge remote-tracking branch 'spice/spice.v49' into staging

  • spice/spice.v49:
    qxl: properly handle upright and non-shared surfaces
    Error out when tls-channel option is used without TLS
    spice: use error_report to report errors
    qxl: add optinal 64bit vram bar...
5ca2358a 02/29/2012 05:11 pm Anthony Liguori

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

  • kraxel/usb.39: (21 commits)
    usb: Resolve warnings about unassigned bus on usb device creation
    usb-redir: Return USB_RET_NAK when we've no data for an interrupt endpoint
    usb-redir: Limit return values returned by iso packets...
67d384e8 02/29/2012 05:05 pm Zhi Yong Wu

qemu-img: fix segment fault when the image format is qed

[root@f15 qemu]# qemu-img info /home/zwu/work/misc/rh6.img
image: /home/zwu/work/misc/rh6.img
file format: qed
virtual size: 4.0G (4294967296 bytes)
disk size: 1.2G
cluster_size: 65536
Segmentation fault (core dumped)...

a57d1143 02/29/2012 05:05 pm Zhi Yong Wu

qemu-io: fix segment fault when the image format is qed

[root@f15 qemu]# qemu-io -c info /home/zwu/work/misc/rh6.img
format name: qed
cluster size: 64 KiB
vm state offset: 0.000000 bytes
Segmentation fault (core dumped)

This reason is same as the former patch...

049255b6 02/29/2012 04:48 pm Stefan Hajnoczi

qemu-iotests: export TEST_DIR for non-bash tests

Since qemu-iotests may need to create large image files it is possible
to specify the test directory. The TEST_DIR variable needs to be
exported so non-bash tests can make use of it.

Signed-off-by: Stefan Hajnoczi <>...

f345cfd0 02/29/2012 04:48 pm Stefan Hajnoczi

qemu-iotests: add iotests Python module

Block layer tests that involve QMP commands rather than qemu-img or
qemu-io are not well-suited for shell scripting. This patch adds a
Python module which allows tests to be written in Python instead.

The basic API is:...

37ce63eb 02/29/2012 04:48 pm Stefan Hajnoczi

test: add image streaming tests

This patch adds a test suite for the image streaming feature. It
exercises the 'block_stream', 'block_job_cancel', 'block_job_set_speed',
and 'query-block-jobs' QMP commands.

Signed-off-by: Stefan Hajnoczi <>...

a06d5cc2 02/29/2012 04:48 pm Kevin Wolf

qemu-iotests: Filter out DOS line endings

This one makes it possible to run qemu-iotests on a Windows build using Wine
and get somewhat meaningful results.

Signed-off-by: Kevin Wolf <>
Reviewed-by: Stefan Hajnoczi <>

92ab69b6 02/29/2012 04:48 pm Kevin Wolf

qemu-iotests: 026: Reduce output changes for cache=none qcow2

qemu-iotests supports the -nocache option which makes the tests run with
cache=none. For blkdebug tests with qcow2 this means that we may see
test results that differ from cache=writethrough. This patch makes the...

6ce2d77a 02/29/2012 04:48 pm Kevin Wolf

qemu-iotests: Test rebase with short backing file

This tests that qemu-img rebase doesn't assume that the backing file has
the same size as the image, but considers that it can be smaller.

Signed-off-by: Kevin Wolf <>
Reviewed-by: Stefan Hajnoczi <>

4889978e 02/29/2012 04:48 pm Stefan Hajnoczi

qemu-tool: revert cpu_get_clock() abort(3)

Despite the fact that the qemu-tool environment has no guest running and
vm_clock therefore does not make sense, there is code that gets the
vm_clock time even in qemu-tool. Therefore, revert the abort(3) call
and just return 0 like we used to. This unbreaks qemu-img/qemu-io with...

c186402c 02/29/2012 04:48 pm Jeff Cody

QMP: Add qmp command for blockdev-group-snapshot-sync

This adds the QMP command for blockdev-group-snapshot-sync. It
takes an array in as the input, for the argument devlist. The
array consists of the following elements:

+ device:        device to snapshot. e.g. "ide-hd0", "virtio0"...
8802d1fd 02/29/2012 04:48 pm Jeff Cody

qapi: Introduce blockdev-group-snapshot-sync command

This is a QAPI/QMP only command to take a snapshot of a group of
devices. This is similar to the blockdev-snapshot-sync command, except
blockdev-group-snapshot-sync accepts a list devices, filenames, and...

423477e5 02/29/2012 01:48 pm Kevin Wolf

qcow2: Fix build with DEBUG_EXT enabled

Signed-off-by: Kevin Wolf <>

56116a14 02/29/2012 01:48 pm Paolo Bonzini

block: remove unused fields in BlockDriverState

sync_aiocb is unused since commit ce1a14d (Dynamically allocate AIO
Completion Blocks., 2006-08-07).

private is unused since commit 56a1493 (drive cleanup fixes., 2009-09-25).

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

b6a127a1 02/29/2012 01:48 pm Paolo Bonzini

block: drop aio_multiwrite in BlockDriver

These were never used.

Signed-off-by: Paolo Bonzini <>
Signed-off-by: Kevin Wolf <>

fd29b4bb 02/29/2012 01:48 pm Kevin Wolf

qcow2: Fix offset in qcow2_read_extensions

The spec says that the length of extensions is padded to 8 bytes, not
the offset. Currently this is the same because the header size is a
multiple of 8, so this is only about compatibility with future changes
to the header size....

64ca6aee 02/29/2012 01:48 pm Kevin Wolf

qcow2: Reject too large header extensions

Image files that make qemu-img info read several gigabytes into the
unknown header extensions list are bad. Just fail opening the image
if an extension claims to be larger than the header extension area.

Signed-off-by: Kevin Wolf <>...

a2df5fa3 02/29/2012 01:48 pm Hervé Poussineau

fdc: DIR (Digital Input Register) should return status of current drive...

Signed-off-by: Hervé Poussineau <>
Signed-off-by: Kevin Wolf <>

d53cdb30 02/29/2012 01:48 pm Paolo Bonzini

ide: fail I/O to empty disk

Requesting a read or a write operation on an empty disk can lead
to QEMU dumping core.

Also fix a few braces here and there.

Signed-off-by: Paolo Bonzini <>
Reviewed-by: Stefan Hajnoczi <>...