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

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
>
>---
>
>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.

-- 
Wei Yang
Help you, Help me

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

-- 
Wei Yang
Help you, Help me

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 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
>> 

-- 
Wei Yang
Help you, Help me

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.
>> 

-- 
Wei Yang
Help you, Help me

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.

-- 
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 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 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 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.

-- 
MST

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.

-- 
MST