[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] cb3d37: acpi: add missing ssdt
|
From: |
GitHub |
|
Subject: |
[Qemu-commits] [qemu/qemu] cb3d37: acpi: add missing ssdt |
|
Date: |
Fri, 05 Jun 2015 04:30:07 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: cb3d37a93cc59da400d27361fcda024d49210abd
https://github.com/qemu/qemu/commit/cb3d37a93cc59da400d27361fcda024d49210abd
Author: Michael S. Tsirkin <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
A hw/i386/ssdt-tpm-common.dsl
Log Message:
-----------
acpi: add missing ssdt
commit 5cb18b3d7bff2a83275ee98af2a14eb9e21c93ab
TPM2 ACPI table support
was missing a file, so build with iasl fails
(build without iasl works since it uses the generated
hex files).
Reported-by: "Daniel P. Berrange" <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 557772f26b361ade84acecb366fe6fdd2d55a6d9
https://github.com/qemu/qemu/commit/557772f26b361ade84acecb366fe6fdd2d55a6d9
Author: Marcel Apfelbaum <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/isa/lpc_ich9.c
Log Message:
-----------
hw/q35: fix floppy controller definition in ich9
In DSDT FDC0 declares the IO region as IO(Decode16, 0x03F2, 0x03F2, 0x00, 0x04).
Use the same in lpc_ich9 initialization code.
Now the floppy drive is detected correctly on Windows.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 6652d0811c9463fbfb2d2d1cb2ec03f388145c5f
https://github.com/qemu/qemu/commit/6652d0811c9463fbfb2d2d1cb2ec03f388145c5f
Author: Jason Wang <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/virtio/virtio-pci.c
Log Message:
-----------
virtio-pci: don't try to mask or unmask vqs without notifiers
We should validate the vq index against nvqs_with_notifiers. Otherwise we may
try to mask or unmask vector for vqs without notifiers (e.g control vq). This
will lead qemu abort on kvm_irqchip_commit_routes() when trying to boot win8.1
guest.
Fixes 851c2a75a6e80c8aa5e713864d98cfb512e7229b ("virtio-pci: speedup MSI-X
masking and unmasking")
Reported-by: Alex Williamson <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 977ad992f14b29a7d4f18eaba42a705004545a64
https://github.com/qemu/qemu/commit/977ad992f14b29a7d4f18eaba42a705004545a64
Author: Juan Quintela <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M include/sysemu/tpm.h
Log Message:
-----------
TPM: fix build with tpm disabled
Failure was included on commit
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: d5aaa1b0456033fc9ff723ac881ebe1b61360cca
https://github.com/qemu/qemu/commit/d5aaa1b0456033fc9ff723ac881ebe1b61360cca
Author: Gerd Hoffmann <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/net/virtio-net.c
M hw/virtio/virtio.c
M include/hw/virtio/virtio.h
Log Message:
-----------
virtio: 64bit features fixups.
Commit "019a3ed virtio: make features 64bit wide" missed a few changes,
as I've noticed while trying to rebase the virtio-1 branch to latest
master. This patch adds them.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: ca9b46bcecc0f06882eec1b152b71f93a066da79
https://github.com/qemu/qemu/commit/ca9b46bcecc0f06882eec1b152b71f93a066da79
Author: Zhu Guihua <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/acpi/core.c
M hw/acpi/cpu_hotplug.c
M hw/acpi/memory_hotplug.c
M hw/acpi/pcihp.c
M include/hw/acpi/acpi.h
M include/hw/acpi/memory_hotplug.h
M include/hw/acpi/pc-hotplug.h
Log Message:
-----------
acpi: add acpi_send_gpe_event() to rise sci for hotplug
Add a new API named acpi_send_gpe_event() to send hotplug SCI.
This API can be used by pci, cpu and memory hotplug.
This patch is rebased on master.
Signed-off-by: Zhu Guihua <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Commit: 32d9ca15bac63e8a7bad6dc1a4ab624e6d6d3b0f
https://github.com/qemu/qemu/commit/32d9ca15bac63e8a7bad6dc1a4ab624e6d6d3b0f
Author: Marcel Apfelbaum <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/acpi/aml-build.c
Log Message:
-----------
acpi: add implementation of aml_while() term
Commit 68e6b0af7 (acpi: add aml_while() term) added
the definition of aml_while without the actual implementation.
Implement the term.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Laszlo Ersek <address@hidden>
Commit: ce6a28ee057da3e4a587dada369e33a8486b0066
https://github.com/qemu/qemu/commit/ce6a28ee057da3e4a587dada369e33a8486b0066
Author: Marcel Apfelbaum <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/pci/pci.c
M include/hw/pci/pci.h
M include/hw/pci/pci_bus.h
Log Message:
-----------
hw/pci: made pci_bus_is_root a PCIBusClass method
Refactoring it as a method of PCIBusClass will allow
different implementations for subclasses.
Removed the assumption that the root bus does not
have a parent device because is specific only
to the default class implementation.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Laszlo Ersek <address@hidden>
Commit: 602141d9974d726063907851528c89d617730156
https://github.com/qemu/qemu/commit/602141d9974d726063907851528c89d617730156
Author: Marcel Apfelbaum <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/pci/pci.c
M include/hw/pci/pci_bus.h
Log Message:
-----------
hw/pci: made pci_bus_num a PCIBusClass method
Refactoring it as a method of PCIBusClass will allow
different implementations for subclasses.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Laszlo Ersek <address@hidden>
Commit: ca6c18556c5e9c4aac12489b960c3e4601e183bf
https://github.com/qemu/qemu/commit/ca6c18556c5e9c4aac12489b960c3e4601e183bf
Author: Marcel Apfelbaum <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/i386/acpi-build.c
Log Message:
-----------
hw/i386: query only for q35/pc when looking for pci host bridge
Because of the PXB hosts we cannot simply query TYPE_PCI_HOST_BRIDGE anymore.
On i386 arch we only have two pci hosts, so we can look only for them.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Laszlo Ersek <address@hidden>
Commit: 09e5b81922179b6c52b42fd27587e64b474036c7
https://github.com/qemu/qemu/commit/09e5b81922179b6c52b42fd27587e64b474036c7
Author: Marcel Apfelbaum <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/pci/pci.c
Log Message:
-----------
hw/pci: extend PCI config access to support devices behind PXB
PXB buses are assumed to be children of bus 0. Look for them
while scanning the buses.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Laszlo Ersek <address@hidden>
Commit: a4894206e3672f8a5e5443d72b705495e022b638
https://github.com/qemu/qemu/commit/a4894206e3672f8a5e5443d72b705495e022b638
Author: Marcel Apfelbaum <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/i386/acpi-build.c
Log Message:
-----------
hw/acpi: add support for i440fx 'snooping' root busses
If the machine has extra root busses that are snooping to
the i440fx host bridge, we need to add them to
acpi in order to be properly detected by guests.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Laszlo Ersek <address@hidden>
Commit: 0d8935e3370e07f57651e43d2de9011d75c2a066
https://github.com/qemu/qemu/commit/0d8935e3370e07f57651e43d2de9011d75c2a066
Author: Marcel Apfelbaum <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/i386/acpi-build.c
Log Message:
-----------
hw/apci: add _PRT method for extra PCI root busses
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Laszlo Ersek <address@hidden>
Commit: a43c6e276231e8040203940cb07be00387686e87
https://github.com/qemu/qemu/commit/a43c6e276231e8040203940cb07be00387686e87
Author: Marcel Apfelbaum <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/i386/acpi-build.c
Log Message:
-----------
hw/acpi: add _CRS method for extra root busses
Save the IO/mem/bus numbers ranges assigned to the extra root busses
to be removed from the root bus 0 range.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Laszlo Ersek <address@hidden>
Commit: dcdca29655f774568f30a82b7fe0190b4bd38802
https://github.com/qemu/qemu/commit/dcdca29655f774568f30a82b7fe0190b4bd38802
Author: Marcel Apfelbaum <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/i386/acpi-build.c
Log Message:
-----------
hw/acpi: remove from root bus 0 the crs resources used by other buses.
If multiple root buses are used, root bus 0 cannot use all the
pci holes ranges. Remove the IO/mem ranges used by the other
primary buses.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Laszlo Ersek <address@hidden>
Commit: cb2ed8b3c66284f226c523231e2c09e60bbb34bb
https://github.com/qemu/qemu/commit/cb2ed8b3c66284f226c523231e2c09e60bbb34bb
Author: Marcel Apfelbaum <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/pci/pci.c
Log Message:
-----------
hw/pci: removed 'rootbus nr is 0' assumption from qmp_pci_query
Use the newer pci_bus_num to correctly get the root bus number.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Laszlo Ersek <address@hidden>
Commit: 40d14bef8012087ade60f254487d31db822a1a44
https://github.com/qemu/qemu/commit/40d14bef8012087ade60f254487d31db822a1a44
Author: Marcel Apfelbaum <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/pci-bridge/Makefile.objs
A hw/pci-bridge/pci_expander_bridge.c
M include/hw/pci/pci.h
Log Message:
-----------
hw/pci: introduce PCI Expander Bridge (PXB)
PXB is a "light-weight" host bridge whose purpose is to enable
the main host bridge to support multiple PCI root buses
for pc machines.
As oposed to PCI-2-PCI bridge's secondary bus, PXB's bus
is a primary bus and can be associated with a NUMA node
(different from the main host bridge) allowing the guest OS
to recognize the proximity of a pass-through device to
other resources as RAM and CPUs.
The PXB is composed from:
- A primary PCI bus (can be associated with a NUMA node)
Acts like a normal pci bus and from the functionality point
of view is an "expansion" of the bus behind the
main host bridge.
- A pci-2-pci bridge behind the primary PCI bus where the actual
devices will be attached.
- A host-bridge PCI device
Situated on the bus behind the main host bridge, allows
the BIOS to configure the bus number and IO/mem resources.
It does not have its own config/data register for configuration
cycles, this being handled by the main host bridge.
- A host-bridge sysbus to comply with QEMU current design.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Laszlo Ersek <address@hidden>
Commit: 2118196bb3795a43bf708c37bdcf4b3c33778ccb
https://github.com/qemu/qemu/commit/2118196bb3795a43bf708c37bdcf4b3c33778ccb
Author: Marcel Apfelbaum <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/i386/pc.c
Log Message:
-----------
hw/pci: inform bios if the system has extra pci root buses
The bios looks for 'etc/extra-pci-roots' to decide if
is going to scan further buses after bus 0 tree.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Laszlo Ersek <address@hidden>
Commit: 0639b00d055b313930c23c4d6c9ebfb4af61c00c
https://github.com/qemu/qemu/commit/0639b00d055b313930c23c4d6c9ebfb4af61c00c
Author: Marcel Apfelbaum <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/pci-bridge/pci_expander_bridge.c
Log Message:
-----------
hw/pxb: add map_irq func
The bios does not index the pxb slot number when
it computes the IRQ because it resides on bus 0
and not on the current bus.
However Qemu routes the irq through bus 0 and adds
the pxb slot to the IRQ computation of the PXB device.
Synchronize between bios and Qemu by canceling
pxb's effect.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Laszlo Ersek <address@hidden>
Commit: 6a3042b23bbb1fa92c00ea9267c830e7f2e99313
https://github.com/qemu/qemu/commit/6a3042b23bbb1fa92c00ea9267c830e7f2e99313
Author: Marcel Apfelbaum <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/pci/pci.c
M include/hw/pci/pci.h
M include/hw/pci/pci_bus.h
M include/sysemu/sysemu.h
Log Message:
-----------
hw/pci: add support for NUMA nodes
PCI root buses can be attached to a specific NUMA node.
PCI buses are not attached by default to a NUMA node.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Laszlo Ersek <address@hidden>
Commit: 0e79e51a7dcbd4fde5738d713b60f0fb0321f1af
https://github.com/qemu/qemu/commit/0e79e51a7dcbd4fde5738d713b60f0fb0321f1af
Author: Marcel Apfelbaum <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/i386/acpi-build.c
M hw/pci-bridge/pci_expander_bridge.c
Log Message:
-----------
hw/pxb: add numa_node parameter
The pxb can be attach to and existing numa node by specifying
numa_node option that equals the desired numa nodeid.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Laszlo Ersek <address@hidden>
Commit: 0f6dd8e1d514b8c24689499ed72ea89fd0d967f3
https://github.com/qemu/qemu/commit/0f6dd8e1d514b8c24689499ed72ea89fd0d967f3
Author: Marcel Apfelbaum <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M hw/i386/acpi-build.c
Log Message:
-----------
apci: fix PXB behaviour if used with unsupported BIOS
PXB does not work with unsupported bioses, but should
not interfere with normal OS operation.
We don't ship them anymore, but it's reasonable
to keep the work-around until we update the bios in qemu.
Fix this by not adding PXB mem/IO chunks to _CRS
if they weren't configured by BIOS.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Laszlo Ersek <address@hidden>
Commit: 814550d73a94dcf9f2c9f8d2ee280226f1145388
https://github.com/qemu/qemu/commit/814550d73a94dcf9f2c9f8d2ee280226f1145388
Author: Marcel Apfelbaum <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
A docs/pci_expander_bridge.txt
Log Message:
-----------
docs: Add PXB documentation
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Laszlo Ersek <address@hidden>
Commit: b5d3b039221f056befb3715471fee1f68214815c
https://github.com/qemu/qemu/commit/b5d3b039221f056befb3715471fee1f68214815c
Author: Igor Mammedov <address@hidden>
Date: 2015-06-04 (Thu, 04 Jun 2015)
Changed paths:
M hw/mem/pc-dimm.c
Log Message:
-----------
pc-dimm: don't assert if pc-dimm alignment != hotpluggable mem range size
Drop superfluous pc-dimm alignment on hot-pluggable mem
range size assert, since it causes QEMU crash during hotplug
when hotplugging pc-dimm with alignment bigger than
an alignment of hot-pluggable mem range size.
Instead allow pc_dimm_get_free_addr() find free address
and bail out gracefully later in that function during
checking if pc-dimm will fit in hot-pluggable mem range.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 9a10bbb4e83b184faef6fa744396a6775283c0aa
https://github.com/qemu/qemu/commit/9a10bbb4e83b184faef6fa744396a6775283c0aa
Author: Laszlo Ersek <address@hidden>
Date: 2015-06-04 (Thu, 04 Jun 2015)
Changed paths:
M hw/acpi/core.c
M hw/acpi/ich9.c
M hw/acpi/piix4.c
M hw/isa/vt82c686.c
M include/hw/acpi/acpi.h
Log Message:
-----------
hw/acpi: acpi_pm1_cnt_init(): take "disable_s3" and "disable_s4"
This patch only modifies the function prototype and updates all chipset
code that calls acpi_pm1_cnt_init() to pass in their own disable_s3 and
disable_s4 settings. vt82c686 is assumed to be fixed "S3 and S4 enabled".
RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1204696
Cc: Amit Shah <address@hidden>
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Cc: Richard Henderson <address@hidden>
Cc: Eduardo Habkost <address@hidden>
Cc: Aurelien Jarno <address@hidden>
Cc: Leon Alrae <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Commit: e3845e7c47cc3eaf35305c9c0f9d55ca3840b49b
https://github.com/qemu/qemu/commit/e3845e7c47cc3eaf35305c9c0f9d55ca3840b49b
Author: Laszlo Ersek <address@hidden>
Date: 2015-06-04 (Thu, 04 Jun 2015)
Changed paths:
M hw/acpi/core.c
M hw/acpi/piix4.c
Log Message:
-----------
hw/acpi: move "etc/system-states" fw_cfg file from PIIX4 to core
The acpi_pm1_cnt_init() core function is responsible for setting up the
register block that will ultimately react to S3 and S4 requests (see
acpi_pm1_cnt_write()). It makes sense to advertise this configuration to
the guest firmware via an easy to parse fw_cfg file (ACPI is too complex
for firmware to parse), and indeed PIIX4 does that. However, since
acpi_pm1_cnt_init() is not specific to PIIX4, neither should be the fw_cfg
file.
This patch makes "etc/system-states" appear on all chipsets modified in
the previous patch, not just PIIX4 (assuming they have fw_cfg at all).
RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1204696
Cc: Amit Shah <address@hidden>
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Cc: Richard Henderson <address@hidden>
Cc: Eduardo Habkost <address@hidden>
Cc: Aurelien Jarno <address@hidden>
Cc: Leon Alrae <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Commit: 6e7d82497dc8da7d420c8fa6632d759e08a18bc3
https://github.com/qemu/qemu/commit/6e7d82497dc8da7d420c8fa6632d759e08a18bc3
Author: Laszlo Ersek <address@hidden>
Date: 2015-06-04 (Thu, 04 Jun 2015)
Changed paths:
M hw/acpi/piix4.c
M hw/i386/pc_piix.c
M hw/mips/mips_malta.c
M include/hw/i386/pc.h
Log Message:
-----------
hw/acpi: piix4_pm_init(): take fw_cfg object no more
This PIIX4 init function has no more reason to receive a pointer to the
FwCfg object. Remove the parameter from the prototype, and update callers.
As a result, the pc_init1() function no longer needs to save the return
value of pc_memory_init() and xen_load_linux(), which makes it more
similar to pc_q35_init().
The return type & value of pc_memory_init() and xen_load_linux() are not
changed themselves; maybe we'll need their return values sometime later.
RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1204696
Cc: Amit Shah <address@hidden>
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Cc: Richard Henderson <address@hidden>
Cc: Eduardo Habkost <address@hidden>
Cc: Aurelien Jarno <address@hidden>
Cc: Leon Alrae <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Commit: 309750fad51f17d1ec6195c5d8ad7d741596ddb6
https://github.com/qemu/qemu/commit/309750fad51f17d1ec6195c5d8ad7d741596ddb6
Author: Jason Wang <address@hidden>
Date: 2015-06-04 (Thu, 04 Jun 2015)
Changed paths:
M hw/virtio/vhost.c
M include/hw/virtio/vhost.h
Log Message:
-----------
vhost: logs sharing
Currently we allocate one vhost log per vhost device. This is sub
optimal when:
- Guest has several device with vhost as backend
- Guest has multiqueue devices
In the above cases, we can avoid the memory allocation by sharing a
single vhost log among all the vhost devices. This is done through:
- Introducing a new vhost_log structure with refcnt inside.
- Using a global pointer to vhost_log structure that will be used. And
introduce helper to get the log with expected log size and helper to
- drop the refcnt to the old log.
- Each vhost device still keep track of a pointer to the log that was
used.
With above, if no resize happens, all vhost device will share a single
vhost log. During resize, a new vhost_log structure will be allocated
and made for the global pointer. And each vhost devices will drop the
refcnt to the old log.
Tested by doing scp during migration for a 2 queues virtio-net-pci.
Cc: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: d6688ba17b934f20f5e8953dbaafc9408d8799c5
https://github.com/qemu/qemu/commit/d6688ba17b934f20f5e8953dbaafc9408d8799c5
Author: Peter Maydell <address@hidden>
Date: 2015-06-04 (Thu, 04 Jun 2015)
Changed paths:
A docs/pci_expander_bridge.txt
M hw/acpi/aml-build.c
M hw/acpi/core.c
M hw/acpi/cpu_hotplug.c
M hw/acpi/ich9.c
M hw/acpi/memory_hotplug.c
M hw/acpi/pcihp.c
M hw/acpi/piix4.c
M hw/i386/acpi-build.c
M hw/i386/pc.c
M hw/i386/pc_piix.c
M hw/isa/lpc_ich9.c
M hw/isa/vt82c686.c
M hw/mem/pc-dimm.c
M hw/mips/mips_malta.c
M hw/net/virtio-net.c
M hw/pci-bridge/Makefile.objs
A hw/pci-bridge/pci_expander_bridge.c
M hw/pci/pci.c
M hw/virtio/vhost.c
M hw/virtio/virtio-pci.c
M hw/virtio/virtio.c
M include/hw/acpi/acpi.h
M include/hw/acpi/memory_hotplug.h
M include/hw/acpi/pc-hotplug.h
M include/hw/i386/pc.h
M include/hw/pci/pci.h
M include/hw/pci/pci_bus.h
M include/hw/virtio/vhost.h
M include/hw/virtio/virtio.h
M include/sysemu/sysemu.h
M include/sysemu/tpm.h
Log Message:
-----------
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc, acpi, virtio, tpm
This includes pxb support by Marcel, as well as multiple enhancements all over
the place.
Signed-off-by: Michael S. Tsirkin <address@hidden>
# gpg: Signature made Thu Jun 4 11:51:02 2015 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: (28 commits)
vhost: logs sharing
hw/acpi: piix4_pm_init(): take fw_cfg object no more
hw/acpi: move "etc/system-states" fw_cfg file from PIIX4 to core
hw/acpi: acpi_pm1_cnt_init(): take "disable_s3" and "disable_s4"
pc-dimm: don't assert if pc-dimm alignment != hotpluggable mem range size
docs: Add PXB documentation
apci: fix PXB behaviour if used with unsupported BIOS
hw/pxb: add numa_node parameter
hw/pci: add support for NUMA nodes
hw/pxb: add map_irq func
hw/pci: inform bios if the system has extra pci root buses
hw/pci: introduce PCI Expander Bridge (PXB)
hw/pci: removed 'rootbus nr is 0' assumption from qmp_pci_query
hw/acpi: remove from root bus 0 the crs resources used by other buses.
hw/acpi: add _CRS method for extra root busses
hw/apci: add _PRT method for extra PCI root busses
hw/acpi: add support for i440fx 'snooping' root busses
hw/pci: extend PCI config access to support devices behind PXB
hw/i386: query only for q35/pc when looking for pci host bridge
hw/pci: made pci_bus_num a PCIBusClass method
...
Conflicts:
hw/i386/pc_piix.c
Signed-off-by: Peter Maydell <address@hidden>
Compare: https://github.com/qemu/qemu/compare/3b730f570c58...d6688ba17b93
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [qemu/qemu] cb3d37: acpi: add missing ssdt,
GitHub <=