[Qemu-commits] [qemu/qemu] e8ad4d: ide: move headers to include folder

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: e8ad4d16808690e9c0d68b140218ca466c9309fc
      
https://github.com/qemu/qemu/commit/e8ad4d16808690e9c0d68b140218ca466c9309fc
  Author: Efimov Vasily <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/ide/ahci.c
    R hw/ide/ahci.h
    R hw/ide/internal.h
    R hw/ide/pci.h
    A include/hw/ide/ahci.h
    A include/hw/ide/internal.h
    A include/hw/ide/pci.h

  Log Message:
  -----------
  ide: move headers to include folder

The patch moves "hw/ide/achi.h", "hw/ide/pci.h" and "hw/ide/internal.h" headers
to corresponding folders inside "include" folder alike other Qemu headers.

Signed-off-by: Efimov Vasily <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 873b4d3f0571a1e415cf089a67a230ea8a12d059
      
https://github.com/qemu/qemu/commit/873b4d3f0571a1e415cf089a67a230ea8a12d059
  Author: Efimov Vasily <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/audio/pcspk.c
    M include/hw/audio/pcspk.h

  Log Message:
  -----------
  pcspk: convert "pit" property type from ptr to link

The speaker device needs pointer to ISA PIT device to operate. But according to
qdev-properties.h, properties of pointer type should be avoided. It seems a
link type property is a good substitution.

Signed-off-by: Efimov Vasily <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 936a6447c8dbb7bfeb41b1007394f8ee34e69d34
      
https://github.com/qemu/qemu/commit/936a6447c8dbb7bfeb41b1007394f8ee34e69d34
  Author: Efimov Vasily <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/misc/vmport.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  vmport: identify vmport type by macro TYPE_VMPORT

Currently vmport device is identified by the string literal. Using a
preprocessor alias instead is preferable.

Signed-off-by: Efimov Vasily <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 1a004c7fc8d9c9a4a4eb71b5717181f6fe5cf636
      
https://github.com/qemu/qemu/commit/1a004c7fc8d9c9a4a4eb71b5717181f6fe5cf636
  Author: Efimov Vasily <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/block/pflash_cfi01.c
    M hw/block/pflash_cfi02.c
    M include/hw/block/flash.h

  Log Message:
  -----------
  pflash: make TYPE_CFI_PFLASH0{1,2} macros public

qdev API can be used to create CFI pflash devices despite existance of helper
functions. The type name is needed in course of such creation. Using the
preprocessor alias instead of the string literal itself is preferable.

The patch makes the aliases accessible through the header.

Signed-off-by: Efimov Vasily <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 401f2f3ef10037bdeda4549ed4cd5b06af3d1c6a
      
https://github.com/qemu/qemu/commit/401f2f3ef10037bdeda4549ed4cd5b06af3d1c6a
  Author: Efimov Vasily <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/pci-host/q35.c
    M include/hw/i386/pc.h
    M include/hw/pci-host/q35.h

  Log Message:
  -----------
  Q35: implement property interfece to several parameters

During creation of Q35 instance several parameters are set using direct access.
It violates Qemu device model. Correctly, the parameters should be handled as
object properties.

The patch adds four link type properties for fields:
mch.ram_memory
mch.pci_address_space
mch.system_memory
mch.address_space_io
And, it adds two size type properties for fields:
mch.below_4g_mem_size
mch.above_4g_mem_size

Signed-off-by: Efimov Vasily <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 8d1c7158a059e9a55181517aa61faf422831b8f8
      
https://github.com/qemu/qemu/commit/8d1c7158a059e9a55181517aa61faf422831b8f8
  Author: Efimov Vasily <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/i386/pc_q35.c

  Log Message:
  -----------
  pc_q35: configure Q35 instance using properties

Currently, Q35 instance is configured using direct access to structure fields.
The patch uses property interface to set the fields.

Signed-off-by: Efimov Vasily <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 3115b9e2d286188a54d6f415186ae556046b68a3
      
https://github.com/qemu/qemu/commit/3115b9e2d286188a54d6f415186ae556046b68a3
  Author: Efimov Vasily <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/input/pckbd.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  pckbd: handle A20 IRQ as GPIO

