Commit d6394988 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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



# By Amos Kong (1) and Luiz Capitulino (1)
# Via Luiz Capitulino
* luiz/queue/qmp:
  virtio-balloon: fix integer overflow in BALLOON_CHANGE QMP event
  monitor: fix the wrong order of releasing keys

Message-id: 1366375833-995-1-git-send-email-lcapitulino@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 68c0aa6e dcc6ceff

hw/virtio/virtio-balloon.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static void virtio_balloon_set_config(VirtIODevice *vdev, 
    dev->actual = le32_to_cpu(config.actual);

    if (dev->actual != oldactual) {

        qemu_balloon_changed(ram_size -

                             (dev->actual << VIRTIO_BALLOON_PFN_SHIFT));

                       ((ram_addr_t) dev->actual << VIRTIO_BALLOON_PFN_SHIFT));

    }

}

ui/input.c

+3 −5
Original line number Diff line number Diff line
@@ -234,13 +234,11 @@ static void free_keycodes(void) 


static void release_keys(void *opaque)

{

    int i;



    for (i = 0; i < keycodes_size; i++) {

        if (keycodes[i] & 0x80) {

    while (keycodes_size > 0) {

        if (keycodes[--keycodes_size] & 0x80) {

            kbd_put_keycode(0xe0);

        }

        kbd_put_keycode(keycodes[i]| 0x80);

        kbd_put_keycode(keycodes[keycodes_size] | 0x80);

    }



    free_keycodes();