| Message ID | 20190515121146.7248-1-mst@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
From: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Igor Mammedov <imammedo@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <1556808723-226478-13-git-send-email-imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- tests/data/acpi/virt/APIC | Bin 0 -> 168 bytes tests/data/acpi/virt/DSDT | Bin 0 -> 18476 bytes tests/data/acpi/virt/FACP | Bin 0 -> 268 bytes tests/data/acpi/virt/GTDT | Bin 0 -> 96 bytes tests/data/acpi/virt/MCFG | Bin 0 -> 60 bytes tests/data/acpi/virt/SPCR | Bin 0 -> 80 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/data/acpi/virt/APIC create mode 100644 tests/data/acpi/virt/DSDT create mode 100644 tests/data/acpi/virt/FACP create mode 100644 tests/data/acpi/virt/GTDT create mode 100644 tests/data/acpi/virt/MCFG create mode 100644 tests/data/acpi/virt/SPCR diff --git a/tests/data/acpi/virt/APIC b/tests/data/acpi/virt/APIC new file mode 100644 index 0000000000000000000000000000000000000000..797dfde2841c51b7e72065602e99ce1714347f0d GIT binary patch literal 168 zcmZ<^@N{0mz`($~*~#D8BUr&HBEZ=ZD8>jB1F=Cg4Dd+6SPUF6788)c?E~X6Fu>G{ hBZPn~MyPrgD9sGlkD?67;f3451Xcqw&w(L;0RYV=2>}2A literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/DSDT b/tests/data/acpi/virt/DSDT new file mode 100644 index 0000000000000000000000000000000000000000..20e85c7f89f645c69935c615c07084e221419960 GIT binary patch literal 18476 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 literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/FACP b/tests/data/acpi/virt/FACP new file mode 100644 index 0000000000000000000000000000000000000000..27de99f51bfe846b1f8796ace49d83f5b33a1aed GIT binary patch literal 268 ycmZ>BbPnKQWME+3?d0$55v<@85#a0w6axw|fY>0Kx<CNcIA#XwTY+i=(L4a*H3tCz literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/GTDT b/tests/data/acpi/virt/GTDT new file mode 100644 index 0000000000000000000000000000000000000000..10107a65e958ff6495bb8c17d63d0539690f59f6 GIT binary patch literal 96 zcmZ<{aS2IaU|?Xn>E!S15v<@85#a0&6k`O6f!H7#8OTC8azL5|h^3)?DJYFj0RVOU B2mt^9 literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/MCFG b/tests/data/acpi/virt/MCFG new file mode 100644 index 0000000000000000000000000000000000000000..e8987e1af0ec3829770bf4fe11fab02b06160dd2 GIT binary patch literal 60 scmeZuc5}C3U|?YMck*}k2v%^42ypfViZKGkKx`0=1Oyx)oc|yS05YNo0RR91 literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/SPCR b/tests/data/acpi/virt/SPCR new file mode 100644 index 0000000000000000000000000000000000000000..377271a0e7817cc21a28c02123a89facad63604f GIT binary patch literal 80 zcmWFza1IJ!U|?VpcJg=j2v%^42yhMtiZKGkKx`1r48#l^3?L>agsBLmm>C$E7#RKo I0Z0r60QF4^0RR91 literal 0 HcmV?d00001
On Thu, 16 May 2019 at 13:17, Michael S. Tsirkin <mst@redhat.com> wrote: > > The following changes since commit efb4f3b62c69383a7308d7b739a3193e7c0ccae8: > > Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-05-10 14:49:36 +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 0534d255dae78450d90d59db0f3a9a46b32ebd73: > > tests: acpi: print error unable to dump ACPI table during rebuild (2019-05-14 21:19:14 -0400) > > ---------------------------------------------------------------- > pci, pc, virtio: features, fixes > > reconnect for vhost blk > tests for UEFI > misc other stuff > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > ---------------------------------------------------------------- Hi -- this pullreq has a conflict in default-configs/arm-softmmu.mak because the conversion of arm to Kconfig has landed in master. Could you rebase and fix up to use whatever the Kconfig equivalent of these changes is, please? thanks -- PMM
On 5/16/19 6:04 PM, Peter Maydell wrote: > On Thu, 16 May 2019 at 13:17, Michael S. Tsirkin <mst@redhat.com> wrote: >> >> The following changes since commit efb4f3b62c69383a7308d7b739a3193e7c0ccae8: >> >> Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-05-10 14:49:36 +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 0534d255dae78450d90d59db0f3a9a46b32ebd73: >> >> tests: acpi: print error unable to dump ACPI table during rebuild (2019-05-14 21:19:14 -0400) >> >> ---------------------------------------------------------------- >> pci, pc, virtio: features, fixes >> >> reconnect for vhost blk >> tests for UEFI >> misc other stuff >> >> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> >> >> ---------------------------------------------------------------- > > Hi -- this pullreq has a conflict in default-configs/arm-softmmu.mak > because the conversion of arm to Kconfig has landed in master. > Could you rebase and fix up to use whatever the Kconfig > equivalent of these changes is, please? Culprit is "hw/acpi: Consolidate build_mcfg to pci.c" The conflict doesn't look trivial to resolve (to me) so I'd rather see it reviewed (by Thomas). I suggest to drop the patch(es) from your PR :( Regards, Phil.
On Thu, May 16, 2019 at 8:33 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > On 5/16/19 6:04 PM, Peter Maydell wrote: > > On Thu, 16 May 2019 at 13:17, Michael S. Tsirkin <mst@redhat.com> wrote: > >> > >> The following changes since commit efb4f3b62c69383a7308d7b739a3193e7c0ccae8: > >> > >> Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-05-10 14:49:36 +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 0534d255dae78450d90d59db0f3a9a46b32ebd73: > >> > >> tests: acpi: print error unable to dump ACPI table during rebuild (2019-05-14 21:19:14 -0400) > >> > >> ---------------------------------------------------------------- > >> pci, pc, virtio: features, fixes > >> > >> reconnect for vhost blk > >> tests for UEFI > >> misc other stuff > >> > >> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > >> > >> ---------------------------------------------------------------- > > > > Hi -- this pullreq has a conflict in default-configs/arm-softmmu.mak > > because the conversion of arm to Kconfig has landed in master. > > Could you rebase and fix up to use whatever the Kconfig > > equivalent of these changes is, please? > > Culprit is "hw/acpi: Consolidate build_mcfg to pci.c" > > The conflict doesn't look trivial to resolve (to me) so I'd rather see > it reviewed (by Thomas). I suggest to drop the patch(es) from your PR :( Thomas, FYI I did this to resolve the conflict: - keep default-configs/arm-softmmu.mak from master: git checkout origin/master default-configs/arm-softmmu.mak - applied the following !fixup snippet: -- >8 -- --- a/hw/acpi/Kconfig +++ b/hw/acpi/Kconfig @@ -25,7 +25,7 @@ config ACPI_NVDIMM config ACPI_PCI bool - depends on ACPI + depends on ACPI && PCI --- I felt it easier to review on top of "hw/acpi: Improve build modularity" https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg04718.html Sadly both series clash :( Regards, Phil.
On Thu, May 16, 2019 at 08:53:04PM +0200, Philippe Mathieu-Daudé wrote: >On Thu, May 16, 2019 at 8:33 PM Philippe Mathieu-Daudé ><philmd@redhat.com> wrote: >> On 5/16/19 6:04 PM, Peter Maydell wrote: >> > On Thu, 16 May 2019 at 13:17, Michael S. Tsirkin <mst@redhat.com> wrote: >> >> >> >> The following changes since commit efb4f3b62c69383a7308d7b739a3193e7c0ccae8: >> >> >> >> Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-05-10 14:49:36 +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 0534d255dae78450d90d59db0f3a9a46b32ebd73: >> >> >> >> tests: acpi: print error unable to dump ACPI table during rebuild (2019-05-14 21:19:14 -0400) >> >> >> >> ---------------------------------------------------------------- >> >> pci, pc, virtio: features, fixes >> >> >> >> reconnect for vhost blk >> >> tests for UEFI >> >> misc other stuff >> >> >> >> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> >> >> >> >> ---------------------------------------------------------------- >> > >> > Hi -- this pullreq has a conflict in default-configs/arm-softmmu.mak >> > because the conversion of arm to Kconfig has landed in master. >> > Could you rebase and fix up to use whatever the Kconfig >> > equivalent of these changes is, please? >> >> Culprit is "hw/acpi: Consolidate build_mcfg to pci.c" >> >> The conflict doesn't look trivial to resolve (to me) so I'd rather see >> it reviewed (by Thomas). I suggest to drop the patch(es) from your PR :( > >Thomas, FYI I did this to resolve the conflict: > >- keep default-configs/arm-softmmu.mak from master: > > git checkout origin/master default-configs/arm-softmmu.mak > >- applied the following !fixup snippet: > >-- >8 -- >--- a/hw/acpi/Kconfig >+++ b/hw/acpi/Kconfig >@@ -25,7 +25,7 @@ config ACPI_NVDIMM > > config ACPI_PCI > bool >- depends on ACPI >+ depends on ACPI && PCI Take a look into hw/arm/Kconfig. Only ARM_VIRT selects ACPI, but this one doesn't select PCI. Which option on arm select both? > >--- > >I felt it easier to review on top of "hw/acpi: Improve build modularity" >https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg04718.html > >Sadly both series clash :( > >Regards, > >Phil.
On Thu, May 16, 2019 at 08:53:04PM +0200, Philippe Mathieu-Daudé wrote: >On Thu, May 16, 2019 at 8:33 PM Philippe Mathieu-Daudé ><philmd@redhat.com> wrote: >> On 5/16/19 6:04 PM, Peter Maydell wrote: >> > On Thu, 16 May 2019 at 13:17, Michael S. Tsirkin <mst@redhat.com> wrote: >> >> >> >> The following changes since commit efb4f3b62c69383a7308d7b739a3193e7c0ccae8: >> >> >> >> Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-05-10 14:49:36 +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 0534d255dae78450d90d59db0f3a9a46b32ebd73: >> >> >> >> tests: acpi: print error unable to dump ACPI table during rebuild (2019-05-14 21:19:14 -0400) >> >> >> >> ---------------------------------------------------------------- >> >> pci, pc, virtio: features, fixes >> >> >> >> reconnect for vhost blk >> >> tests for UEFI >> >> misc other stuff >> >> >> >> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> >> >> >> >> ---------------------------------------------------------------- >> > >> > Hi -- this pullreq has a conflict in default-configs/arm-softmmu.mak >> > because the conversion of arm to Kconfig has landed in master. >> > Could you rebase and fix up to use whatever the Kconfig >> > equivalent of these changes is, please? >> >> Culprit is "hw/acpi: Consolidate build_mcfg to pci.c" >> >> The conflict doesn't look trivial to resolve (to me) so I'd rather see >> it reviewed (by Thomas). I suggest to drop the patch(es) from your PR :( > >Thomas, FYI I did this to resolve the conflict: > >- keep default-configs/arm-softmmu.mak from master: > > git checkout origin/master default-configs/arm-softmmu.mak > >- applied the following !fixup snippet: > >-- >8 -- >--- a/hw/acpi/Kconfig >+++ b/hw/acpi/Kconfig >@@ -25,7 +25,7 @@ config ACPI_NVDIMM > > config ACPI_PCI > bool >- depends on ACPI >+ depends on ACPI && PCI > >--- > >I felt it easier to review on top of "hw/acpi: Improve build modularity" >https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg04718.html > Well, I hope this will not block the merge. I took a look in the change of default-configs/arm-softmmu.mak. The general idea from Thomas is put those hard-coded config to Kconfig. This is fine and what I need to change in my patch is to select ACPI_PCI in the proper place, if my understanding is correct. Two things I need to fix: * add select ACPI_PCI in proper place of hw/arm/Kconfig * add a dummy build_mcfg() for link when ACPI_PCI is not configured. Then I have two questions: * In hw/arm/Kconfig, I don't see one option contains both PCI and ACPI. I am confused where to put the select. * put dummy build_mcfg() in aml-build.c works. Igor, do you like this? Or you haver other preference? >Sadly both series clash :( > >Regards, > >Phil.
On Fri, May 17, 2019 at 10:59:03AM +0800, Wei Yang wrote: >On Thu, May 16, 2019 at 08:53:04PM +0200, Philippe Mathieu-Daudé wrote: >>On Thu, May 16, 2019 at 8:33 PM Philippe Mathieu-Daudé >><philmd@redhat.com> wrote: >>> On 5/16/19 6:04 PM, Peter Maydell wrote: >>> > On Thu, 16 May 2019 at 13:17, Michael S. Tsirkin <mst@redhat.com> wrote: >>> >> >>> >> The following changes since commit efb4f3b62c69383a7308d7b739a3193e7c0ccae8: >>> >> >>> >> Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-05-10 14:49:36 +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 0534d255dae78450d90d59db0f3a9a46b32ebd73: >>> >> >>> >> tests: acpi: print error unable to dump ACPI table during rebuild (2019-05-14 21:19:14 -0400) >>> >> >>> >> ---------------------------------------------------------------- >>> >> pci, pc, virtio: features, fixes >>> >> >>> >> reconnect for vhost blk >>> >> tests for UEFI >>> >> misc other stuff >>> >> >>> >> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> >>> >> >>> >> ---------------------------------------------------------------- >>> > >>> > Hi -- this pullreq has a conflict in default-configs/arm-softmmu.mak >>> > because the conversion of arm to Kconfig has landed in master. >>> > Could you rebase and fix up to use whatever the Kconfig >>> > equivalent of these changes is, please? >>> >>> Culprit is "hw/acpi: Consolidate build_mcfg to pci.c" >>> >>> The conflict doesn't look trivial to resolve (to me) so I'd rather see >>> it reviewed (by Thomas). I suggest to drop the patch(es) from your PR :( >> >>Thomas, FYI I did this to resolve the conflict: >> >>- keep default-configs/arm-softmmu.mak from master: >> >> git checkout origin/master default-configs/arm-softmmu.mak >> >>- applied the following !fixup snippet: >> >>-- >8 -- >>--- a/hw/acpi/Kconfig >>+++ b/hw/acpi/Kconfig >>@@ -25,7 +25,7 @@ config ACPI_NVDIMM >> >> config ACPI_PCI >> bool >>- depends on ACPI >>+ depends on ACPI && PCI >> >>--- >> >>I felt it easier to review on top of "hw/acpi: Improve build modularity" >>https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg04718.html >> > >Well, I hope this will not block the merge. > >I took a look in the change of default-configs/arm-softmmu.mak. The general >idea from Thomas is put those hard-coded config to Kconfig. > >This is fine and what I need to change in my patch is to select ACPI_PCI in >the proper place, if my understanding is correct. > >Two things I need to fix: > > * add select ACPI_PCI in proper place of hw/arm/Kconfig > * add a dummy build_mcfg() for link when ACPI_PCI is not configured. > >Then I have two questions: > > * In hw/arm/Kconfig, I don't see one option contains both PCI and ACPI. I am > confused where to put the select. > * put dummy build_mcfg() in aml-build.c works. Igor, do you like this? Or > you haver other preference? Hmm... put build_mcfg() in aml-build.c seems not work when we config both x86 and arm. e.g. --target-list=x86_64-softmmu,arm-softmmu. Because we only have one aml-build.o object file. What comes into my mind is wrap build_mcfg() with #ifdef CONFIG_ACPI_PCI. Any better idea? > >>Sadly both series clash :( >> >>Regards, >> >>Phil. > >-- >Wei Yang >Help you, Help me
On 5/17/19 3:48 AM, Wei Yang wrote: > On Thu, May 16, 2019 at 08:53:04PM +0200, Philippe Mathieu-Daudé wrote: >> On Thu, May 16, 2019 at 8:33 PM Philippe Mathieu-Daudé >> <philmd@redhat.com> wrote: >>> On 5/16/19 6:04 PM, Peter Maydell wrote: >>>> On Thu, 16 May 2019 at 13:17, Michael S. Tsirkin <mst@redhat.com> wrote: >>>>> >>>>> The following changes since commit efb4f3b62c69383a7308d7b739a3193e7c0ccae8: >>>>> >>>>> Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-05-10 14:49:36 +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 0534d255dae78450d90d59db0f3a9a46b32ebd73: >>>>> >>>>> tests: acpi: print error unable to dump ACPI table during rebuild (2019-05-14 21:19:14 -0400) >>>>> >>>>> ---------------------------------------------------------------- >>>>> pci, pc, virtio: features, fixes >>>>> >>>>> reconnect for vhost blk >>>>> tests for UEFI >>>>> misc other stuff >>>>> >>>>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> >>>>> >>>>> ---------------------------------------------------------------- >>>> >>>> Hi -- this pullreq has a conflict in default-configs/arm-softmmu.mak >>>> because the conversion of arm to Kconfig has landed in master. >>>> Could you rebase and fix up to use whatever the Kconfig >>>> equivalent of these changes is, please? >>> >>> Culprit is "hw/acpi: Consolidate build_mcfg to pci.c" >>> >>> The conflict doesn't look trivial to resolve (to me) so I'd rather see >>> it reviewed (by Thomas). I suggest to drop the patch(es) from your PR :( >> >> Thomas, FYI I did this to resolve the conflict: >> >> - keep default-configs/arm-softmmu.mak from master: >> >> git checkout origin/master default-configs/arm-softmmu.mak >> >> - applied the following !fixup snippet: >> >> -- >8 -- >> --- a/hw/acpi/Kconfig >> +++ b/hw/acpi/Kconfig >> @@ -25,7 +25,7 @@ config ACPI_NVDIMM >> >> config ACPI_PCI >> bool >> - depends on ACPI >> + depends on ACPI && PCI > > Take a look into hw/arm/Kconfig. Only ARM_VIRT selects ACPI, but this one > doesn't select PCI. > > Which option on arm select both? ARM_VIRT -> ACPI ARM_VIRT -> PCI_EXPRESS -> PCI Maybe the correct Kconfig is: config ACPI_PCI bool default y if ACPI && PCI Paolo/Thomas?
On 5/17/19 5:12 AM, Wei Yang wrote: > On Fri, May 17, 2019 at 10:59:03AM +0800, Wei Yang wrote: >> On Thu, May 16, 2019 at 08:53:04PM +0200, Philippe Mathieu-Daudé wrote: >>> On Thu, May 16, 2019 at 8:33 PM Philippe Mathieu-Daudé >>> <philmd@redhat.com> wrote: >>>> On 5/16/19 6:04 PM, Peter Maydell wrote: >>>>> On Thu, 16 May 2019 at 13:17, Michael S. Tsirkin <mst@redhat.com> wrote: >>>>>> >>>>>> The following changes since commit efb4f3b62c69383a7308d7b739a3193e7c0ccae8: >>>>>> >>>>>> Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-05-10 14:49:36 +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 0534d255dae78450d90d59db0f3a9a46b32ebd73: >>>>>> >>>>>> tests: acpi: print error unable to dump ACPI table during rebuild (2019-05-14 21:19:14 -0400) >>>>>> >>>>>> ---------------------------------------------------------------- >>>>>> pci, pc, virtio: features, fixes >>>>>> >>>>>> reconnect for vhost blk >>>>>> tests for UEFI >>>>>> misc other stuff >>>>>> >>>>>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> >>>>>> >>>>>> ---------------------------------------------------------------- >>>>> >>>>> Hi -- this pullreq has a conflict in default-configs/arm-softmmu.mak >>>>> because the conversion of arm to Kconfig has landed in master. >>>>> Could you rebase and fix up to use whatever the Kconfig >>>>> equivalent of these changes is, please? >>>> >>>> Culprit is "hw/acpi: Consolidate build_mcfg to pci.c" >>>> >>>> The conflict doesn't look trivial to resolve (to me) so I'd rather see >>>> it reviewed (by Thomas). I suggest to drop the patch(es) from your PR :( >>> >>> Thomas, FYI I did this to resolve the conflict: >>> >>> - keep default-configs/arm-softmmu.mak from master: >>> >>> git checkout origin/master default-configs/arm-softmmu.mak >>> >>> - applied the following !fixup snippet: >>> >>> -- >8 -- >>> --- a/hw/acpi/Kconfig >>> +++ b/hw/acpi/Kconfig >>> @@ -25,7 +25,7 @@ config ACPI_NVDIMM >>> >>> config ACPI_PCI >>> bool >>> - depends on ACPI >>> + depends on ACPI && PCI >>> >>> --- >>> >>> I felt it easier to review on top of "hw/acpi: Improve build modularity" >>> https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg04718.html >>> >> >> Well, I hope this will not block the merge. >> >> I took a look in the change of default-configs/arm-softmmu.mak. The general >> idea from Thomas is put those hard-coded config to Kconfig. >> >> This is fine and what I need to change in my patch is to select ACPI_PCI in >> the proper place, if my understanding is correct. >> >> Two things I need to fix: >> >> * add select ACPI_PCI in proper place of hw/arm/Kconfig >> * add a dummy build_mcfg() for link when ACPI_PCI is not configured. >> >> Then I have two questions: >> >> * In hw/arm/Kconfig, I don't see one option contains both PCI and ACPI. I am >> confused where to put the select. >> * put dummy build_mcfg() in aml-build.c works. Igor, do you like this? Or >> you haver other preference? > > Hmm... put build_mcfg() in aml-build.c seems not work when we config both x86 > and arm. e.g. --target-list=x86_64-softmmu,arm-softmmu. Because we only have > one aml-build.o object file. I think this is what I tried to fix in "hw/acpi: Improve build modularity" https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg04718.html > > What comes into my mind is wrap build_mcfg() with #ifdef CONFIG_ACPI_PCI. > > Any better idea? > >> >>> Sadly both series clash :( >>> >>> Regards, >>> >>> Phil. >> >> -- >> Wei Yang >> Help you, Help me >
On 17/05/2019 10.12, Philippe Mathieu-Daudé wrote: > On 5/17/19 3:48 AM, Wei Yang wrote: >> On Thu, May 16, 2019 at 08:53:04PM +0200, Philippe Mathieu-Daudé wrote: >>> On Thu, May 16, 2019 at 8:33 PM Philippe Mathieu-Daudé >>> <philmd@redhat.com> wrote: >>>> On 5/16/19 6:04 PM, Peter Maydell wrote: >>>>> On Thu, 16 May 2019 at 13:17, Michael S. Tsirkin <mst@redhat.com> wrote: >>>>>> >>>>>> The following changes since commit efb4f3b62c69383a7308d7b739a3193e7c0ccae8: >>>>>> >>>>>> Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-05-10 14:49:36 +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 0534d255dae78450d90d59db0f3a9a46b32ebd73: >>>>>> >>>>>> tests: acpi: print error unable to dump ACPI table during rebuild (2019-05-14 21:19:14 -0400) >>>>>> >>>>>> ---------------------------------------------------------------- >>>>>> pci, pc, virtio: features, fixes >>>>>> >>>>>> reconnect for vhost blk >>>>>> tests for UEFI >>>>>> misc other stuff >>>>>> >>>>>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> >>>>>> >>>>>> ---------------------------------------------------------------- >>>>> >>>>> Hi -- this pullreq has a conflict in default-configs/arm-softmmu.mak >>>>> because the conversion of arm to Kconfig has landed in master. >>>>> Could you rebase and fix up to use whatever the Kconfig >>>>> equivalent of these changes is, please? >>>> >>>> Culprit is "hw/acpi: Consolidate build_mcfg to pci.c" >>>> >>>> The conflict doesn't look trivial to resolve (to me) so I'd rather see >>>> it reviewed (by Thomas). I suggest to drop the patch(es) from your PR :( >>> >>> Thomas, FYI I did this to resolve the conflict: >>> >>> - keep default-configs/arm-softmmu.mak from master: >>> >>> git checkout origin/master default-configs/arm-softmmu.mak >>> >>> - applied the following !fixup snippet: >>> >>> -- >8 -- >>> --- a/hw/acpi/Kconfig >>> +++ b/hw/acpi/Kconfig >>> @@ -25,7 +25,7 @@ config ACPI_NVDIMM >>> >>> config ACPI_PCI >>> bool >>> - depends on ACPI >>> + depends on ACPI && PCI >> >> Take a look into hw/arm/Kconfig. Only ARM_VIRT selects ACPI, but this one >> doesn't select PCI. >> >> Which option on arm select both? > > ARM_VIRT -> ACPI > ARM_VIRT -> PCI_EXPRESS -> PCI > > Maybe the correct Kconfig is: > > config ACPI_PCI > bool > default y if ACPI && PCI > > Paolo/Thomas? Is it optional for the virt machine? If yes, "default y if ACPI && PCI" is fine. If not, the virt machine should "select ACPI_PCI" explicitly. Thomas
On Fri, May 17, 2019 at 10:14:11AM +0200, Philippe Mathieu-Daudé wrote: >On 5/17/19 5:12 AM, Wei Yang wrote: >> On Fri, May 17, 2019 at 10:59:03AM +0800, Wei Yang wrote: >>> On Thu, May 16, 2019 at 08:53:04PM +0200, Philippe Mathieu-Daudé wrote: >>>> On Thu, May 16, 2019 at 8:33 PM Philippe Mathieu-Daudé >>>> <philmd@redhat.com> wrote: >>>>> On 5/16/19 6:04 PM, Peter Maydell wrote: >>>>>> On Thu, 16 May 2019 at 13:17, Michael S. Tsirkin <mst@redhat.com> wrote: >>>>>>> >>>>>>> The following changes since commit efb4f3b62c69383a7308d7b739a3193e7c0ccae8: >>>>>>> >>>>>>> Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-05-10 14:49:36 +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 0534d255dae78450d90d59db0f3a9a46b32ebd73: >>>>>>> >>>>>>> tests: acpi: print error unable to dump ACPI table during rebuild (2019-05-14 21:19:14 -0400) >>>>>>> >>>>>>> ---------------------------------------------------------------- >>>>>>> pci, pc, virtio: features, fixes >>>>>>> >>>>>>> reconnect for vhost blk >>>>>>> tests for UEFI >>>>>>> misc other stuff >>>>>>> >>>>>>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> >>>>>>> >>>>>>> ---------------------------------------------------------------- >>>>>> >>>>>> Hi -- this pullreq has a conflict in default-configs/arm-softmmu.mak >>>>>> because the conversion of arm to Kconfig has landed in master. >>>>>> Could you rebase and fix up to use whatever the Kconfig >>>>>> equivalent of these changes is, please? >>>>> >>>>> Culprit is "hw/acpi: Consolidate build_mcfg to pci.c" >>>>> >>>>> The conflict doesn't look trivial to resolve (to me) so I'd rather see >>>>> it reviewed (by Thomas). I suggest to drop the patch(es) from your PR :( >>>> >>>> Thomas, FYI I did this to resolve the conflict: >>>> >>>> - keep default-configs/arm-softmmu.mak from master: >>>> >>>> git checkout origin/master default-configs/arm-softmmu.mak >>>> >>>> - applied the following !fixup snippet: >>>> >>>> -- >8 -- >>>> --- a/hw/acpi/Kconfig >>>> +++ b/hw/acpi/Kconfig >>>> @@ -25,7 +25,7 @@ config ACPI_NVDIMM >>>> >>>> config ACPI_PCI >>>> bool >>>> - depends on ACPI >>>> + depends on ACPI && PCI >>>> >>>> --- >>>> >>>> I felt it easier to review on top of "hw/acpi: Improve build modularity" >>>> https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg04718.html >>>> >>> >>> Well, I hope this will not block the merge. >>> >>> I took a look in the change of default-configs/arm-softmmu.mak. The general >>> idea from Thomas is put those hard-coded config to Kconfig. >>> >>> This is fine and what I need to change in my patch is to select ACPI_PCI in >>> the proper place, if my understanding is correct. >>> >>> Two things I need to fix: >>> >>> * add select ACPI_PCI in proper place of hw/arm/Kconfig >>> * add a dummy build_mcfg() for link when ACPI_PCI is not configured. >>> >>> Then I have two questions: >>> >>> * In hw/arm/Kconfig, I don't see one option contains both PCI and ACPI. I am >>> confused where to put the select. >>> * put dummy build_mcfg() in aml-build.c works. Igor, do you like this? Or >>> you haver other preference? >> >> Hmm... put build_mcfg() in aml-build.c seems not work when we config both x86 >> and arm. e.g. --target-list=x86_64-softmmu,arm-softmmu. Because we only have >> one aml-build.o object file. > >I think this is what I tried to fix in "hw/acpi: Improve build modularity" >https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg04718.html > If I am correct, you are trying to add something in stub to fix the "undefined reference" right? >> >> What comes into my mind is wrap build_mcfg() with #ifdef CONFIG_ACPI_PCI. >> >> Any better idea? >> >>> >>>> Sadly both series clash :( >>>> >>>> Regards, >>>> >>>> Phil. >>> >>> -- >>> Wei Yang >>> Help you, Help me >>
On 5/17/19 10:18 AM, Thomas Huth wrote: > On 17/05/2019 10.12, Philippe Mathieu-Daudé wrote: >> On 5/17/19 3:48 AM, Wei Yang wrote: >>> On Thu, May 16, 2019 at 08:53:04PM +0200, Philippe Mathieu-Daudé wrote: >>>> On Thu, May 16, 2019 at 8:33 PM Philippe Mathieu-Daudé >>>> <philmd@redhat.com> wrote: >>>>> On 5/16/19 6:04 PM, Peter Maydell wrote: >>>>>> On Thu, 16 May 2019 at 13:17, Michael S. Tsirkin <mst@redhat.com> wrote: >>>>>>> >>>>>>> The following changes since commit efb4f3b62c69383a7308d7b739a3193e7c0ccae8: >>>>>>> >>>>>>> Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-05-10 14:49:36 +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 0534d255dae78450d90d59db0f3a9a46b32ebd73: >>>>>>> >>>>>>> tests: acpi: print error unable to dump ACPI table during rebuild (2019-05-14 21:19:14 -0400) >>>>>>> >>>>>>> ---------------------------------------------------------------- >>>>>>> pci, pc, virtio: features, fixes >>>>>>> >>>>>>> reconnect for vhost blk >>>>>>> tests for UEFI >>>>>>> misc other stuff >>>>>>> >>>>>>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> >>>>>>> >>>>>>> ---------------------------------------------------------------- >>>>>> >>>>>> Hi -- this pullreq has a conflict in default-configs/arm-softmmu.mak >>>>>> because the conversion of arm to Kconfig has landed in master. >>>>>> Could you rebase and fix up to use whatever the Kconfig >>>>>> equivalent of these changes is, please? >>>>> >>>>> Culprit is "hw/acpi: Consolidate build_mcfg to pci.c" >>>>> >>>>> The conflict doesn't look trivial to resolve (to me) so I'd rather see >>>>> it reviewed (by Thomas). I suggest to drop the patch(es) from your PR :( >>>> >>>> Thomas, FYI I did this to resolve the conflict: >>>> >>>> - keep default-configs/arm-softmmu.mak from master: >>>> >>>> git checkout origin/master default-configs/arm-softmmu.mak >>>> >>>> - applied the following !fixup snippet: >>>> >>>> -- >8 -- >>>> --- a/hw/acpi/Kconfig >>>> +++ b/hw/acpi/Kconfig >>>> @@ -25,7 +25,7 @@ config ACPI_NVDIMM >>>> >>>> config ACPI_PCI >>>> bool >>>> - depends on ACPI >>>> + depends on ACPI && PCI >>> >>> Take a look into hw/arm/Kconfig. Only ARM_VIRT selects ACPI, but this one >>> doesn't select PCI. >>> >>> Which option on arm select both? >> >> ARM_VIRT -> ACPI >> ARM_VIRT -> PCI_EXPRESS -> PCI >> >> Maybe the correct Kconfig is: >> >> config ACPI_PCI >> bool >> default y if ACPI && PCI >> >> Paolo/Thomas? > > Is it optional for the virt machine? If yes, "default y if ACPI && PCI" > is fine. If not, the virt machine should "select ACPI_PCI" explicitly. Yes, you are correct, we need 2 changes: config ARM_VIRT ... select ACPI_PCI config ACPI_PCI bool depends on ACPI && PCI
On Fri, 17 May 2019 10:59:03 +0800 Wei Yang <richardw.yang@linux.intel.com> wrote: > On Thu, May 16, 2019 at 08:53:04PM +0200, Philippe Mathieu-Daudé wrote: > >On Thu, May 16, 2019 at 8:33 PM Philippe Mathieu-Daudé > ><philmd@redhat.com> wrote: > >> On 5/16/19 6:04 PM, Peter Maydell wrote: > >> > On Thu, 16 May 2019 at 13:17, Michael S. Tsirkin <mst@redhat.com> wrote: > >> >> > >> >> The following changes since commit efb4f3b62c69383a7308d7b739a3193e7c0ccae8: > >> >> > >> >> Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-05-10 14:49:36 +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 0534d255dae78450d90d59db0f3a9a46b32ebd73: > >> >> > >> >> tests: acpi: print error unable to dump ACPI table during rebuild (2019-05-14 21:19:14 -0400) > >> >> > >> >> ---------------------------------------------------------------- > >> >> pci, pc, virtio: features, fixes > >> >> > >> >> reconnect for vhost blk > >> >> tests for UEFI > >> >> misc other stuff > >> >> > >> >> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > >> >> > >> >> ---------------------------------------------------------------- > >> > > >> > Hi -- this pullreq has a conflict in default-configs/arm-softmmu.mak > >> > because the conversion of arm to Kconfig has landed in master. > >> > Could you rebase and fix up to use whatever the Kconfig > >> > equivalent of these changes is, please? > >> > >> Culprit is "hw/acpi: Consolidate build_mcfg to pci.c" > >> > >> The conflict doesn't look trivial to resolve (to me) so I'd rather see > >> it reviewed (by Thomas). I suggest to drop the patch(es) from your PR :( > > > >Thomas, FYI I did this to resolve the conflict: > > > >- keep default-configs/arm-softmmu.mak from master: > > > > git checkout origin/master default-configs/arm-softmmu.mak > > > >- applied the following !fixup snippet: > > > >-- >8 -- > >--- a/hw/acpi/Kconfig > >+++ b/hw/acpi/Kconfig > >@@ -25,7 +25,7 @@ config ACPI_NVDIMM > > > > config ACPI_PCI > > bool > >- depends on ACPI > >+ depends on ACPI && PCI > > > >--- > > > >I felt it easier to review on top of "hw/acpi: Improve build modularity" > >https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg04718.html > > > > Well, I hope this will not block the merge. > > I took a look in the change of default-configs/arm-softmmu.mak. The general > idea from Thomas is put those hard-coded config to Kconfig. > > This is fine and what I need to change in my patch is to select ACPI_PCI in > the proper place, if my understanding is correct. > > Two things I need to fix: > > * add select ACPI_PCI in proper place of hw/arm/Kconfig > * add a dummy build_mcfg() for link when ACPI_PCI is not configured. > > Then I have two questions: > > * In hw/arm/Kconfig, I don't see one option contains both PCI and ACPI. I am > confused where to put the select. > * put dummy build_mcfg() in aml-build.c works. Igor, do you like this? Or > you haver other preference? could you point out why we need dummy build_mcfg(), in the first place? > > >Sadly both series clash :( > > > >Regards, > > > >Phil. >
On Fri, May 17, 2019 at 01:13:15PM +0200, Igor Mammedov wrote: >On Fri, 17 May 2019 10:59:03 +0800 >Wei Yang <richardw.yang@linux.intel.com> wrote: > [..] >> >> Well, I hope this will not block the merge. >> >> I took a look in the change of default-configs/arm-softmmu.mak. The general >> idea from Thomas is put those hard-coded config to Kconfig. >> >> This is fine and what I need to change in my patch is to select ACPI_PCI in >> the proper place, if my understanding is correct. >> >> Two things I need to fix: >> >> * add select ACPI_PCI in proper place of hw/arm/Kconfig >> * add a dummy build_mcfg() for link when ACPI_PCI is not configured. >> >> Then I have two questions: >> >> * In hw/arm/Kconfig, I don't see one option contains both PCI and ACPI. I am >> confused where to put the select. >> * put dummy build_mcfg() in aml-build.c works. Igor, do you like this? Or >> you haver other preference? > >could you point out why we need dummy build_mcfg(), in the first place? > I may made a misunderstanding about hw/arm/Kconfig in recent upstream change. I thought there would be no configuration to choose both ACPI and PCI at the same time, which leads to build_mcfg() will not be compiled. While seems Philip decides to select ACPI_PCI for ARM_VIRT. >> >> >Sadly both series clash :( >> > >> >Regards, >> > >> >Phil. >>
On Thu, May 16, 2019 at 05:04:42PM +0100, Peter Maydell wrote: > On Thu, 16 May 2019 at 13:17, Michael S. Tsirkin <mst@redhat.com> wrote: > > > > The following changes since commit efb4f3b62c69383a7308d7b739a3193e7c0ccae8: > > > > Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-05-10 14:49:36 +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 0534d255dae78450d90d59db0f3a9a46b32ebd73: > > > > tests: acpi: print error unable to dump ACPI table during rebuild (2019-05-14 21:19:14 -0400) > > > > ---------------------------------------------------------------- > > pci, pc, virtio: features, fixes > > > > reconnect for vhost blk > > tests for UEFI > > misc other stuff > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > > > ---------------------------------------------------------------- > > Hi -- this pullreq has a conflict in default-configs/arm-softmmu.mak > because the conversion of arm to Kconfig has landed in master. > Could you rebase and fix up to use whatever the Kconfig > equivalent of these changes is, please? > > thanks > -- PMM Rebased and dropped the conflicting patch. Pls re-pull.
On Thu, May 16, 2019 at 08:33:13PM +0200, Philippe Mathieu-Daudé wrote: > On 5/16/19 6:04 PM, Peter Maydell wrote: > > On Thu, 16 May 2019 at 13:17, Michael S. Tsirkin <mst@redhat.com> wrote: > >> > >> The following changes since commit efb4f3b62c69383a7308d7b739a3193e7c0ccae8: > >> > >> Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-05-10 14:49:36 +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 0534d255dae78450d90d59db0f3a9a46b32ebd73: > >> > >> tests: acpi: print error unable to dump ACPI table during rebuild (2019-05-14 21:19:14 -0400) > >> > >> ---------------------------------------------------------------- > >> pci, pc, virtio: features, fixes > >> > >> reconnect for vhost blk > >> tests for UEFI > >> misc other stuff > >> > >> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > >> > >> ---------------------------------------------------------------- > > > > Hi -- this pullreq has a conflict in default-configs/arm-softmmu.mak > > because the conversion of arm to Kconfig has landed in master. > > Could you rebase and fix up to use whatever the Kconfig > > equivalent of these changes is, please? > > Culprit is "hw/acpi: Consolidate build_mcfg to pci.c" > > The conflict doesn't look trivial to resolve (to me) so I'd rather see > it reviewed (by Thomas). I suggest to drop the patch(es) from your PR :( > > Regards, > > Phil. Yea, that's what I did.
The following changes since commit efb4f3b62c69383a7308d7b739a3193e7c0ccae8: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-05-10 14:49:36 +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 0534d255dae78450d90d59db0f3a9a46b32ebd73: tests: acpi: print error unable to dump ACPI table during rebuild (2019-05-14 21:19:14 -0400) ---------------------------------------------------------------- pci, pc, virtio: features, fixes reconnect for vhost blk tests for UEFI misc other stuff Signed-off-by: Michael S. Tsirkin <mst@redhat.com> ---------------------------------------------------------------- Dan Streetman (1): do not call vhost_net_cleanup() on running net from char user event Daniel P. Berrangé (2): hw: report invalid disable-legacy|modern usage for virtio-1-only devs Revert "globals: Allow global properties to be optional" David Gibson (2): pcie: Remove redundant test in pcie_mmcfg_data_{read,write}() pci: Simplify pci_bus_is_root() Igor Mammedov (16): q35: acpi: do not create dummy MCFG table tests: acpi: rename acpi_parse_rsdp_table() into acpi_fetch_rsdp_table() tests: acpi: make acpi_fetch_table() take size of fetched table pointer tests: acpi: make RSDT test routine handle XSDT tests: acpi: make pointer to RSDP 64bit tests: acpi: fetch X_DSDT if pointer to DSDT is 0 tests: acpi: skip FACS table if board uses hw reduced ACPI profile tests: acpi: move boot_sector_init() into x86 tests branch tests: acpi: add acpi_find_rsdp_address_uefi() helper tests: acpi: add a way to start tests with UEFI firmware tests: acpi: ignore SMBIOS tests when UEFI firmware is used tests: acpi: allow to override default accelerator tests: add expected ACPI tables for arm/virt board tests: acpi: add simple arm/virt testcase tests: acpi: refactor rebuild-expected-aml.sh to dump ACPI tables for a specified list of targets tests: acpi: print error unable to dump ACPI table during rebuild Li Feng (1): libvhost-user: fix bad vu_log_write Marc-André Lureau (1): docs: reST-ify vhost-user documentation Markus Armbruster (3): acpi/piix4: Convert debug printf()s to trace events acpi/pcihp: Convert debug printf()s to trace events acpi/pcihp: Add a few more trace points related to unplug Wei Yang (4): hw/arm/virt-acpi-build: remove unnecessary variable mcfg_start i386, acpi: remove mcfg_ prefix in AcpiMcfgInfo members hw/arm/virt-acpi-build: pass AcpiMcfgInfo to build_mcfg() hw/acpi: Consolidate build_mcfg to pci.c Xie Yongji (7): virtio: Introduce started flag to VirtioDevice virtio: Use started flag in virtio_vmstate_change() vhost-user-blk: Use started flag in vhost_user_blk_set_status() vhost-user-blk: Only start vhost-user backend with the first kick vhost-user-blk: Add return value for vhost_user_blk_start() vhost-user-blk: Add support to reconnect backend contrib/vhost-user-blk: enable inflight I/O tracking docs/interop/vhost-user.txt | 1219 ---------------------------- default-configs/arm-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 1 + hw/virtio/virtio-pci.h | 31 +- include/hw/acpi/pci.h | 34 + include/hw/pci/pci.h | 1 - include/hw/pci/pci_bus.h | 12 +- include/hw/qdev-core.h | 3 - include/hw/virtio/vhost-user-blk.h | 3 + include/hw/virtio/virtio.h | 2 + tests/acpi-utils.h | 7 +- contrib/libvhost-user/libvhost-user.c | 2 +- contrib/vhost-user-blk/vhost-user-blk.c | 3 +- hw/acpi/pci.c | 46 ++ hw/acpi/pcihp.c | 32 +- hw/acpi/piix4.c | 14 +- hw/arm/virt-acpi-build.c | 31 +- hw/block/vhost-user-blk.c | 175 +++- hw/core/machine.c | 23 +- hw/display/virtio-gpu-pci.c | 4 +- hw/display/virtio-vga.c | 4 +- hw/i386/acpi-build.c | 44 +- hw/pci-bridge/pci_expander_bridge.c | 6 - hw/pci/pci.c | 14 +- hw/pci/pcie_host.c | 10 - hw/virtio/virtio-crypto-pci.c | 4 +- hw/virtio/virtio-input-pci.c | 4 +- hw/virtio/virtio-pci.c | 27 +- hw/virtio/virtio.c | 54 +- net/vhost-user.c | 1 - qom/object.c | 3 - tests/acpi-utils.c | 68 +- tests/bios-tables-test.c | 146 +++- tests/vmgenid-test.c | 6 +- MAINTAINERS | 2 +- docs/interop/index.rst | 2 +- docs/interop/vhost-user.rst | 1351 +++++++++++++++++++++++++++++++ hw/acpi/Kconfig | 4 + hw/acpi/Makefile.objs | 1 + hw/acpi/trace-events | 16 + tests/Makefile.include | 1 + tests/data/acpi/rebuild-expected-aml.sh | 23 +- tests/data/acpi/virt/APIC | Bin 0 -> 168 bytes tests/data/acpi/virt/DSDT | Bin 0 -> 18476 bytes tests/data/acpi/virt/FACP | Bin 0 -> 268 bytes tests/data/acpi/virt/GTDT | Bin 0 -> 96 bytes tests/data/acpi/virt/MCFG | Bin 0 -> 60 bytes tests/data/acpi/virt/SPCR | Bin 0 -> 80 bytes 48 files changed, 1956 insertions(+), 1479 deletions(-) delete mode 100644 docs/interop/vhost-user.txt create mode 100644 include/hw/acpi/pci.h create mode 100644 hw/acpi/pci.c create mode 100644 docs/interop/vhost-user.rst create mode 100644 tests/data/acpi/virt/APIC create mode 100644 tests/data/acpi/virt/DSDT create mode 100644 tests/data/acpi/virt/FACP create mode 100644 tests/data/acpi/virt/GTDT create mode 100644 tests/data/acpi/virt/MCFG create mode 100644 tests/data/acpi/virt/SPCR