The i8042 device has outgouing IRQ line A20. Currently the IRQ is referenced
by a pointer which normally is set during machine initialization. The pointer
is never changed at runtime. So common GPIO model can be applied to A20 IRQ
line. Note that checking for IRQ to be connected as in previous version
of code is not required because qemu_set_irq will do it.

Signed-off-by: Efimov Vasily <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: d812b3d68ddf0efe91a088ecc8b177865b0bab8d
      
https://github.com/qemu/qemu/commit/d812b3d68ddf0efe91a088ecc8b177865b0bab8d
  Author: Efimov Vasily <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/i386/pc.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  port92: handle A20 IRQ as GPIO

The port92 device has outgouing IRQ line A20. Currently the IRQ is referenced
by a pointer which normally is set during machine initialization. The
pointer is never changed at runtime. Hence, common GPIO model can be applied
to A20 IRQ line. Note that checking for IRQ to be connected as in
previous version of code is not required qemu_set_irq will do it.

Signed-off-by: Efimov Vasily <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: f2dd8ebdf40e3cf3863b9022ccb3c3489c2d1c76
      
https://github.com/qemu/qemu/commit/f2dd8ebdf40e3cf3863b9022ccb3c3489c2d1c76
  Author: Efimov Vasily <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/i2c/smbus_ich9.c
    M include/hw/i386/ich9.h

  Log Message:
  -----------
  ICH9 SMB: make TYPE_ICH9_SMB_DEVICE macro public

ICH9 SMB bridge can be created using qdev API despite existence of helper
function. The type name is needed for such creation. Using a preprocessor
alias instead the string type name itself is preferable.

The patch makes the alias accessible through the header.

Signed-off-by: Efimov Vasily <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: f62efcacfab114d0fae016dd9c0cd500f70dd70d
      
https://github.com/qemu/qemu/commit/f62efcacfab114d0fae016dd9c0cd500f70dd70d
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/isa/lpc_ich9.c

  Log Message:
  -----------
  ich9: call ich9_lpc_update_pic for disabled pirqs

An asserted pirq can be disabled and the corresponding GSIs
should then go down to 0.  However, because of the conditional in
ich9_lpc_update_by_pirq, the legacy 8259 pin could remain stuck to 1.

Reviewed-by: Efimov Vasily <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: a94dd6a9d693829bf8fb04cd6d85c797ed90a5d7
      
https://github.com/qemu/qemu/commit/a94dd6a9d693829bf8fb04cd6d85c797ed90a5d7
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/isa/lpc_ich9.c

  Log Message:
  -----------
  ich9: clean up ich9_lpc_update_pic/ich9_lpc_update_apic and callers

Make ich9_lpc_update_pic take care only of GSIs 0-15, and
ich9_lpc_update_apic take care only of GSIs 16-23.  Assert
that they are called with the correct GSI indices.

Reviewed-by: Efimov Vasily <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 35a6b23c824e54055f1a2ab30fa5b051a82cdda6
      
https://github.com/qemu/qemu/commit/35a6b23c824e54055f1a2ab30fa5b051a82cdda6
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/i386/pc_q35.c
    M hw/isa/lpc_ich9.c
    M include/hw/i386/ich9.h

  Log Message:
  -----------
  ich9: unify pic and ioapic IRQ vectors

ich9->pic and ich9->ioapic differ for the first 16 GSIs (because
ich9->pic is wired to 8259+IOAPIC but ich9->ioapic is wired to
IOAPIC only).  However, ich9->ioapic is never used for the first
16 GSIs, so the two vectors can be merged.

Reviewed-by: Efimov Vasily <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: f999c0de05103ccd91b3efff282eaa1c0ea93015
      
https://github.com/qemu/qemu/commit/f999c0de05103ccd91b3efff282eaa1c0ea93015
  Author: Efimov Vasily <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/i386/pc_q35.c
    M hw/isa/lpc_ich9.c
    M include/hw/i386/ich9.h

  Log Message:
  -----------
  ICH9 LPC: handle GSI as qdev GPIO

The ICH9 LPC bridge has 24 output IRQs connected to GSI. Currently the IRQs are
referenced by pointers. The pointers are initialized at startup by direct access
to the structure fields. This violates Qemu device model.

The patch makes the IRQs handling to use GPIO model.

