[Qemu-commits] [qemu/qemu] 7c38ec: acpi/pcihp.c: Rewrite acpi_pcihp_get_bsel using ob...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 7c38ecd09763107513bacc791856fdbb582a107c
      
https://github.com/qemu/qemu/commit/7c38ecd09763107513bacc791856fdbb582a107c
  Author: Kirill Batuzov <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M hw/acpi/pcihp.c

  Log Message:
  -----------
  acpi/pcihp.c: Rewrite acpi_pcihp_get_bsel using object_property_get_int

acpi_pcihp_get_bsel implements functionality of object_property_get_int for
specific property named ACPI_PCIHP_PROP_BSEL, but fails to decrement object's
reference counter properly. Rewriting it using generic object_property_get_int
serves two purposes: reducing code duplication and fixing memory leak.

Signed-off-by: Kirill Batuzov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 097a97a6650e29fd390f2a31f9e3a8ea7468f573
      
https://github.com/qemu/qemu/commit/097a97a6650e29fd390f2a31f9e3a8ea7468f573
  Author: Kirill Batuzov <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M hw/i386/acpi-build.c

  Log Message:
  -----------
  acpi-build: properly decrement objects' reference counters

Object returned by object_property_get_qobject needs its reference counter to
be decremented when it is not needed by caller anymore.

Signed-off-by: Kirill Batuzov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 9ac1c4c07e7e6ab16a3e2149e9b32c0d092cb3f5
      
https://github.com/qemu/qemu/commit/9ac1c4c07e7e6ab16a3e2149e9b32c0d092cb3f5
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M hw/i386/acpi-build.c

  Log Message:
  -----------
  acpi: fix tables for no-hpet configuration

acpi build tried to add offset of hpet table to rsdt even when hpet was
disabled.  If no tables follow hpet, this could lead to a malformed
rsdt.

Fix it up.

To avoid such errors in the future, rearrange code slightly to make it
clear that acpi_add_table stores the offset of the following table - not
of the previous one.

Reported-by: TeLeMan <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Cc: address@hidden


  Commit: 8cbad670cecaa88cc48115233bc4bc290dadd782
      
https://github.com/qemu/qemu/commit/8cbad670cecaa88cc48115233bc4bc290dadd782
  Author: Hervé Poussineau <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M hw/intc/i8259.c

  Log Message:
  -----------
  i8259: don't abort when trying to use level sensitive irqs

This is a guest-triggerable error, as seen when using Xenix 2.3.4.
Replace hw_error by LOG_UNIMPL, so that guests can continue.
With this patch, I can install and use Xenix 2.3.4a without any problem.
I can also start installation of Xenix 2.3.4q, but it fails due to not
finding an hard disk.

Signed-off-by: Hervé Poussineau <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 9df11c9f086e8329cdc06a67314ddce886841a5b
      
https://github.com/qemu/qemu/commit/9df11c9f086e8329cdc06a67314ddce886841a5b
  Author: Gabriel L. Somlo <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

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

  Log Message:
  -----------
  pc: add compat_props placeholder for 2.0 machine type

Add the "boilerplate" necessary for subsequent patches to
simply drop in compat_props for pc machines 2.0 and older.

This patch contains no functional changes.

Signed-off-by: Gabriel Somlo <address@hidden>
Acked-by: Alexander Graf <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: aa93200b88fb1071eaf21bf766711762ed4630e2
      
https://github.com/qemu/qemu/commit/aa93200b88fb1071eaf21bf766711762ed4630e2
  Author: Gabriel L. Somlo <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M hw/intc/apic.c
    M hw/intc/apic_common.c
    M include/hw/i386/apic_internal.h
    M include/hw/i386/pc.h

  Log Message:
  -----------
  apic: use emulated lapic version 0x14 on pc machines >= 2.1

Add "version" property to local apic, and have it default to
0x14 for pc machines starting at 2.1. For compatibility with
previous releases, pc machines up to 2.0 will have their local
apic version set to 0x11.

Signed-off-by: Gabriel L. Somlo <address@hidden>
Acked-by: Alexander Graf <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 285364e96818c1a5f715fe256557b4a718222bc6
      
https://github.com/qemu/qemu/commit/285364e96818c1a5f715fe256557b4a718222bc6
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M hw/i2c/smbus.c
    M include/hw/i2c/smbus.h

  Log Message:
  -----------
  smbus: allow returning an error from reads

Signed-off-by: Paolo Bonzini <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 046a1844142dc9ffa7c95f0761bfa11272480adf
      
https://github.com/qemu/qemu/commit/046a1844142dc9ffa7c95f0761bfa11272480adf
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M hw/i2c/smbus.c
    M include/hw/i2c/smbus.h

  Log Message:
  -----------
  smbus: return -1 if nothing found at the given address

