[Qemu-commits] [qemu/qemu] 8dcf52: acpi-build: append description for non-hotplug

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 8dcf525abc5dff785251a881f9764dd961065c0d
      
https://github.com/qemu/qemu/commit/8dcf525abc5dff785251a881f9764dd961065c0d
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M hw/i386/acpi-build.c
    M hw/i386/acpi-dsdt.dsl
    M hw/i386/acpi-dsdt.hex.generated
    M hw/i386/q35-acpi-dsdt.dsl
    M hw/i386/q35-acpi-dsdt.hex.generated
    M hw/i386/ssdt-pcihp.dsl
    M hw/i386/ssdt-pcihp.hex.generated

  Log Message:
  -----------
  acpi-build: append description for non-hotplug

As reported in
http://article.gmane.org/gmane.comp.emulators.qemu/253987
Mac OSX actually requires describing all occupied slots
in ACPI - even if hotplug isn't enabled.

I didn't expect this so I dropped description of all
non hotpluggable slots from ACPI.
As a result: before
commit 99fd437dee468609de8218f0eb3b16621fb6a9c9 (enable
hotplug for pci bridges), PCI cards show up in the "device tree" of OS X
(System Information). E.g., on MountainLion users have:

Hardware -> PCI Cards:

  Card          Type                 Driver Installed  Slot
 *ethernet      Ethernet Controller  Yes               PCI Slot 2
  pci8086,2934  USB UHC              Yes               PCI Slot 29

  ethernet:
    Type:                 Ethernet Controller
    Driver Installed:     Yes
    MSI:                  No
    Bus:                  PCI
    Slot                  PCI Slot 2
    Vendor ID:            0x8086
    Device ID:            0x100e
    Subsystem Vendor ID:  0x1af4
    Subsystem ID:         0x1100
    Revision ID:          0x0003

Hardware -> Ethernet Cards

  ethernet:
    Type:                 Ethernet Controller
    Bus:                  PCI
    Slot                  PCI Slot 2
    Vendor ID:            0x8086
    Device ID:            0x100e
    Subsystem Vendor ID:  0x1af4
    Subsystem ID:         0x1100
    Revision ID:          0x0003
    BSD name:             en0
    Kext name:            AppleIntel8254XEthernet.kext
    Location:             /System/Library/Extensions/...
    Version:              3.1.1b1

After commit 99fd437dee468609de8218f0eb3b16621fb6a9c9, users get:

Hardware -> PCI Cards:

  This computer doesn't contain any PCI cards. If you installed PCI
  cards, make sure they're properly installed.

Hardware -> Ethernet Cards

  ethernet:
    Type:                 Ethernet Controller
    Bus:                  PCI
    Vendor ID:            0x8086
    Device ID:            0x100e
    Subsystem Vendor ID:  0x1af4
    Subsystem ID:         0x1100
    Revision ID:          0x0003
    BSD name:             en0
    Kext name:            AppleIntel8254XEthernet.kext
    Location:             /System/Library/Extensions/...
    Version:              3.1.1b1

Ethernet still works, but it's not showing up on the PCI bus, and it
no longer thinks it's plugged in to slot #2, as it used to before the
change.

To fix, append description for all occupied non hotpluggable PCI slots.

One need to be careful when doing this: VGA devices
are now described in SSDT, so we need to drop description from DSDT.
And ISA devices are used in DSDT so drop them from SSDT.

Reported-by: Gabriel L. Somlo <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>

Also update generated dsdt and pcihp hex dump files.

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


  Commit: 6cb46e1e900a05dea1734a6cbe81c0c1ecb2f2cb
      
https://github.com/qemu/qemu/commit/6cb46e1e900a05dea1734a6cbe81c0c1ecb2f2cb
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M tests/acpi-test-data/pc/DSDT
    M tests/acpi-test-data/pc/SSDT
    M tests/acpi-test-data/q35/DSDT
    M tests/acpi-test-data/q35/SSDT

  Log Message:
  -----------
  acpi-test-data: update expected files

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


  Commit: ddfa83ea06680e83643978f6ecf740b60f86f7c2
      
https://github.com/qemu/qemu/commit/ddfa83ea06680e83643978f6ecf740b60f86f7c2
  Author: Joel Stanley <address@hidden>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M hw/net/virtio-net.c

  Log Message:
  -----------
  virtio-net: remove function calls from assert

peer_{de,at}tach were called from inside assert().
We don't support building without NDEBUG but it's not tidy.
Rearrange to attach peer outside assert calls.

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


  Commit: 8e46bbf362458fc3e4638a53249248a1ee40b912
      
https://github.com/qemu/qemu/commit/8e46bbf362458fc3e4638a53249248a1ee40b912
  Author: Igor Mammedov <address@hidden>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M include/exec/memory.h
    M memory.c

  Log Message:
  -----------
  memory_region_present: return false if address is not found in child 
MemoryRegion

Windows XP shows COM2 port as non functional in
"Device Manager" although no COM2 port backing device
is present in QEMU.