Signed-off-by: Efimov Vasily <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: ea5d42508c16947e84d020751e739c59262051de
      
https://github.com/qemu/qemu/commit/ea5d42508c16947e84d020751e739c59262051de
  Author: Efimov Vasily <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/i386/pc_q35.c
    M hw/isa/lpc_ich9.c

  Log Message:
  -----------
  ICH9 LPC: move call of isa_bus_irqs to 'realize' method

The isa_bus_irqs function initializes ISA bus IRQ array pointer with specified
value.

Previously the ICH9 LPC bridge model did not have its own IRQs but
only IRQ pointer cache. And same GSI were used for ISA bus and other sources
behind the bridge (PCI, SCI). Hence, the pc_q35_init was only possible place to
setup both ISA bus IRQs and the bridge IRQ cache.

As a result, the call of isa_bus_irqs was made from pc_q35_init.

Now the ICH9 LPC bridge has its own output IRQs which are connected to GSI. The
output IRQs are already used to route IRQs from PCI and SCI.

The patch makes the ICH9 LPC bridge output IRQs to used for ISA bus too.

Signed-off-by: Efimov Vasily <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 250263033c5343012b2cd6f01210ffb5b908a159
      
https://github.com/qemu/qemu/commit/250263033c5343012b2cd6f01210ffb5b908a159
  Author: Efimov Vasily <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/isa/isa-bus.c
    M include/hw/isa/isa.h

  Log Message:
  -----------
  isa: introduce wrapper isa_connect_gpio_out

Currently a direct access to the device structure field is used to connect ISA
device IRQ to the bus. GPIO access should be used instead if possible.

The patch adds wrapper isa_connect_gpio_out. The function connects specified
output GPIO to specified ISA IRQ.

Signed-off-by: Efimov Vasily <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 3638439d541835f20fb76346f14549800046af76
      
https://github.com/qemu/qemu/commit/3638439d541835f20fb76346f14549800046af76
  Author: Efimov Vasily <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/timer/mc146818rtc.c

  Log Message:
  -----------
  MC146818 RTC: add GPIO access to output IRQ

The MC146818 RTC device has output IRQ line. Currently the corresponding field
is only accessible through direct access. Such access violates Qemu model.

The patch makes the field accessible through GPIO. It also updates the setting
of the IRQ during initialization.

Signed-off-by: Efimov Vasily <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: cc96677469388bad3d66479379735cf75db069e3
      
https://github.com/qemu/qemu/commit/cc96677469388bad3d66479379735cf75db069e3
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/scsi/esp.c
    M include/migration/vmstate.h

  Log Message:
  -----------
  scsi: esp: fix migration

Commit 926cde5 ("scsi: esp: make cmdbuf big enough for maximum CDB size",
2016-06-16) changed the size of a migrated field.  Split it in two
parts, and only migrate the second part in a new vmstate version.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 33df7bf3bf43ffa3001cadfe5d5faef2774522d0
      
https://github.com/qemu/qemu/commit/33df7bf3bf43ffa3001cadfe5d5faef2774522d0
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M include/ui/console.h
    M ui/vnc.c
    M vl.c

  Log Message:
  -----------
  vnc: generalize "VNC server running on ..." message

The message is useful whenever the user specifies "-vnc to=XX".
Move it to ui/vnc.c.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: be968c721ee9df49708691ab58f0e66b394dea82
      
https://github.com/qemu/qemu/commit/be968c721ee9df49708691ab58f0e66b394dea82
  Author: Lin Ma <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/i386/kvm/pci-assign.c
    M hw/i386/pci-assign-load-rom.c

  Log Message:
  -----------
  pci-assign: Move "Invalid ROM" error message to pci-assign-load-rom.c

In function pci_assign_dev_load_option_rom, For those pci devices don't
have 'rom' file under sysfs or if loading ROM from external file, The
function returns NULL, and won't set the passed 'size' variable.

In these 2 cases, qemu still reports "Invalid ROM" error message, Users
may be confused by it.

Signed-off-by: Lin Ma <address@hidden>
Message-Id: <address@hidden>
Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 8642c1b81e0418df066a7960a7426d85a923a253
      
