Commit b66db50f authored by Peter Maydell's avatar Peter Maydell
Browse files

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



pci, pc, virtio: fixes, features

AMD IOMMU VAPIC support + fixes all over the place.

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

# gpg: Signature made Mon 05 Nov 2018 18:24:10 GMT
# gpg:                using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# 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: (33 commits)
  vhost-scsi: prevent using uninitialized vqs
  piix_pci: fix i440fx data sheet link
  piix: use TYPE_FOO constants than string constats
  i440fx: use ARRAY_SIZE for pam_regions
  pci_bridge: fix typo in comment
  hw/pci: Add missing include
  hw/pci-bridge/ioh3420: Remove unuseful header
  hw/pci-bridge/xio3130: Remove unused functions
  tests/bios-tables-test: add 64-bit PCI MMIO aperture round-up test on Q35
  bios-tables-test: prepare expected files for mmio64
  hw/pci-host/x86: extend the 64-bit PCI hole relative to the fw-assigned base
  hw/pci-host/x86: extract get_pci_hole64_start_value() helpers
  pci-testdev: add optional memory bar
  MAINTAINERS: list "tests/acpi-test-data" files in ACPI/SMBIOS section
  x86_iommu/amd: Enable Guest virtual APIC support
  x86_iommu/amd: Add interrupt remap support when VAPIC is enabled
  i386: acpi: add IVHD device entry for IOAPIC
  x86_iommu/amd: Add interrupt remap support when VAPIC is not enabled
  x86_iommu/amd: Prepare for interrupt remap support
  x86_iommu/amd: make the address space naming consistent with intel-iommu
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents fc3d1bad e6cc11d6

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -1120,6 +1120,8 @@ F: hw/i386/acpi-build.[hc] 
F: hw/arm/virt-acpi-build.c

F: tests/bios-tables-test.c

F: tests/acpi-utils.[hc]

F: tests/acpi-test-data/*

F: tests/acpi-test-data/*/*



ppc4xx

M: Alexander Graf <agraf@suse.de>
@@ -1376,7 +1378,7 @@ Intel Hexadecimal Object File Loader 
M: Su Hang <suhang16@mails.ucas.ac.cn>

S: Maintained

F: tests/hexloader-test.c

F: tests/hex-loader-check-data/test.hex

F: tests/data/hex-loader/test.hex



CHRP NVRAM

M: Thomas Huth <thuth@redhat.com>

configure

+24 −33
Original line number Diff line number Diff line
@@ -7392,22 +7392,33 @@ if test "$ccache_cpp2" = "yes"; then 
  echo "export CCACHE_CPP2=y" >> $config_host_mak

fi



# build tree in object directory in case the source is not in the current directory

# If we're using a separate build tree, set it up now.

# DIRS are directories which we simply mkdir in the build tree;

# LINKS are things to symlink back into the source tree

# (these can be both files and directories).

# Caution: do not add files or directories here using wildcards. This

# will result in problems later if a new file matching the wildcard is

# added to the source tree -- nothing will cause configure to be rerun

# so the build tree will be missing the link back to the new file, and

# tests might fail. Prefer to keep the relevant files in their own

# directory and symlink the directory instead.

DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema tests/tcg/xtensa tests/qemu-iotests tests/vm"

DIRS="$DIRS tests/fp"

DIRS="$DIRS docs docs/interop fsdev scsi"

DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw"

DIRS="$DIRS roms/seabios roms/vgabios"

FILES="Makefile tests/tcg/Makefile qdict-test-data.txt"

FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit"

FILES="$FILES tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/Makefile"

FILES="$FILES tests/fp/Makefile"

FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"

FILES="$FILES pc-bios/spapr-rtas/Makefile"

FILES="$FILES pc-bios/s390-ccw/Makefile"

FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"

FILES="$FILES pc-bios/qemu-icon.bmp"

FILES="$FILES .gdbinit scripts" # scripts needed by relative path in .gdbinit

LINKS="Makefile tests/tcg/Makefile qdict-test-data.txt"

LINKS="$LINKS tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit"

LINKS="$LINKS tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/Makefile"

LINKS="$LINKS tests/fp/Makefile"

LINKS="$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps"

LINKS="$LINKS pc-bios/spapr-rtas/Makefile"

LINKS="$LINKS pc-bios/s390-ccw/Makefile"

LINKS="$LINKS roms/seabios/Makefile roms/vgabios/Makefile"

LINKS="$LINKS pc-bios/qemu-icon.bmp"

LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit

LINKS="$LINKS tests/acceptance tests/data"

LINKS="$LINKS tests/qemu-iotests/check"

