FS#42128 - [qemu] the (broken) patch hasn't been required for the last 3 versions
Attached to Project:
Arch Linux
Opened by Steven Honeyman (stevenhoneyman) - Friday, 26 September 2014, 12:42 GMT
Last edited by Tobias Powalowski (tpowa) - Monday, 03 November 2014, 20:39 GMT
Opened by Steven Honeyman (stevenhoneyman) - Friday, 26 September 2014, 12:42 GMT
Last edited by Tobias Powalowski (tpowa) - Monday, 03 November 2014, 20:39 GMT
|
Details
Description:
The patch "2.0.0-usb-stack.patch" included with this package must have been included upstream a long time ago. I've just checked 2.1.0, 2.1.1, 2.1.2 sources that I had still (upstream; clean) and they all have the changes included. Additional info: What's a bit strange is it looks like someone has done similar to: 's/@/ <at> /g' on the patch (to mask email addr?), which breaks it completely and patch doesn't even acknowledge that there are any changes to be made. Here's the middle bit snipped out, as it looks in the repos: +++ b/hw/usb/bus.c <at> <at> -51,8 +51,8 <at> <at> static int usb_device_post_load(void *opaque, int version_id) } if (dev->setup_index < 0 || dev->setup_len < 0 || - dev->setup_index >= sizeof(dev->data_buf) || - dev->setup_len >= sizeof(dev->data_buf)) { + dev->setup_index > dev->setup_len || + dev->setup_len > sizeof(dev->data_buf)) { return -EINVAL; It does nothing at all, until this is fixed back to normal: @@ -51,8 +51,8 @@ ...then you get the "Reverse patch detected" message as expected. |
This task depends upon
Closed by Tobias Powalowski (tpowa)
Monday, 03 November 2014, 20:39 GMT
Reason for closing: Fixed
Additional comments about closing: trunk
Monday, 03 November 2014, 20:39 GMT
Reason for closing: Fixed
Additional comments about closing: trunk
qemu-2.1.2]$ patch -p1 -i <(sed 's/ <at> /@/g' /var/abs/extra/qemu/2.0.0-usb-stack.patch) --dry-run
checking file hw/usb/bus.c
Reversed (or previously applied) patch detected! Assume -R? [n] n
Apply anyway? [n] n
Skipping patch.
1 out of 1 hunk ignored
qemu-2.1.2]$ patch -p1 -i /var/abs/extra/qemu/2.0.0-usb-stack.patch --dry-run
checking file hw/usb/bus.c
qemu-2.1.2]$