https://github.com/qemu/qemu/commit/8642c1b81e0418df066a7960a7426d85a923a253
  Author: Peter Crosthwaite <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M include/exec/cpu-all.h
    M linux-user/main.c
    M target-alpha/cpu.h
    M target-arm/cpu.h
    M target-cris/cpu.h
    M target-i386/cpu.h
    M target-lm32/cpu.h
    M target-m68k/cpu.h
    M target-microblaze/cpu.h
    M target-mips/cpu.h
    M target-moxie/cpu.h
    M target-openrisc/cpu.h
    M target-ppc/cpu.h
    M target-s390x/cpu.h
    M target-sh4/cpu.h
    M target-sparc/cpu.h
    M target-tilegx/cpu.h
    M target-tricore/cpu.h
    M target-unicore32/cpu.h
    M target-xtensa/cpu.h

  Log Message:
  -----------
  target-*: Don't redefine cpu_exec()

This function needs to be converted to QOM hook and virtualised for
multi-arch. This rename interferes, as cpu-qom will not have access
to the renaming causing name divergence. This rename doesn't really do
anything anyway so just delete it.

Signed-off-by: Peter Crosthwaite <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>


  Commit: 0ead93120eb7bd770b32adc00b5ec1ee721626dc
      
https://github.com/qemu/qemu/commit/0ead93120eb7bd770b32adc00b5ec1ee721626dc
  Author: Peter Lieven <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M block/iscsi.c

  Log Message:
  -----------
  iscsi: fix assertion in is_sector_request_lun_aligned

Commit 94d047a added an assertion the the request alignment check.
This introduced 2 issues:
 a) A off-by-one error since a request of BDRV_REQUEST_MAX_SECTORS
    is actually allowed.
 b) The bdrv_get_block_status call in the read path to check the allocation
    status requests up to INT_MAX sectors which triggers the assertion.

Fixes: 94d047a35bf663e28f8fef137544d8ea78165add
Signed-off-by: Peter Lieven <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 807464d8a7326e1025a2f392bf41636b0809d6da
      
https://github.com/qemu/qemu/commit/807464d8a7326e1025a2f392bf41636b0809d6da
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/char/serial.c
    M include/hw/char/serial.h

  Log Message:
  -----------
  serial: make tsr_retry unsigned

It can never become negative; reflect this in the type of the field
and simplify the conditions.

Tested-by: Bret Ketchum <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: bce933b85a34514fe34fa559be1d8ccd1f39f954
      
https://github.com/qemu/qemu/commit/bce933b85a34514fe34fa559be1d8ccd1f39f954
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/char/serial.c

  Log Message:
  -----------
  serial: simplify tsr_retry reset

Move common code outside the if, and reset tsr_retry even in loopback mode.
Right now it cannot become non-zero, but it will be possible as soon as
we start respecting the baud rate.

Tested-by: Bret Ketchum <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: b0585e7e07982daa578c3bfef7f6843c89f110a8
      
https://github.com/qemu/qemu/commit/b0585e7e07982daa578c3bfef7f6843c89f110a8
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/char/serial.c

  Log Message:
  -----------
  serial: separate serial_xmit and serial_watch_cb

serial_xmit starts transmission of whatever is in the transmitter
register, THR or FIFO; serial_watch_cb is a wrapper around it and is
only used as a qemu_chr_fe_add_watch callback.

Tested-by: Bret Ketchum <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 6f1de6b70d857d5e316ae6fd908f52818b827b08
      
https://github.com/qemu/qemu/commit/6f1de6b70d857d5e316ae6fd908f52818b827b08
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/char/cadence_uart.c
    M include/sysemu/char.h
    M net/vhost-user.c
    M qemu-char.c

  Log Message:
  -----------
  char: change qemu_chr_fe_add_watch to return unsigned

g_source_attach can return any value between 1 and UINT_MAX if you let
QEMU run long enough.  However, qemu_chr_fe_add_watch can also return
a negative errno value when the device is disconnected or does not
support chr_add_watch.  Change it to return zero to avoid overloading
these values.

Fix the cadence_uart which asserts in this case (easily obtained with
"-serial pty").

Tested-by: Bret Ketchum <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: a1df76da57aa8772a75e7c49f8e3829d07b4c46c
      