This regression is really due to
3bb28b7208b349e7a1b326e3c6ef9efac1d462bf?
    memory: Provide separate handling of unassigned io ports accesses

That is caused by the fact that QEMU reports to
OSPM that device is present by setting 5th bit in
PII4XPM.pci_conf[0x67] register when COM2 doesn't
exist.

It happens due to memory_region_present(io_as, 0x2f8)
returning false positive since 0x2f8 address eventually
translates into catchall io_as address space.

Fix memory_region_present(parent, addr) by returning
true only if addr maps into a MemoryRegion within
parent (excluding parent itself), to match its
doc comment.

While at it fix copy/paste error in
memory_region_present() doc comment.

Note: this is a temporary hack: we really need better handling for
unassigned regions, we should avoid fallback regions since they are bad
for performance (breaking radix tree assumption that the data structure
is sparsely populated); for memory we need to fix this to implement PCI
master abort properly, anyway.

Cc: Jan Kiszka <address@hidden>
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 6e1f0a55a14bad1d0c8b9d29626ef4e4b2617c74
      
https://github.com/qemu/qemu/commit/6e1f0a55a14bad1d0c8b9d29626ef4e4b2617c74
  Author: Igor Mammedov <address@hidden>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M hw/pci/pcie.c

  Log Message:
  -----------
  PCIE: fix regression with coldplugged multifunction device

PCIE is causing asserts each time a multifunction device is added
on command line (coldplug).

This is caused by
commit a66e657e18cd9b70e9f57ae5512c07faf2bc508f
    pci/pcie: convert PCIE hotplug to use hotplug-handler API
QEMU abort is caused by misplaced assertion, which should
be checked only when device is hotplugged.

Reference to regression report:
 http://www.mail-archive.com/address@hidden/msg216226.html

Fixes: a66e657e18cd9b70e9f57ae5512c07faf2bc508f

Reported-By: Nigel Kukard <address@hidden>
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 5d12f961c6f10cba15b0aa43a877c1fffca463d1
      
https://github.com/qemu/qemu/commit/5d12f961c6f10cba15b0aa43a877c1fffca463d1
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  Rework --name to use QemuOpts

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>


  Commit: 8f480de0c91a18d550721f8d9af969ebfbda0793
      
https://github.com/qemu/qemu/commit/8f480de0c91a18d550721f8d9af969ebfbda0793
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M include/qemu/thread.h
    M qemu-options.hx
    M util/qemu-thread-posix.c
    M util/qemu-thread-win32.c
    M vl.c

  Log Message:
  -----------
  Add 'debug-threads' suboption to --name

Add flag storage to qemu-thread-* to store the namethreads flag

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>


  Commit: 4900116e6f0edef6877c0e8a9ca19957d47765c9
      
https://github.com/qemu/qemu/commit/4900116e6f0edef6877c0e8a9ca19957d47765c9
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M cpus.c
    M hw/block/dataplane/virtio-blk.c
    M hw/usb/ccid-card-emulated.c
    M include/qemu/thread.h
    M libcacard/vscclient.c
    M migration.c
    M thread-pool.c
    M ui/vnc-jobs.c
    M util/compatfd.c
    M util/qemu-thread-posix.c
    M util/qemu-thread-win32.c

  Log Message:
  -----------
  Add a 'name' parameter to qemu_thread_create

If enabled, set the thread name at creation (on GNU systems with
  pthread_set_np)
Fix up all the callers with a thread name

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>


  Commit: 4a4fcdf6df3189a4ab5bdec70cffb7587c50405d
      
https://github.com/qemu/qemu/commit/4a4fcdf6df3189a4ab5bdec70cffb7587c50405d
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: drop an out of date address

Gleb's address seems to be out of date.  Since it stayed like that for a
while now, I'm guessing he's no longer interested in getting mail.

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


  Commit: 262f6f5140ea54646c518adc94aab86c4b1c0019
      
https://github.com/qemu/qemu/commit/262f6f5140ea54646c518adc94aab86c4b1c0019
  Author: Marcel Apfelbaum <address@hidden>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M tests/acpi-test.c

  Log Message:
  -----------
  acpi-test: retain both asl and aml files on failure

Updated the error message while at it.

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


  Commit: 15d914b18dd7a9a3bd85291f476613b2f9c2caa6
      
https://github.com/qemu/qemu/commit/15d914b18dd7a9a3bd85291f476613b2f9c2caa6
  Author: Marcel Apfelbaum <address@hidden>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M tests/acpi-test.c

  Log Message:
  -----------
  acpi-test: issue errors instead of warnings when possible

If the expected (offline) acpi tables loaded correctly,
it is safe to assume the iasl installation is OK and
issue an error if the actual tables failed to load.

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


  Commit: 175f099b30d4736d23384a838b5f324961f67a1e
      
https://github.com/qemu/qemu/commit/175f099b30d4736d23384a838b5f324961f67a1e
  Author: Hervé Poussineau <address@hidden>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M hw/pci-host/pam.c

  Log Message:
  -----------
  pam: partly fix write-only mode