Signed-off-by: Paolo Bonzini <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: c8097612ce21ad2d2b6b5d4b6495d71d52fa423d
      
https://github.com/qemu/qemu/commit/c8097612ce21ad2d2b6b5d4b6495d71d52fa423d
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M hw/i2c/pm_smbus.c

  Log Message:
  -----------
  pm_smbus: correctly report unclaimed cycles

Without this patch, i2cdetect will report all addresses as present.
With it, only 0x50..0x57 are present.

Before:
    0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f
    00:          03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f
    10: 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f
    20: 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f
    30: 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f
    40: 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f
    50: 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f
    60: 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f
    70: 70 71 72 73 74 75 76 77

After:
    0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f
    00:          -- -- -- -- -- -- -- -- -- -- -- -- --
    10: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
    20: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
    30: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
    40: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
    50: 50 51 52 53 54 55 56 57 -- -- -- -- -- -- -- --
    60: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
    70: -- -- -- -- -- -- -- --

Signed-off-by: Paolo Bonzini <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 62622c11f230edddcc47aabe2d988555bf125993
      
https://github.com/qemu/qemu/commit/62622c11f230edddcc47aabe2d988555bf125993
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: addresses for responsible disclosure

Adding addresses to MAINTAINERS, as agreed on the last conference call:

http://wiki.qemu.org/SecurityProcess

People sometimes detect security issues in upstream
QEMU and don't know where to report them in a non-public way.
Of course whoever just wants full disclosure can just go public,
but there's nothing specified for non-public - until recently Anthony
was doing this informally.

As I started doing this recently anyway, I can handle this on the QEMU side
in a more formal way.

Adding a secalert mailing list as well - they are the ones who is actually
opening CVEs, communicating issues to all downstreams etc,
and they are already handling this for upstream, not just Red Hat.

Keeping Anthony's address around in case he wants to be informed.

Peter Maydell said that he prefers not to be on this contact list at
this point.

A public mailing list has been created - not listing it here yet -
until we know how to set it up in a secure fashion and
until there are more people so manually copying everyone
becomes unwieldy for reporters.

Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: cab00a5aa163b6bba3043ef0636c4a3a061511ec
      
https://github.com/qemu/qemu/commit/cab00a5aa163b6bba3043ef0636c4a3a061511ec
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: make source tree build more robust

When source directory can be arrived at by two paths,
configure might misdetect an out of tree build.
The simplest way to trigger the problem is running
configure using a full path. E.g. (<firstpath> refers to qemu source
tree):
    ln -s <firstpath> <secondpath>
    cd <firstpath>
    <secondpath>/configure

A more practical way is when make runs configure automatically:

1. cd <firstpath>/; ./configure
    SRC_PATH=<firstpath>/ is written into config_host.mak
2. cd <secondpath>/; touch configure; make
    make now runs <firstpath>/configure, so configure
    assumes it's an out of tree build

When this happens configure overwrites parts of
the current tree with symlinks.

Make the test more robust: look for configure
in the current directory.
If there - we know it's a source build!

Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: b18a990c3d5cb8f8dfe1a5e5b36c67857ce1cf86
      
https://github.com/qemu/qemu/commit/b18a990c3d5cb8f8dfe1a5e5b36c67857ce1cf86
  Author: Peter Maydell <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M MAINTAINERS
    M configure
    M hw/acpi/pcihp.c
    M hw/i2c/pm_smbus.c
    M hw/i2c/smbus.c
    M hw/i386/acpi-build.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/intc/apic.c
    M hw/intc/apic_common.c
    M hw/intc/i8259.c
    M include/hw/i2c/smbus.h
    M include/hw/i386/apic_internal.h
    M include/hw/i386/pc.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

pc,net,MAINTAINERS,build updates

MAINTAINERS updated with link to the security process documentation
apic version modified to make more guests happy
On top of that, bugfixes all over the place

Signed-off-by: Michael S. Tsirkin <address@hidden>

# gpg: Signature made Wed 07 May 2014 17:15:29 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg:                 aka "Michael S. Tsirkin <address@hidden>"

* remotes/mst/tags/for_upstream:
  configure: make source tree build more robust
  MAINTAINERS: addresses for responsible disclosure
  pm_smbus: correctly report unclaimed cycles
  smbus: return -1 if nothing found at the given address
  smbus: allow returning an error from reads
  apic: use emulated lapic version 0x14 on pc machines >= 2.1
  pc: add compat_props placeholder for 2.0 machine type
  i8259: don't abort when trying to use level sensitive irqs
  acpi: fix tables for no-hpet configuration
  acpi-build: properly decrement objects' reference counters
  acpi/pcihp.c: Rewrite acpi_pcihp_get_bsel using object_property_get_int

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


Compare: https://github.com/qemu/qemu/compare/8d1dc5d188b8...b18a990c3d5c