https://github.com/qemu/qemu/commit/a1df76da57aa8772a75e7c49f8e3829d07b4c46c
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/char/serial.c
    M include/hw/char/serial.h

  Log Message:
  -----------
  serial: remove watch on reset

Otherwise, this can cause serial_xmit to be entered with LSR.TEMT=0,
which is invalid and causes an assertion failure.

Reported-by: Bret Ketchum <address@hidden>
Tested-by: Bret Ketchum <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 9f34a35e0020b0b2b2e21c086a486d7dfd18df4f
      
https://github.com/qemu/qemu/commit/9f34a35e0020b0b2b2e21c086a486d7dfd18df4f
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/char/serial.c

  Log Message:
  -----------
  serial: reinstate watch after migration

Otherwise, a serial port can get stuck if it is migrated while flow control
is in effect.

Tested-by: Bret Ketchum <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 6d356c8c9e36bd532d14b940ad17ca2f37a2ee71
      
https://github.com/qemu/qemu/commit/6d356c8c9e36bd532d14b940ad17ca2f37a2ee71
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/isa/lpc_ich9.c

  Log Message:
  -----------
  ich9: implement ACPI_EN register

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 8f242cb724cad4a3996e4634e55b7c03ed508a69
      
https://github.com/qemu/qemu/commit/8f242cb724cad4a3996e4634e55b7c03ed508a69
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M hw/isa/lpc_ich9.c
    M include/hw/i386/ich9.h

  Log Message:
  -----------
  ich9: implement SCI_IRQ_SEL register

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 66f37d360b3fc91275ab6ca3de81f0d356c24b4a
      
https://github.com/qemu/qemu/commit/66f37d360b3fc91275ab6ca3de81f0d356c24b4a
  Author: Andrew Jones <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  vl: smp_parse: fix regression

Commit 0544edd88a "vl: smp_parse: cleanups" regressed any -smp
config that left either cores or threads unspecified, and specified
a topology supporting more cpus than the given online cpus. The
correct way to calculate the missing parameter would be to use
maxcpus, but it's too late to change that now. Restore the old
way, which is to calculate it with the online cpus (as is still
done), but then, if the result is zero, just set it to one.

Signed-off-by: Andrew Jones <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 634d39b4e3e5736b73c55b0fcc113e81246a7057
      
https://github.com/qemu/qemu/commit/634d39b4e3e5736b73c55b0fcc113e81246a7057
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M include/glib-compat.h
    M tests/vhost-user-test.c

  Log Message:
  -----------
  vhost-user-test: fix g_cond_wait_until compat implementation

This fixes compilation with glib versions up to 2.30, such
as the one in CentOS 6.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 25f0d2aa5e3d21caa1bc622b21368cc2e383f02c
      
https://github.com/qemu/qemu/commit/25f0d2aa5e3d21caa1bc622b21368cc2e383f02c
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M net/vhost-user.c

  Log Message:
  -----------
  vhost-user: disable chardev handlers on close

This otherwise causes a use-after-free if network backend cleanup
is performed before character device cleanup.

Cc: Marc-André Lureau <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: c1111a24a3358ecd2f17be7c8b117cfe8bc5e5f8
      
https://github.com/qemu/qemu/commit/c1111a24a3358ecd2f17be7c8b117cfe8bc5e5f8
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M qemu-char.c

  Log Message:
  -----------
  char: clean up remaining chardevs when leaving

This helps to remove various chardev resources leaks when leaving qemu.

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 3fa27a9a1e20e8fb2bf4358d6873177d5d5c049a
      
https://github.com/qemu/qemu/commit/3fa27a9a1e20e8fb2bf4358d6873177d5d5c049a
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M include/io/channel.h
    M io/channel-socket.c

  Log Message:
  -----------
  socket: add listen feature

Add a flag to tell whether the channel socket is listening.

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Acked-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>


  Commit: 74b6ce43e3aacbb101018407196fc963e2c39fea
      
https://github.com/qemu/qemu/commit/74b6ce43e3aacbb101018407196fc963e2c39fea
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M include/qemu/sockets.h
    M io/channel-socket.c
    M tests/test-io-channel-socket.c
    M util/qemu-sockets.c

  Log Message:
  -----------
  socket: unlink unix socket on remove

qemu leaves unix socket files behind when removing a listening chardev
or leaving. qemu could clean that up, even if doing so isn't race-free.

