qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 760794: s390/sclpconsole: prevent char layer


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 760794: s390/sclpconsole: prevent char layer callback duri...
Date: Wed, 13 Feb 2013 11:30:11 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 760794f784f66e262a9ca32821ba202cdf3a3e4b
      
https://github.com/qemu/qemu/commit/760794f784f66e262a9ca32821ba202cdf3a3e4b
  Author: Christian Borntraeger <address@hidden>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M hw/s390x/sclpconsole.c

  Log Message:
  -----------
  s390/sclpconsole: prevent char layer callback during initialization

Starting a qemu with an sclp console and pressing a key very early
can result in
"qemu-system-s390x: hw/s390x/sclpconsole.c:60: receive_from_chr_layer:
Assertion `scon->iov' failed."

Lets make sure that the init process is finished, since the iov is
allocated after CHR_EVENT_OPENED by also checking for scon->iov.

Signed-off-by: Christian Borntraeger <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>


  Commit: bd9a8d852c857fd19c4626acaac1d4979f816f3a
      
https://github.com/qemu/qemu/commit/bd9a8d852c857fd19c4626acaac1d4979f816f3a
  Author: Cornelia Huck <address@hidden>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M target-s390x/helper.c

  Log Message:
  -----------
  s390: Keep I/O interrupts enabled for all iscs.

do_io_interrupt() would stop scanning further iscs if it found
an I/O interrupt it could inject. This might cause the pending
interrupt indication for I/O interrupts to be reset although there
might be queued I/O interrupts for subsequent iscs.

Fix this by reordering the logic: Inject the I/O interrupt immediately
and continue searching all iscs for queued interrupts.

Signed-off-by: Cornelia Huck <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>


  Commit: 91b0a8f33419573c1d741e49559bfb666fd8b1f0
      
https://github.com/qemu/qemu/commit/91b0a8f33419573c1d741e49559bfb666fd8b1f0
  Author: Cornelia Huck <address@hidden>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M hw/s390x/css.c
    M target-s390x/cpu.h
    M target-s390x/helper.c
    M target-s390x/ioinst.h

  Log Message:
  -----------
  s390: Fix handling of iscs.

There are two ways to express an interruption subclass:
- As a bitmask, as used in cr6.
- As a number, as used in the I/O interruption word.

Unfortunately, we have treated to I/O interruption word as if it
contained the bitmask as well, which went unnoticed so far as
- (queued-for-next) kvm made the same mistake, and
- Linux guest kernels don't check the isc value in the I/O interruption
  word for subchannel interrupts.

Make sure that we treat the I/O interruption word correctly.

Signed-off-by: Cornelia Huck <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>


  Commit: cc2a90432d9cb7546a2c4360ad7200a2fb3af31a
      
https://github.com/qemu/qemu/commit/cc2a90432d9cb7546a2c4360ad7200a2fb3af31a
  Author: Andreas Färber <address@hidden>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: Avoid NULL function pointer dereference on cleanup

The pSeries machine and some other devices don't supply a cleanup
callback. Revert part of 1ceef9f27359cbe92ef124bf74de6f792e71f6fb that
started calling it unconditionally.

Cc: Jason Wang <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: d037d6bbbcdda6552254286b6da090ef0dc0d98a
      
https://github.com/qemu/qemu/commit/d037d6bbbcdda6552254286b6da090ef0dc0d98a
  Author: Markus Armbruster <address@hidden>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  chardev: Fix manual page and qemu-doc for -chardev tty

Broken in commit d59044ef.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: d36b2b904ee921b380fad559cb824a40eb587bcb
      
https://github.com/qemu/qemu/commit/d36b2b904ee921b380fad559cb824a40eb587bcb
  Author: Markus Armbruster <address@hidden>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M qapi-schema.json
    M qemu-char.c

  Log Message:
  -----------
  qapi: Flatten away ChardevPort

Simplifies the schema and the code.

QMP command

    { "execute" : "chardev-add",
      "arguments" : { "id" : "ser0",
                "backend" : { "type" : "port",
                              "data" : { "type": "serial",
                                         "device":"/dev/ttyS0"} } } }

becomes

    { "execute" : "chardev-add",
      "arguments" : { "id" : "ser0",
                "backend" : { "type" : "serial",
                              "data" : { "device":"/dev/ttyS0"} } } }

Bonus: nicer error messages.  "unknown chardev port (1)" becomes
"character device backend type 'parallel' not supported".

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 8a8f5840082eb65d140ccfe7b128c92390cce1c3
      
https://github.com/qemu/qemu/commit/8a8f5840082eb65d140ccfe7b128c92390cce1c3
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M block/curl.c

  Log Message:
  -----------
  block/curl: only restrict protocols with libcurl>=7.19.4

The curl_easy_setopt(state->curl, CURLOPT_PROTOCOLS, ...) interface was
introduced in libcurl 7.19.4.  Therefore we cannot protect against
CVE-2013-0249 when linking against an older libcurl.

This fixes the build failure introduced by
fb6d1bbd246c7a57ef53d3847ef225cd1349d602.

Reported-by: Andreas Färber <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Tested-by: Andreas Färber <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 9893c80d81587ac25d8ea4a82651371b54e7df35
      
https://github.com/qemu/qemu/commit/9893c80d81587ac25d8ea4a82651371b54e7df35
  Author: Peter Crosthwaite <address@hidden>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M hw/cadence_uart.c

  Log Message:
  -----------
  cadance_uart: Accept input after rx FIFO pop

The device returns false from the can receive function when the FIFO is
full. This means the device should check for buffered input whenever a byte is
popped from the FIFO.

Reported-by: Jason Wu <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


Compare: https://github.com/qemu/qemu/compare/7ce4106c2125...9893c80d8158

reply via email to

[Prev in Thread] Current Thread [Next in Thread]