qemu/qemu.git, branch v1.2.2

update VERSION for v1.2.2

2012-12-11T21:09:44+00:00

Signed-off-by: Michael Roth

e1000: Discard packets that are too long if !SBP and !LPE

2012-12-03T21:02:28+00:00

The e1000_receive function for the e1000 needs to discard packets longer than 1522 bytes if the SBP and LPE flags are disabled. The linux driver assumes this behavior and allocates memory based on this assumption. Signed-off-by: Michael Contreras Signed-off-by: Anthony Liguori (cherry picked from commit b0d9ffcd0251161c7c92f94804dcf599dfa3edeb) Signed-off-by: Michael Roth

stream: fix ratelimit_set_speed

2012-12-03T21:02:28+00:00

The formula to compute slice_quota was wrong since commit 6ef228fc. Signed-off-by: Dietmar Maurer Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf (cherry picked from commit e3980e28bb888bf643054770452998d1b4319609) Signed-off-by: Michael Roth

usb: fail usbdevice_create() when there is no USB bus

2012-12-03T21:02:28+00:00

Report an error instead of segfaulting when attaching a USB device to a machine with no USB busses: $ qemu-system-arm -machine vexpress-a9 \ -sd Fedora-17-armhfp-vexpress-mmcblk0.img \ -kernel vmlinuz-3.4.2-3.fc17.armv7hl \ -initrd initramfs-3.4.2-3.fc17.armv7hl.img \ -usbdevice disk:format=raw:test.img Note that the vexpress-a9 machine does not have a USB host controller. Reported-by: David Abdurachmanov Signed-off-by: Stefan Hajnoczi Signed-off-by: Gerd Hoffmann (cherry picked from commit c128d6a6d785eb9235a4f6dbd52f405ab8c60bee) Signed-off-by: Michael Roth

qxl: reload memslots after migration, when qxl is in UNDEFINED mode

2012-12-03T21:02:28+00:00

The devram memslot stays active when qxl enters UNDEFINED mode (i.e, no primary surface). If migration has occurred while the device is in UNDEFINED stae, the memslots have to be reloaded at the destination. Fixes rhbz#874574 Signed-off-by: Yonit Halperin Signed-off-by: Gerd Hoffmann (cherry picked from commit fa98efe932d93a15ffa867f3b05149c8d1fc7c28) Signed-off-by: Michael Roth

virtio-scsi: Fix subtle (guest) endian bug

2012-12-03T21:02:28+00:00

The virtio-scsi config space is, by specification, in guest endian (which is ill-defined, but there you go). In virtio_scsi_get_config() we set up all the fields in there, using stl_raw(). Which is a problem for the max_channel and max_target fields, which are 16-bit, not 32-bit. For little-endian targets we get away with it by accident, since the first two bytes will still be correct, and the extra two bytes written (with zeroes) will be overwritten correctly by the next store. But for big-endian guests, this means the max_target field ends up as zero, which means the guest will only recognize a single disk on the virtio-scsi bus. This patch fixes the problem. Cc: Paolo Bonzini Cc: Paul 'Rusty' Russell Signed-off-by: David Gibson Signed-off-by: Paolo Bonzini (cherry picked from commit 863d1050c96cff91dd478767c0da9cc288575919) Signed-off-by: Michael Roth

virtio-scsi: Fix some endian bugs with virtio-scsi

2012-12-03T21:02:28+00:00

The virtio-scsi specification does not specify the correct endianness for fields in the request structure. It's therefore best to assume that it is "guest native" endian since that's the (stupid and poorly defined) norm in virtio. However, the qemu device for virtio-scsi has no byteswaps at all, and so will break if the guest has different endianness from the host. This patch fixes it by adding tswap() calls for the sense_len and resid fields in the request structure. In theory status_qualifier needs swaps as well, but that field is never actually touched. The tag field is a uint64_t, but since its value is completely arbitrary, it might as well be uint8_t[8] and so it does not need swapping. Cc: Paolo Bonzini Cc: Paul 'Rusty' Russell Signed-off-by: David Gibson Signed-off-by: Paolo Bonzini (cherry picked from commit 474ee55a18765e7de8f0b2cc00db5d26286bb24d) Signed-off-by: Michael Roth

iscsi: do not assume device is zero initialized

2012-12-03T21:02:28+00:00

Without any complex checks we can't assume that an iscsi target is initialized to zero. Signed-off-by: Peter Lieven Signed-off-by: Paolo Bonzini (cherry picked from commit f807ecd5741325fe0d281199ff22cdda0acb6a7a) Signed-off-by: Michael Roth

iscsi: fix deadlock during login

2012-12-03T21:02:28+00:00

If the connection is interrupted before the first login is successfully completed qemu-kvm is waiting forever in qemu_aio_wait(). This is fixed by performing an sync login to the target. If the connection breaks after the first successful login errors are handled internally by libiscsi. Signed-off-by: Peter Lieven Signed-off-by: Paolo Bonzini (cherry picked from commit e829b0bb054ed3389e5b22dad61875e51674e629) Signed-off-by: Michael Roth

iscsi: fix segfault in url parsing

2012-12-03T21:02:28+00:00

If an invalid URL is specified iscsi_get_error(iscsi) is called with iscsi == NULL. Signed-off-by: Peter Lieven Signed-off-by: Paolo Bonzini (cherry picked from commit 8da1e18b0cf46b6c95c88bbad1cc50d6dd1bef4b) Signed-off-by: Michael Roth