for bios_file in \

    $source_path/pc-bios/*.bin \

    $source_path/pc-bios/*.lid \
@@ -7419,18 +7430,10 @@ for bios_file in \ 
    $source_path/pc-bios/u-boot.* \

    $source_path/pc-bios/palcode-*

do

    FILES="$FILES pc-bios/$(basename $bios_file)"

done

for test_file in $(find $source_path/tests/acpi-test-data -type f)

do

    FILES="$FILES tests/acpi-test-data$(echo $test_file | sed -e 's/.*acpi-test-data//')"

done

for test_file in $(find $source_path/tests/hex-loader-check-data -type f)

do

    FILES="$FILES tests/hex-loader-check-data$(echo $test_file | sed -e 's/.*hex-loader-check-data//')"

    LINKS="$LINKS pc-bios/$(basename $bios_file)"

done

mkdir -p $DIRS

for f in $FILES ; do

for f in $LINKS ; do

    if [ -e "$source_path/$f" ] && [ "$pwd_is_source_path" != "y" ]; then

        symlink "$source_path/$f" "$f"

    fi
@@ -7452,25 +7455,13 @@ for rom in seabios vgabios ; do 
    echo "RANLIB=$ranlib" >> $config_mak

done



# set up tests data directory

for tests_subdir in acceptance data; do

    if [ ! -e tests/$tests_subdir ]; then

        symlink "$source_path/tests/$tests_subdir" tests/$tests_subdir

    fi

done



# set up qemu-iotests in this build directory

iotests_common_env="tests/qemu-iotests/common.env"

iotests_check="tests/qemu-iotests/check"



echo "# Automatically generated by configure - do not modify" > "$iotests_common_env"

echo >> "$iotests_common_env"

echo "export PYTHON='$python'" >> "$iotests_common_env"



if [ ! -e "$iotests_check" ]; then

    symlink "$source_path/$iotests_check" "$iotests_check"

fi



# Save the configure command line for later reuse.

cat <<EOD >config.status

#!/bin/sh

docs/specs/pci-testdev.txt

+10 −5
Original line number Diff line number Diff line 
pci-test is a device used for testing low level IO



device implements up to two BARs: BAR0 and BAR1.

Each BAR can be memory or IO. Guests must detect

BAR type and act accordingly.

device implements up to three BARs: BAR0, BAR1 and BAR2.

Each of BAR 0+1 can be memory or IO. Guests must detect

BAR types and act accordingly.



Each BAR size is up to 4K bytes.

Each BAR starts with the following header:

BAR 0+1 size is up to 4K bytes each.

BAR 0+1 starts with the following header:



typedef struct PCITestDevHdr {

    uint8_t test;  <- write-only, starts a given test number
@@ -24,3 +24,8 @@ All registers are little endian. 
device is expected to always implement tests 0 to N on each BAR, and to add new

tests with higher numbers.  In this way a guest can scan test numbers until it

detects an access type that it does not support on this BAR, then stop.



BAR2 is a 64bit memory bar, without backing storage.  It is disabled

by default and can be enabled using the membar=<size> property.  This

can be used to test whether guests handle pci bars of a specific

(possibly quite large) size correctly.

hw/block/vhost-user-blk.c

+25 −0
Original line number Diff line number Diff line
@@ -217,7 +217,32 @@ static uint64_t vhost_user_blk_get_features(VirtIODevice *vdev, 


static void vhost_user_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)

{

    VHostUserBlk *s = VHOST_USER_BLK(vdev);

    int i;



    if (!(virtio_host_has_feature(vdev, VIRTIO_F_VERSION_1) &&

        !virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1))) {

        return;

    }



    if (s->dev.started) {

        return;

    }



    /* Some guests kick before setting VIRTIO_CONFIG_S_DRIVER_OK so start

     * vhost here instead of waiting for .set_status().

     */

    vhost_user_blk_start(vdev);



    /* Kick right away to begin processing requests already in vring */

    for (i = 0; i < s->dev.nvqs; i++) {

        VirtQueue *kick_vq = virtio_get_queue(vdev, i);



        if (!virtio_queue_get_desc_addr(vdev, i)) {

            continue;

        }

        event_notifier_set(virtio_queue_get_host_notifier(kick_vq));

    }

}



static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp)

hw/block/virtio-blk.c

+2 −2
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ static void virtio_blk_rw_complete(void *opaque, int ret) 


        if (req->qiov.nalloc != -1) {

            /* If nalloc is != 1 req->qiov is a local copy of the original

             * external iovec. It was allocated in submit_merged_requests

             * to be able to merge requests. */

             * external iovec. It was allocated in submit_requests to be

             * able to merge requests. */

            qemu_iovec_destroy(&req->qiov);

        }