Commit 347a6f44 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



virtio, pci, pc: cleanups, features

stricter rules for acpi tables: we now fail
on any difference that isn't whitelisted.

vhost-scsi migration.

some cleanups all over the place

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Wed 05 Jun 2019 20:55:04 BST
# gpg:                using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# 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:
  bios-tables-test: ignore identical binaries
  tests: acpi: add simple arm/virt testcase
  tests: add expected ACPI tables for arm/virt board
  bios-tables-test: list all tables that differ
  vhost-scsi: Allow user to enable migration
  vhost-scsi: Add VMState descriptor
  vhost-scsi: The vhost backend should be stopped when the VM is not running
  bios-tables-test: add diff allowed list
  vhost: fix memory leak in vhost_user_scsi_realize
  vhost: fix incorrect print type
  vhost: remove the dead code
  docs: smbios: remove family=x from type2 entry description
  pci: Fold pci_get_bus_devfn() into its sole caller
  pci: Make is_bridge a bool
  pcie: Simplify pci_adjust_config_limit()
  acpi: pci: use build_append_foo() API to construct MCFG
  hw/acpi: Consolidate build_mcfg to pci.c

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7ad5f33b 7f36f093

default-configs/i386-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -25,3 +25,4 @@ 
CONFIG_ISAPC=y

CONFIG_I440FX=y

CONFIG_Q35=y

CONFIG_ACPI_PCI=y

hw/acpi/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ config ACPI_NVDIMM 
    bool

    depends on ACPI



config ACPI_PCI

    bool

    depends on ACPI && PCI



config ACPI_VMGENID

    bool

    default y

hw/acpi/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o 
common-obj-y += acpi_interface.o

common-obj-y += bios-linker-loader.o

common-obj-y += aml-build.o

common-obj-$(CONFIG_ACPI_PCI) += pci.o

common-obj-$(CONFIG_TPM) += tpm.o



common-obj-$(CONFIG_IPMI) += ipmi.o

hw/acpi/pci.c

0 → 100644
+61 −0
Original line number Diff line number Diff line 
/*

 * Support for generating PCI related ACPI tables and passing them to Guests

 *

 * Copyright (C) 2006 Fabrice Bellard

 * Copyright (C) 2008-2010  Kevin O'Connor <kevin@koconnor.net>

 * Copyright (C) 2013-2019 Red Hat Inc

 * Copyright (C) 2019 Intel Corporation

 *

 * Author: Wei Yang <richardw.yang@linux.intel.com>

 * Author: Michael S. Tsirkin <mst@redhat.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.



 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.



 * You should have received a copy of the GNU General Public License along

 * with this program; if not, see <http://www.gnu.org/licenses/>.

 */



#include "qemu/osdep.h"

#include "hw/acpi/aml-build.h"

#include "hw/acpi/pci.h"

#include "hw/pci/pcie_host.h"



void build_mcfg(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info)

{

    int mcfg_start = table_data->len;



    /*

     * PCI Firmware Specification, Revision 3.0

     * 4.1.2 MCFG Table Description.

     */

    acpi_data_push(table_data, sizeof(AcpiTableHeader));

    /* Reserved */

    build_append_int_noprefix(table_data, 0, 8);



    /*

     * Memory Mapped Enhanced Configuration Space Base Address Allocation

     * Structure

     */

    /* Base address, processor-relative */

    build_append_int_noprefix(table_data, info->base, 8);

    /* PCI segment group number */

    build_append_int_noprefix(table_data, 0, 2);

    /* Starting PCI Bus number */

    build_append_int_noprefix(table_data, 0, 1);

    /* Final PCI Bus number */

    build_append_int_noprefix(table_data, PCIE_MMCFG_BUS(info->size - 1), 1);

    /* Reserved */

    build_append_int_noprefix(table_data, 0, 4);



    build_header(linker, table_data, (void *)(table_data->data + mcfg_start),

                 "MCFG", table_data->len - mcfg_start, 1, NULL, NULL);

}

hw/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ config ARM_VIRT 
    select PLATFORM_BUS

    select SMBIOS

    select VIRTIO_MMIO

    select ACPI_PCI



config CHEETAH

    bool