Re: [Qemu-devel] [PULL 00/28] pci, pc, virtio: fixes, features
On Wed, Oct 24, 2018 at 10:06:41PM +0100, Peter Maydell wrote: > On 24 October 2018 at 21:54, Michael S. Tsirkin wrote: > > On Wed, Oct 24, 2018 at 07:21:17AM +0100, Peter Maydell wrote: > >> Hi. This pull request seems to include an accidental update > >> to the dtc submodule. It's in the "intel_iommu: move ce fetching out > >> when sync shadow" commit, and it's not mentioned in the commit > >> message, so I am assuming it is unintentional. > > > Oh not again. At least now you have scripts that catch it, > > I should write a script for that too. Thanks and sorry. > > The relevant part of my scripts is this bit: > https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/apply-pullreq?id=eeb001fcc1aabd8f077cd2846724120a3aa8f962#n107 > > Specifically, > > if git diff master..staging | grep -q 'Subproject commit'; then > # there's a submodule update in this set of commits > fi > > thanks > -- PMM Thanks added to my pull request script. -- MST
Re: [Qemu-devel] [PULL 00/28] pci, pc, virtio: fixes, features
On 24 October 2018 at 21:54, Michael S. Tsirkin wrote: > On Wed, Oct 24, 2018 at 07:21:17AM +0100, Peter Maydell wrote: >> Hi. This pull request seems to include an accidental update >> to the dtc submodule. It's in the "intel_iommu: move ce fetching out >> when sync shadow" commit, and it's not mentioned in the commit >> message, so I am assuming it is unintentional. > Oh not again. At least now you have scripts that catch it, > I should write a script for that too. Thanks and sorry. The relevant part of my scripts is this bit: https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/apply-pullreq?id=eeb001fcc1aabd8f077cd2846724120a3aa8f962#n107 Specifically, if git diff master..staging | grep -q 'Subproject commit'; then # there's a submodule update in this set of commits fi thanks -- PMM
Re: [Qemu-devel] [PULL 00/28] pci, pc, virtio: fixes, features
On Wed, Oct 24, 2018 at 12:28:52PM +0100, Peter Xu wrote: > On Wed, Oct 24, 2018 at 07:21:17AM +0100, Peter Maydell wrote: > > > dtc | 2 +- > > > > Hi. This pull request seems to include an accidental update > > to the dtc submodule. It's in the "intel_iommu: move ce fetching out > > when sync shadow" commit, and it's not mentioned in the commit > > message, so I am assuming it is unintentional. > > > > Could you fix that and resubmit, please? > > It's my fault. > > Michael, please let me know if you want me to post that single patch > again without that. > > Regards, > > -- > Peter Xu I'll try to fix it myself now. -- MST
Re: [Qemu-devel] [PULL 00/28] pci, pc, virtio: fixes, features
On Wed, Oct 24, 2018 at 07:21:17AM +0100, Peter Maydell wrote: > On 24 October 2018 at 00:41, Michael S. Tsirkin wrote: > > The following changes since commit 13399aad4fa87b2878c49d02a5d3bafa6c966ba3: > > > > Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2018-10-22' > > into staging (2018-10-23 17:20:23 +0100) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > > > for you to fetch changes up to 57b279df457c2c4ef66ce9e1b813df35abde69f7: > > > > vhost-scsi: prevent using uninitialized vqs (2018-10-23 19:29:58 -0400) > > > > > > pci, pc, virtio: fixes, features > > > > AMD IOMMU VAPIC support + fixes all over the place. > > > > Signed-off-by: Michael S. Tsirkin > > > > > > > dtc | 2 +- > > Hi. This pull request seems to include an accidental update > to the dtc submodule. It's in the "intel_iommu: move ce fetching out > when sync shadow" commit, and it's not mentioned in the commit > message, so I am assuming it is unintentional. > > Could you fix that and resubmit, please? > > thanks > -- PMM Oh not again. At least now you have scripts that catch it, I should write a script for that too. Thanks and sorry. -- MST
Re: [Qemu-devel] [PULL 00/28] pci, pc, virtio: fixes, features
On Wed, Oct 24, 2018 at 07:21:17AM +0100, Peter Maydell wrote: > > dtc | 2 +- > > Hi. This pull request seems to include an accidental update > to the dtc submodule. It's in the "intel_iommu: move ce fetching out > when sync shadow" commit, and it's not mentioned in the commit > message, so I am assuming it is unintentional. > > Could you fix that and resubmit, please? It's my fault. Michael, please let me know if you want me to post that single patch again without that. Regards, -- Peter Xu
Re: [Qemu-devel] [PULL 00/28] pci, pc, virtio: fixes, features
On 24 October 2018 at 00:41, Michael S. Tsirkin wrote: > The following changes since commit 13399aad4fa87b2878c49d02a5d3bafa6c966ba3: > > Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2018-10-22' > into staging (2018-10-23 17:20:23 +0100) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > for you to fetch changes up to 57b279df457c2c4ef66ce9e1b813df35abde69f7: > > vhost-scsi: prevent using uninitialized vqs (2018-10-23 19:29:58 -0400) > > > pci, pc, virtio: fixes, features > > AMD IOMMU VAPIC support + fixes all over the place. > > Signed-off-by: Michael S. Tsirkin > > > dtc | 2 +- Hi. This pull request seems to include an accidental update to the dtc submodule. It's in the "intel_iommu: move ce fetching out when sync shadow" commit, and it's not mentioned in the commit message, so I am assuming it is unintentional. Could you fix that and resubmit, please? thanks -- PMM
[Qemu-devel] [PULL 00/28] pci, pc, virtio: fixes, features
The following changes since commit 13399aad4fa87b2878c49d02a5d3bafa6c966ba3: Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2018-10-22' into staging (2018-10-23 17:20:23 +0100) are available in the Git repository at: git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream for you to fetch changes up to 57b279df457c2c4ef66ce9e1b813df35abde69f7: vhost-scsi: prevent using uninitialized vqs (2018-10-23 19:29:58 -0400) pci, pc, virtio: fixes, features AMD IOMMU VAPIC support + fixes all over the place. Signed-off-by: Michael S. Tsirkin Gerd Hoffmann (1): pci-testdev: add optional memory bar Laszlo Ersek (4): MAINTAINERS: list "tests/acpi-test-data" files in ACPI/SMBIOS section hw/pci-host/x86: extract get_pci_hole64_start_value() helpers hw/pci-host/x86: extend the 64-bit PCI hole relative to the fw-assigned base tests/bios-tables-test: add 64-bit PCI MMIO aperture round-up test on Q35 Li Qiang (3): i440fx: use ARRAY_SIZE for pam_regions piix: use TYPE_FOO constants than string constats piix_pci: fix i440fx data sheet link Mao Zhongyi (1): pci_bridge: fix typo in comment Peter Xu (4): intel_iommu: introduce vtd_reset_caches() intel_iommu: better handling of dmar state switch intel_iommu: move ce fetching out when sync shadow intel_iommu: handle invalid ce for shadow sync Philippe Mathieu-Daudé (3): hw/pci-bridge/xio3130: Remove unused functions hw/pci-bridge/ioh3420: Remove unuseful header hw/pci: Add missing include Singh, Brijesh (9): x86_iommu: move the kernel-irqchip check in common code x86_iommu: move vtd_generate_msi_message in common file x86_iommu/amd: remove V=1 check from amdvi_validate_dte() x86_iommu/amd: make the address space naming consistent with intel-iommu x86_iommu/amd: Prepare for interrupt remap support x86_iommu/amd: Add interrupt remap support when VAPIC is not enabled i386: acpi: add IVHD device entry for IOAPIC x86_iommu/amd: Add interrupt remap support when VAPIC is enabled x86_iommu/amd: Enable Guest virtual APIC support Yaowei Bai (1): virtio-blk: fix comment for virtio_blk_rw_complete Yongji Xie (1): vhost-user-blk: start vhost when guest kicks yuchenlin (1): vhost-scsi: prevent using uninitialized vqs docs/specs/pci-testdev.txt | 15 +- hw/i386/amd_iommu.h | 96 +++- hw/pci-bridge/ioh3420.h | 6 - hw/pci-bridge/xio3130_downstream.h | 11 - hw/pci-bridge/xio3130_upstream.h | 10 - include/hw/i386/intel_iommu.h| 59 - include/hw/i386/x86-iommu.h | 66 ++ include/hw/pci/pci_bus.h | 2 + hw/block/vhost-user-blk.c| 25 +++ hw/block/virtio-blk.c| 4 +- hw/i386/acpi-build.c | 31 ++- hw/i386/amd_iommu.c | 414 ++- hw/i386/intel_iommu.c| 131 +-- hw/i386/x86-iommu.c | 33 +++ hw/misc/pci-testdev.c| 19 ++ hw/pci-bridge/ioh3420.c | 2 +- hw/pci-bridge/xio3130_downstream.c | 28 +-- hw/pci-bridge/xio3130_upstream.c | 24 +- hw/pci-host/piix.c | 34 ++- hw/pci-host/q35.c| 17 +- hw/pci/pci_bridge.c | 2 +- hw/scsi/vhost-scsi.c | 2 +- tests/bios-tables-test.c | 16 ++ MAINTAINERS | 2 + dtc | 2 +- hw/i386/trace-events | 14 ++ tests/acpi-test-data/q35/DSDT.mmio64 | Bin 0 -> 8947 bytes tests/acpi-test-data/q35/SRAT.mmio64 | Bin 0 -> 224 bytes 28 files changed, 812 insertions(+), 253 deletions(-) delete mode 100644 hw/pci-bridge/ioh3420.h delete mode 100644 hw/pci-bridge/xio3130_downstream.h delete mode 100644 hw/pci-bridge/xio3130_upstream.h create mode 100644 tests/acpi-test-data/q35/DSDT.mmio64 create mode 100644 tests/acpi-test-data/q35/SRAT.mmio64