Fixes:
https://bugzilla.redhat.com/show_bug.cgi?id=1347077

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 1ec20c2a3aa5b90522d15fccf7f052a90f70ddaa
      
https://github.com/qemu/qemu/commit/1ec20c2a3aa5b90522d15fccf7f052a90f70ddaa
  Author: Peter Maydell <address@hidden>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M block/iscsi.c
    M hw/audio/pcspk.c
    M hw/block/pflash_cfi01.c
    M hw/block/pflash_cfi02.c
    M hw/char/cadence_uart.c
    M hw/char/serial.c
    M hw/i2c/smbus_ich9.c
    M hw/i386/kvm/pci-assign.c
    M hw/i386/pc.c
    M hw/i386/pc_q35.c
    M hw/i386/pci-assign-load-rom.c
    M hw/ide/ahci.c
    R hw/ide/ahci.h
    R hw/ide/internal.h
    R hw/ide/pci.h
    M hw/input/pckbd.c
    M hw/isa/isa-bus.c
    M hw/isa/lpc_ich9.c
    M hw/misc/vmport.c
    M hw/pci-host/q35.c
    M hw/scsi/esp.c
    M hw/timer/mc146818rtc.c
    M include/exec/cpu-all.h
    M include/glib-compat.h
    M include/hw/audio/pcspk.h
    M include/hw/block/flash.h
    M include/hw/char/serial.h
    M include/hw/i386/ich9.h
    M include/hw/i386/pc.h
    A include/hw/ide/ahci.h
    A include/hw/ide/internal.h
    A include/hw/ide/pci.h
    M include/hw/isa/isa.h
    M include/hw/pci-host/q35.h
    M include/io/channel.h
    M include/migration/vmstate.h
    M include/qemu/sockets.h
    M include/sysemu/char.h
    M include/ui/console.h
    M io/channel-socket.c
    M linux-user/main.c
    M net/vhost-user.c
    M qemu-char.c
    M target-alpha/cpu.h
    M target-arm/cpu.h
    M target-cris/cpu.h
    M target-i386/cpu.h
    M target-lm32/cpu.h
    M target-m68k/cpu.h
    M target-microblaze/cpu.h
    M target-mips/cpu.h
    M target-moxie/cpu.h
    M target-openrisc/cpu.h
    M target-ppc/cpu.h
    M target-s390x/cpu.h
    M target-sh4/cpu.h
    M target-sparc/cpu.h
    M target-tilegx/cpu.h
    M target-tricore/cpu.h
    M target-unicore32/cpu.h
    M target-xtensa/cpu.h
    M tests/test-io-channel-socket.c
    M tests/vhost-user-test.c
    M ui/vnc.c
    M util/qemu-sockets.c
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

* serial port fixes (Paolo)
* Q35 modeling improvements (Paolo, Vasily)
* chardev cleanup improvements (Marc-André)
* iscsi bugfix (Peter L.)
* cpu_exec patch from multi-arch patches (Peter C.)
* pci-assign tweak (Lin Ma)

# gpg: Signature made Wed 29 Jun 2016 15:56:30 BST
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <address@hidden>"
# gpg:                 aka "Paolo Bonzini <address@hidden>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream: (35 commits)
  socket: unlink unix socket on remove
  socket: add listen feature
  char: clean up remaining chardevs when leaving
  vhost-user: disable chardev handlers on close
  vhost-user-test: fix g_cond_wait_until compat implementation
  vl: smp_parse: fix regression
  ich9: implement SCI_IRQ_SEL register
  ich9: implement ACPI_EN register
  serial: reinstate watch after migration
  serial: remove watch on reset
  char: change qemu_chr_fe_add_watch to return unsigned
  serial: separate serial_xmit and serial_watch_cb
  serial: simplify tsr_retry reset
  serial: make tsr_retry unsigned
  iscsi: fix assertion in is_sector_request_lun_aligned
  target-*: Don't redefine cpu_exec()
  pci-assign: Move "Invalid ROM" error message to pci-assign-load-rom.c
  vnc: generalize "VNC server running on ..." message
  scsi: esp: fix migration
  MC146818 RTC: add GPIO access to output IRQ
  ...

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/ef8757f1fe80...1ec20c2a3aa5