In write-only mode, writes are forwarded to RAM, while reads should not be
handled (ie should return 0xff).
Assume that in this mode, no read access is ever done, as they shouldn't
give any sensible result.

So, in write-only mode, alias PAM region to RAM, instead of PCI memory
(which can even be mapped to some device!)

This fixes Award BIOS, which use this mode to shadow system BIOS and video BIOS.

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


  Commit: f1b7e0e498c03e5b4519eeea73b49aafe9d88618
      
https://github.com/qemu/qemu/commit/f1b7e0e498c03e5b4519eeea73b49aafe9d88618
  Author: Hervé Poussineau <address@hidden>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M hw/input/pckbd.c

  Log Message:
  -----------
  pckbd: return 'keyboard enabled' on read input port command

Bit 7 of Input Port is the keyboard inhibit switch.
0 means keyboard inhibited, while 1 means keyboard enabled.

Incidentaly, this also fixes an error encountered while booting
an Award BIOS: "Keyboard is locked out - Unlock the key".

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


  Commit: 220c8ed536491315b4040d820328b8dfd60d67a7
      
https://github.com/qemu/qemu/commit/220c8ed536491315b4040d820328b8dfd60d67a7
  Author: Gabriel L. Somlo <address@hidden>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M hw/intc/ioapic.c

  Log Message:
  -----------
  qemu: x86: ignore ioapic polarity

Both QEMU and KVM have already accumulated a significant number of
optimizations based on the hard-coded assumption that ioapic polarity
will always use the ActiveHigh convention, where the logical and
physical states of level-triggered irq lines always match (i.e.,
active(asserted) == high == 1, inactive == low == 0). QEMU guests
are expected to follow directions given via ACPI and configure the
ioapic with polarity 0 (ActiveHigh). However, even when misbehaving
guests (e.g. OS X <= 10.9) set the ioapic polarity to 1 (ActiveLow),
QEMU will still use the ActiveHigh signaling convention when
interfacing with the emulated ioapic.

This patch modifies the emulated ioapic to completely ignore polarity
as set by the guest OS, enabling misbehaving guests to work alongside
those which comply with the ActiveHigh polarity specified by QEMU's
ACPI tables.

Signed-off-by: Gabriel L. Somlo <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 118760dfc9f4db2df3700ddb2934543abef86bfa
      
https://github.com/qemu/qemu/commit/118760dfc9f4db2df3700ddb2934543abef86bfa
  Author: Peter Maydell <address@hidden>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M MAINTAINERS
    M cpus.c
    M hw/block/dataplane/virtio-blk.c
    M hw/i386/acpi-build.c
    M hw/i386/acpi-dsdt.dsl
    M hw/i386/acpi-dsdt.hex.generated
    M hw/i386/q35-acpi-dsdt.dsl
    M hw/i386/q35-acpi-dsdt.hex.generated
    M hw/i386/ssdt-pcihp.dsl
    M hw/i386/ssdt-pcihp.hex.generated
    M hw/input/pckbd.c
    M hw/intc/ioapic.c
    M hw/net/virtio-net.c
    M hw/pci-host/pam.c
    M hw/pci/pcie.c
    M hw/usb/ccid-card-emulated.c
    M include/exec/memory.h
    M include/qemu/thread.h
    M libcacard/vscclient.c
    M memory.c
    M migration.c
    M qemu-options.hx
    M tests/acpi-test-data/pc/DSDT
    M tests/acpi-test-data/pc/SSDT
    M tests/acpi-test-data/q35/DSDT
    M tests/acpi-test-data/q35/SSDT
    M tests/acpi-test.c
    M thread-pool.c
    M ui/vnc-jobs.c
    M util/compatfd.c
    M util/qemu-thread-posix.c
    M util/qemu-thread-win32.c
    M vl.c

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

acpi,pc,pci,virtio,memory bug fixes

This collects several small fixes from all over the place.
Additionally, Marcel's changes make acpi unit tests more robust.

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

# gpg: Signature made Sun 09 Mar 2014 19:14:57 GMT using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg:                 aka "Michael S. Tsirkin <address@hidden>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  qemu: x86: ignore ioapic polarity
  pckbd: return 'keyboard enabled' on read input port command
  pam: partly fix write-only mode
  acpi-test: issue errors instead of warnings when possible
  acpi-test: retain both asl and aml files on failure
  MAINTAINERS: drop an out of date address
  Add a 'name' parameter to qemu_thread_create
  Add 'debug-threads' suboption to --name
  Rework --name to use QemuOpts
  PCIE: fix regression with coldplugged multifunction device
  memory_region_present: return false if address is not found in child 
MemoryRegion
  virtio-net: remove function calls from assert
  acpi-test-data: update expected files
  acpi-build: append description for non-hotplug

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


Compare: https://github.com/qemu/qemu/compare/b304bf0021a2...118760dfc9f4