[Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups

Michael S. Tsirkin posted 25 patches 6 years, 4 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
docs/interop/vhost-user.txt         |  37 +++++++--
hw/smbios/smbios_build.h            |  12 +++
include/hw/i386/x86-iommu.h         |   1 -
include/hw/pci-host/xilinx-pcie.h   |   2 +-
include/hw/pci/pci.h                |  39 +++++----
include/hw/pci/pci_bridge.h         |  48 +++++++++++
include/hw/pci/pci_bus.h            |  51 +-----------
include/hw/qdev-properties.h        |   9 +++
include/hw/smbios/smbios.h          |   6 ++
include/hw/xen/xen_common.h         |   8 +-
hw/acpi/pcihp.c                     |   4 +-
hw/acpi/piix4.c                     |   7 +-
hw/acpi/vmgenid.c                   |  30 ++-----
hw/alpha/typhoon.c                  |   8 +-
hw/block/nvme.c                     |  32 ++++----
hw/core/qdev-properties.c           |  61 ++++++++++++++
hw/i2c/pm_smbus.c                   |  16 +++-
hw/i386/intel_iommu.c               |  12 +--
hw/i386/pc_piix.c                   |   8 +-
hw/i386/xen/xen_platform.c          |  12 +--
hw/isa/lpc_ich9.c                   |  10 +--
hw/mips/gt64xxx_pci.c               |  12 +--
hw/misc/vmcoreinfo.c                |   3 +
hw/net/vmxnet3.c                    |   2 +-
hw/pci-bridge/pci_expander_bridge.c |  21 ++---
hw/pci-host/apb.c                   |  10 +--
hw/pci-host/bonito.c                |   8 +-
hw/pci-host/gpex.c                  |   6 +-
hw/pci-host/grackle.c               |  14 ++--
hw/pci-host/piix.c                  |  59 +++++++-------
hw/pci-host/ppce500.c               |   6 +-
hw/pci-host/prep.c                  |   4 +-
hw/pci-host/q35.c                   |   7 +-
hw/pci-host/uninorth.c              |  24 +++---
hw/pci-host/versatile.c             |   8 +-
hw/pci-host/xilinx-pcie.c           |  27 +++----
hw/pci/pci.c                        | 155 +++++++++++++++---------------------
hw/pci/pci_bridge.c                 |   6 +-
hw/pci/pcie.c                       |   5 +-
hw/pci/pcie_aer.c                   |   4 +-
hw/ppc/ppc4xx_pci.c                 |   6 +-
hw/ppc/spapr_pci.c                  |  10 +--
hw/s390x/s390-pci-bus.c             |  18 ++---
hw/scsi/megasas.c                   |   2 +-
hw/scsi/mptsas.c                    |   2 +-
hw/scsi/vmw_pvscsi.c                |   2 +-
hw/sh4/sh_pci.c                     |  12 +--
hw/smbios/smbios.c                  |  72 +++++++++++++++++
hw/usb/hcd-xhci.c                   |   2 +-
hw/vfio/pci.c                       |  10 +--
hw/virtio/virtio-pci.c              |  12 +--
hw/virtio/virtio.c                  |   2 +-
hw/xen/xen_pt.c                     |  10 +--
tests/pxe-test.c                    |  99 +++++++++++++++++------
tests/virtio-blk-test.c             |  25 ++++++
scripts/dump-guest-memory.py        |   3 +-
56 files changed, 663 insertions(+), 418 deletions(-)
[Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Michael S. Tsirkin 6 years, 4 months ago
The following changes since commit 2babfe0c9241c239272a03fec785165a50e8288c:

  Update version for v2.11.0-rc4 release (2017-12-05 16:36:46 +0000)

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 664ed92706ff6e66fa278c3163b5387f11d6daca:

  smbus: do not immediately complete commands (2017-12-21 16:24:44 +0200)

----------------------------------------------------------------
pc, pci, virtio: features, fixes, cleanups

A bunch of fixes, cleanus and new features all over the place.

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

----------------------------------------------------------------
Daniel P. Berrange (1):
      smbios: support setting OEM strings table

David Gibson (9):
      pci: Rename root bus initialization functions for clarity
      pci: Move bridge data structures from pci_bus.h to pci_bridge.h
      pci: Add pci_dev_bus_num() helper
      pci: Eliminate redundant PCIDevice::bus pointer
      pci: Eliminate pci_find_primary_bus()
      tests/pxe-test: Remove unnecessary special case test functions
      tests/pxe-test: Use table of testcases rather than open-coding
      tests/pxe-test: Test net booting over IPv6 in some cases
      tests/pxe-test: Add some extra tests

Hervé Poussineau (1):
      smbus: do not immediately complete commands

Ladi Prosek (1):
      virtio-pci: Don't force Subsystem Vendor ID = Vendor ID

Marc-André Lureau (1):
      dump-guest-memory.py: fix "You can't do that without a process to debug"

Michael S. Tsirkin (1):
      virtio_error: don't invoke status callbacks

Peter Xu (2):
      intel_iommu: remove X86_IOMMU_PCI_DEVFN_MAX
      intel_iommu: fix error param in string

Philippe Mathieu-Daudé (4):
      hw/block/nvme: QOM'ify PCI NVME
      hw/pci-host/piix: QOM'ify the IGD Passthrough host bridge
      hw/pci-host/xilinx: QOM'ify the AXI-PCIe host bridge
      hw/pci: remove obsolete PCIDevice->init()

Prasad J Pandit (1):
      tests: add test to check VirtQueue object

Roman Kagan (2):
      qdev-properties: add UUID property type
      vmgenid: use UUID property type

Stefan Hajnoczi (2):
      vhost-user: fix indentation in protocol specification
      vhost-user: document memory accesses

 docs/interop/vhost-user.txt         |  37 +++++++--
 hw/smbios/smbios_build.h            |  12 +++
 include/hw/i386/x86-iommu.h         |   1 -
 include/hw/pci-host/xilinx-pcie.h   |   2 +-
 include/hw/pci/pci.h                |  39 +++++----
 include/hw/pci/pci_bridge.h         |  48 +++++++++++
 include/hw/pci/pci_bus.h            |  51 +-----------
 include/hw/qdev-properties.h        |   9 +++
 include/hw/smbios/smbios.h          |   6 ++
 include/hw/xen/xen_common.h         |   8 +-
 hw/acpi/pcihp.c                     |   4 +-
 hw/acpi/piix4.c                     |   7 +-
 hw/acpi/vmgenid.c                   |  30 ++-----
 hw/alpha/typhoon.c                  |   8 +-
 hw/block/nvme.c                     |  32 ++++----
 hw/core/qdev-properties.c           |  61 ++++++++++++++
 hw/i2c/pm_smbus.c                   |  16 +++-
 hw/i386/intel_iommu.c               |  12 +--
 hw/i386/pc_piix.c                   |   8 +-
 hw/i386/xen/xen_platform.c          |  12 +--
 hw/isa/lpc_ich9.c                   |  10 +--
 hw/mips/gt64xxx_pci.c               |  12 +--
 hw/misc/vmcoreinfo.c                |   3 +
 hw/net/vmxnet3.c                    |   2 +-
 hw/pci-bridge/pci_expander_bridge.c |  21 ++---
 hw/pci-host/apb.c                   |  10 +--
 hw/pci-host/bonito.c                |   8 +-
 hw/pci-host/gpex.c                  |   6 +-
 hw/pci-host/grackle.c               |  14 ++--
 hw/pci-host/piix.c                  |  59 +++++++-------
 hw/pci-host/ppce500.c               |   6 +-
 hw/pci-host/prep.c                  |   4 +-
 hw/pci-host/q35.c                   |   7 +-
 hw/pci-host/uninorth.c              |  24 +++---
 hw/pci-host/versatile.c             |   8 +-
 hw/pci-host/xilinx-pcie.c           |  27 +++----
 hw/pci/pci.c                        | 155 +++++++++++++++---------------------
 hw/pci/pci_bridge.c                 |   6 +-
 hw/pci/pcie.c                       |   5 +-
 hw/pci/pcie_aer.c                   |   4 +-
 hw/ppc/ppc4xx_pci.c                 |   6 +-
 hw/ppc/spapr_pci.c                  |  10 +--
 hw/s390x/s390-pci-bus.c             |  18 ++---
 hw/scsi/megasas.c                   |   2 +-
 hw/scsi/mptsas.c                    |   2 +-
 hw/scsi/vmw_pvscsi.c                |   2 +-
 hw/sh4/sh_pci.c                     |  12 +--
 hw/smbios/smbios.c                  |  72 +++++++++++++++++
 hw/usb/hcd-xhci.c                   |   2 +-
 hw/vfio/pci.c                       |  10 +--
 hw/virtio/virtio-pci.c              |  12 +--
 hw/virtio/virtio.c                  |   2 +-
 hw/xen/xen_pt.c                     |  10 +--
 tests/pxe-test.c                    |  99 +++++++++++++++++------
 tests/virtio-blk-test.c             |  25 ++++++
 scripts/dump-guest-memory.py        |   3 +-
 56 files changed, 663 insertions(+), 418 deletions(-)


Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Peter Maydell 6 years, 4 months ago
On 21 December 2017 at 14:27, Michael S. Tsirkin <mst@redhat.com> wrote:
> The following changes since commit 2babfe0c9241c239272a03fec785165a50e8288c:
>
>   Update version for v2.11.0-rc4 release (2017-12-05 16:36:46 +0000)
>
> 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 664ed92706ff6e66fa278c3163b5387f11d6daca:
>
>   smbus: do not immediately complete commands (2017-12-21 16:24:44 +0200)
>
> ----------------------------------------------------------------
> pc, pci, virtio: features, fixes, cleanups
>
> A bunch of fixes, cleanus and new features all over the place.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>

Conflicts in hw/block/nvme.c -- can you fix and resend, please?

thanks
-- PMM

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Michael S. Tsirkin 6 years, 4 months ago
On Thu, Dec 21, 2017 at 08:26:47PM +0000, Peter Maydell wrote:
> On 21 December 2017 at 14:27, Michael S. Tsirkin <mst@redhat.com> wrote:
> > The following changes since commit 2babfe0c9241c239272a03fec785165a50e8288c:
> >
> >   Update version for v2.11.0-rc4 release (2017-12-05 16:36:46 +0000)
> >
> > 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 664ed92706ff6e66fa278c3163b5387f11d6daca:
> >
> >   smbus: do not immediately complete commands (2017-12-21 16:24:44 +0200)
> >
> > ----------------------------------------------------------------
> > pc, pci, virtio: features, fixes, cleanups
> >
> > A bunch of fixes, cleanus and new features all over the place.
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> >
> 
> Conflicts in hw/block/nvme.c -- can you fix and resend, please?
> 
> thanks
> -- PMM

Done and pushed - I dropped the conflicting patch.

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Peter Maydell 6 years, 4 months ago
On 21 December 2017 at 20:37, Michael S. Tsirkin <mst@redhat.com> wrote:
> Done and pushed - I dropped the conflicting patch.

Have you also dropped the other one Philippe says depends on it?

thanks
-- PMM

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Michael S. Tsirkin 6 years, 4 months ago
On Thu, Dec 21, 2017 at 11:05:01PM +0000, Peter Maydell wrote:
> On 21 December 2017 at 20:37, Michael S. Tsirkin <mst@redhat.com> wrote:
> > Done and pushed - I dropped the conflicting patch.
> 
> Have you also dropped the other one Philippe says depends on it?
> 
> thanks
> -- PMM

I did now

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Philippe Mathieu-Daudé 6 years, 4 months ago
>> > Done and pushed - I dropped the conflicting patch.
>>
>> Have you also dropped the other one Philippe says depends on it?

Now than I could take time to check, dropping this single patch was
correct and inoffensive, since conflicting patch from Mao Zhongyi is
doing exactly the same change (e01d6a415be).

But better safe than sorry :) I'll resend the "remove obsolete
PCIDevice->init()" patch later to you Michael since it makes more sens
it enters thru the PCI tree than the Block tree.

Sorry again for any trouble caused,

Phil.

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Philippe Mathieu-Daudé 6 years, 4 months ago
Hi Peter, Michael,

On Thu, Dec 21, 2017 at 5:37 PM, Michael S. Tsirkin <mst@redhat.com> wrote:
> On Thu, Dec 21, 2017 at 08:26:47PM +0000, Peter Maydell wrote:
>> On 21 December 2017 at 14:27, Michael S. Tsirkin <mst@redhat.com> wrote:
>> > The following changes since commit 2babfe0c9241c239272a03fec785165a50e8288c:
>> >
>> >   Update version for v2.11.0-rc4 release (2017-12-05 16:36:46 +0000)
>> >
>> > 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 664ed92706ff6e66fa278c3163b5387f11d6daca:
>> >
>> >   smbus: do not immediately complete commands (2017-12-21 16:24:44 +0200)
>> >
>> > ----------------------------------------------------------------
>> > pc, pci, virtio: features, fixes, cleanups
>> >
>> > A bunch of fixes, cleanus and new features all over the place.
>> >
>> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>> >
>>
>> Conflicts in hw/block/nvme.c -- can you fix and resend, please?
>>
> Done and pushed - I dropped the conflicting patch.

NACK :(

you also need to drop "hw/pci: remove obsolete PCIDevice->init()"
(applied in your tree as 18951fce55d5aa58cd1629b4cb704ee51bab4420)
else the not-yet-QOM'ified NVME won't work anymore.

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Michael S. Tsirkin 6 years, 4 months ago
On Thu, Dec 21, 2017 at 08:05:51PM -0300, Philippe Mathieu-Daudé wrote:
> Hi Peter, Michael,
> 
> On Thu, Dec 21, 2017 at 5:37 PM, Michael S. Tsirkin <mst@redhat.com> wrote:
> > On Thu, Dec 21, 2017 at 08:26:47PM +0000, Peter Maydell wrote:
> >> On 21 December 2017 at 14:27, Michael S. Tsirkin <mst@redhat.com> wrote:
> >> > The following changes since commit 2babfe0c9241c239272a03fec785165a50e8288c:
> >> >
> >> >   Update version for v2.11.0-rc4 release (2017-12-05 16:36:46 +0000)
> >> >
> >> > 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 664ed92706ff6e66fa278c3163b5387f11d6daca:
> >> >
> >> >   smbus: do not immediately complete commands (2017-12-21 16:24:44 +0200)
> >> >
> >> > ----------------------------------------------------------------
> >> > pc, pci, virtio: features, fixes, cleanups
> >> >
> >> > A bunch of fixes, cleanus and new features all over the place.
> >> >
> >> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> >> >
> >>
> >> Conflicts in hw/block/nvme.c -- can you fix and resend, please?
> >>
> > Done and pushed - I dropped the conflicting patch.
> 
> NACK :(
> 
> you also need to drop "hw/pci: remove obsolete PCIDevice->init()"
> (applied in your tree as 18951fce55d5aa58cd1629b4cb704ee51bab4420)
> else the not-yet-QOM'ified NVME won't work anymore.

Done that too, thanks a lot

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Peter Maydell 6 years, 3 months ago
On 21 December 2017 at 23:43, Michael S. Tsirkin <mst@redhat.com> wrote:
>> you also need to drop "hw/pci: remove obsolete PCIDevice->init()"
>> (applied in your tree as 18951fce55d5aa58cd1629b4cb704ee51bab4420)
>> else the not-yet-QOM'ified NVME won't work anymore.
>
> Done that too, thanks a lot

Hi. I'm afraid this pullreq (merge of 880b1ff) has new runtime
errors from the clang sanitizer:

/home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
runtime error: member access within misaligned address 0x55b4ffee8246
for type 'struct ip_header', which requires 4 byte alignment
0x55b4ffee8246: note: pointer points here
 01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
ff ff 00 00 00 00 00 00  00 00
             ^
/home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
runtime error: load of misaligned address 0x55b4ffee8246 for type
'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
0x55b4ffee8246: note: pointer points here
 01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
ff ff 00 00 00 00 00 00  00 00
             ^
/home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:208:65:
runtime error: member access within misaligned address 0x55b4ffee8246
for type 'struct ip_header', which requires 4 byte alignment
0x55b4ffee8246: note: pointer points here
 01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
ff ff 00 00 00 00 00 00  00 00
             ^
/home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
runtime error: member access within misaligned address 0x55b4ffee8246
for type 'struct ip_header', which requires 4 byte alignment
0x55b4ffee8246: note: pointer points here
 01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
ff ff 00 00 00 00 00 00  00 00
             ^
/home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
runtime error: load of misaligned address 0x55b4ffee8246 for type
'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
0x55b4ffee8246: note: pointer points here
 01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
ff ff 00 00 00 00 00 00  00 00
             ^

Sorry for the late report, I didn't quite have time
to process the pull before Christmas holidays.

thanks
-- PMM

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Michael S. Tsirkin 6 years, 3 months ago
On Mon, Jan 08, 2018 at 09:14:41AM +0000, Peter Maydell wrote:
> On 21 December 2017 at 23:43, Michael S. Tsirkin <mst@redhat.com> wrote:
> >> you also need to drop "hw/pci: remove obsolete PCIDevice->init()"
> >> (applied in your tree as 18951fce55d5aa58cd1629b4cb704ee51bab4420)
> >> else the not-yet-QOM'ified NVME won't work anymore.
> >
> > Done that too, thanks a lot
> 
> Hi. I'm afraid this pullreq (merge of 880b1ff) has new runtime
> errors from the clang sanitizer:
> 
> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
> runtime error: member access within misaligned address 0x55b4ffee8246
> for type 'struct ip_header', which requires 4 byte alignment
> 0x55b4ffee8246: note: pointer points here
>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> ff ff 00 00 00 00 00 00  00 00
>              ^
> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
> runtime error: load of misaligned address 0x55b4ffee8246 for type
> 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
> 0x55b4ffee8246: note: pointer points here
>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> ff ff 00 00 00 00 00 00  00 00
>              ^
> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:208:65:
> runtime error: member access within misaligned address 0x55b4ffee8246
> for type 'struct ip_header', which requires 4 byte alignment
> 0x55b4ffee8246: note: pointer points here
>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> ff ff 00 00 00 00 00 00  00 00
>              ^
> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
> runtime error: member access within misaligned address 0x55b4ffee8246
> for type 'struct ip_header', which requires 4 byte alignment
> 0x55b4ffee8246: note: pointer points here
>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> ff ff 00 00 00 00 00 00  00 00
>              ^
> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
> runtime error: load of misaligned address 0x55b4ffee8246 for type
> 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
> 0x55b4ffee8246: note: pointer points here
>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> ff ff 00 00 00 00 00 00  00 00
>              ^
> 
> Sorry for the late report, I didn't quite have time
> to process the pull before Christmas holidays.
> 
> thanks
> -- PMM


Hard to see how my pull could be doing this, but I'll try to bisect.

BTW clang build prints lots of error around alignment for me.

-- 
MST

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Michael S. Tsirkin 6 years, 3 months ago
On Mon, Jan 08, 2018 at 09:14:41AM +0000, Peter Maydell wrote:
> On 21 December 2017 at 23:43, Michael S. Tsirkin <mst@redhat.com> wrote:
> >> you also need to drop "hw/pci: remove obsolete PCIDevice->init()"
> >> (applied in your tree as 18951fce55d5aa58cd1629b4cb704ee51bab4420)
> >> else the not-yet-QOM'ified NVME won't work anymore.
> >
> > Done that too, thanks a lot
> 
> Hi. I'm afraid this pullreq (merge of 880b1ff) has new runtime
> errors from the clang sanitizer:
> 
> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
> runtime error: member access within misaligned address 0x55b4ffee8246
> for type 'struct ip_header', which requires 4 byte alignment
> 0x55b4ffee8246: note: pointer points here
>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> ff ff 00 00 00 00 00 00  00 00
>              ^
> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
> runtime error: load of misaligned address 0x55b4ffee8246 for type
> 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
> 0x55b4ffee8246: note: pointer points here
>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> ff ff 00 00 00 00 00 00  00 00
>              ^
> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:208:65:
> runtime error: member access within misaligned address 0x55b4ffee8246
> for type 'struct ip_header', which requires 4 byte alignment
> 0x55b4ffee8246: note: pointer points here
>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> ff ff 00 00 00 00 00 00  00 00
>              ^
> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
> runtime error: member access within misaligned address 0x55b4ffee8246
> for type 'struct ip_header', which requires 4 byte alignment
> 0x55b4ffee8246: note: pointer points here
>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> ff ff 00 00 00 00 00 00  00 00
>              ^
> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
> runtime error: load of misaligned address 0x55b4ffee8246 for type
> 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
> 0x55b4ffee8246: note: pointer points here
>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> ff ff 00 00 00 00 00 00  00 00
>              ^
> 
> Sorry for the late report, I didn't quite have time
> to process the pull before Christmas holidays.
> 
> thanks
> -- PMM

So I bisected and the reason is this commit:

commit 18b20bb43a2f37f0c8ae23a3e9b3d9a4a05b6bd4
Author: David Gibson <david@gibson.dropbear.id.au>
Date:   Tue Dec 19 15:45:22 2017 +1100

    tests/pxe-test: Add some extra tests
    
    Previously virtio-net was only tested for ppc64 in "slow" mode.  That
    doesn't make much sense since virtio-net is used much more often in
    practice than the spapr-vlan device which was tested always.  So, move
    virtio-net to always be tested on ppc64.
    
    We had no tests at all for the q35 machine, which doesn't seem wise
    given its increasing prominence.  Add a couple of tests for it,
    including testing the newer e1000e adapter.
    
    Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
    Reviewed-by: Thomas Huth <thuth@redhat.com>
    Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

:040000 040000 5a982bfea24b9ac3c651b84425a39b3c85f4871e 771af3fdfb2778c6d6ed6b1098d1e79c181d6fb0 M      tests

Pls either fix or drop e1000e test


-- 
MST

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by David Gibson 6 years, 3 months ago
On Mon, Jan 08, 2018 at 08:10:23PM +0200, Michael S. Tsirkin wrote:
> On Mon, Jan 08, 2018 at 09:14:41AM +0000, Peter Maydell wrote:
> > On 21 December 2017 at 23:43, Michael S. Tsirkin <mst@redhat.com> wrote:
> > >> you also need to drop "hw/pci: remove obsolete PCIDevice->init()"
> > >> (applied in your tree as 18951fce55d5aa58cd1629b4cb704ee51bab4420)
> > >> else the not-yet-QOM'ified NVME won't work anymore.
> > >
> > > Done that too, thanks a lot
> > 
> > Hi. I'm afraid this pullreq (merge of 880b1ff) has new runtime
> > errors from the clang sanitizer:
> > 
> > /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
> > runtime error: member access within misaligned address 0x55b4ffee8246
> > for type 'struct ip_header', which requires 4 byte alignment
> > 0x55b4ffee8246: note: pointer points here
> >  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> > ff ff 00 00 00 00 00 00  00 00
> >              ^
> > /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
> > runtime error: load of misaligned address 0x55b4ffee8246 for type
> > 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
> > 0x55b4ffee8246: note: pointer points here
> >  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> > ff ff 00 00 00 00 00 00  00 00
> >              ^
> > /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:208:65:
> > runtime error: member access within misaligned address 0x55b4ffee8246
> > for type 'struct ip_header', which requires 4 byte alignment
> > 0x55b4ffee8246: note: pointer points here
> >  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> > ff ff 00 00 00 00 00 00  00 00
> >              ^
> > /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
> > runtime error: member access within misaligned address 0x55b4ffee8246
> > for type 'struct ip_header', which requires 4 byte alignment
> > 0x55b4ffee8246: note: pointer points here
> >  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> > ff ff 00 00 00 00 00 00  00 00
> >              ^
> > /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
> > runtime error: load of misaligned address 0x55b4ffee8246 for type
> > 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
> > 0x55b4ffee8246: note: pointer points here
> >  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> > ff ff 00 00 00 00 00 00  00 00
> >              ^
> > 
> > Sorry for the late report, I didn't quite have time
> > to process the pull before Christmas holidays.
> > 
> > thanks
> > -- PMM
> 
> So I bisected and the reason is this commit:
> 
> commit 18b20bb43a2f37f0c8ae23a3e9b3d9a4a05b6bd4
> Author: David Gibson <david@gibson.dropbear.id.au>
> Date:   Tue Dec 19 15:45:22 2017 +1100
> 
>     tests/pxe-test: Add some extra tests
>     
>     Previously virtio-net was only tested for ppc64 in "slow" mode.  That
>     doesn't make much sense since virtio-net is used much more often in
>     practice than the spapr-vlan device which was tested always.  So, move
>     virtio-net to always be tested on ppc64.
>     
>     We had no tests at all for the q35 machine, which doesn't seem wise
>     given its increasing prominence.  Add a couple of tests for it,
>     including testing the newer e1000e adapter.
>     
>     Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
>     Reviewed-by: Thomas Huth <thuth@redhat.com>
>     Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
>     Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> 
> :040000 040000 5a982bfea24b9ac3c651b84425a39b3c85f4871e 771af3fdfb2778c6d6ed6b1098d1e79c181d6fb0 M      tests
> 
> Pls either fix or drop e1000e test

Feel free to drop this patch for now.  I'll debug and repost it when I
have a chance.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Michael S. Tsirkin 6 years, 3 months ago
On Tue, Jan 09, 2018 at 12:10:10PM +1100, David Gibson wrote:
> On Mon, Jan 08, 2018 at 08:10:23PM +0200, Michael S. Tsirkin wrote:
> > On Mon, Jan 08, 2018 at 09:14:41AM +0000, Peter Maydell wrote:
> > > On 21 December 2017 at 23:43, Michael S. Tsirkin <mst@redhat.com> wrote:
> > > >> you also need to drop "hw/pci: remove obsolete PCIDevice->init()"
> > > >> (applied in your tree as 18951fce55d5aa58cd1629b4cb704ee51bab4420)
> > > >> else the not-yet-QOM'ified NVME won't work anymore.
> > > >
> > > > Done that too, thanks a lot
> > > 
> > > Hi. I'm afraid this pullreq (merge of 880b1ff) has new runtime
> > > errors from the clang sanitizer:
> > > 
> > > /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
> > > runtime error: member access within misaligned address 0x55b4ffee8246
> > > for type 'struct ip_header', which requires 4 byte alignment
> > > 0x55b4ffee8246: note: pointer points here
> > >  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> > > ff ff 00 00 00 00 00 00  00 00
> > >              ^
> > > /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
> > > runtime error: load of misaligned address 0x55b4ffee8246 for type
> > > 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
> > > 0x55b4ffee8246: note: pointer points here
> > >  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> > > ff ff 00 00 00 00 00 00  00 00
> > >              ^
> > > /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:208:65:
> > > runtime error: member access within misaligned address 0x55b4ffee8246
> > > for type 'struct ip_header', which requires 4 byte alignment
> > > 0x55b4ffee8246: note: pointer points here
> > >  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> > > ff ff 00 00 00 00 00 00  00 00
> > >              ^
> > > /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
> > > runtime error: member access within misaligned address 0x55b4ffee8246
> > > for type 'struct ip_header', which requires 4 byte alignment
> > > 0x55b4ffee8246: note: pointer points here
> > >  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> > > ff ff 00 00 00 00 00 00  00 00
> > >              ^
> > > /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
> > > runtime error: load of misaligned address 0x55b4ffee8246 for type
> > > 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
> > > 0x55b4ffee8246: note: pointer points here
> > >  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> > > ff ff 00 00 00 00 00 00  00 00
> > >              ^
> > > 
> > > Sorry for the late report, I didn't quite have time
> > > to process the pull before Christmas holidays.
> > > 
> > > thanks
> > > -- PMM
> > 
> > So I bisected and the reason is this commit:
> > 
> > commit 18b20bb43a2f37f0c8ae23a3e9b3d9a4a05b6bd4
> > Author: David Gibson <david@gibson.dropbear.id.au>
> > Date:   Tue Dec 19 15:45:22 2017 +1100
> > 
> >     tests/pxe-test: Add some extra tests
> >     
> >     Previously virtio-net was only tested for ppc64 in "slow" mode.  That
> >     doesn't make much sense since virtio-net is used much more often in
> >     practice than the spapr-vlan device which was tested always.  So, move
> >     virtio-net to always be tested on ppc64.
> >     
> >     We had no tests at all for the q35 machine, which doesn't seem wise
> >     given its increasing prominence.  Add a couple of tests for it,
> >     including testing the newer e1000e adapter.
> >     
> >     Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> >     Reviewed-by: Thomas Huth <thuth@redhat.com>
> >     Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> >     Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > 
> > :040000 040000 5a982bfea24b9ac3c651b84425a39b3c85f4871e 771af3fdfb2778c6d6ed6b1098d1e79c181d6fb0 M      tests
> > 
> > Pls either fix or drop e1000e test
> 
> Feel free to drop this patch for now.  I'll debug and repost it when I
> have a chance.
> 
> -- 
> David Gibson			| I'll have my music baroque, and my code
> david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
> 				| _way_ _around_!
> http://www.ozlabs.org/~dgibson

It's just a test, it exposes the bug but does not introduce it so
I think it's ok to keep it. My point is e1000e appears to have some
issues.

-- 
MST

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Michael S. Tsirkin 6 years, 3 months ago
On Tue, Jan 09, 2018 at 12:10:10PM +1100, David Gibson wrote:
> On Mon, Jan 08, 2018 at 08:10:23PM +0200, Michael S. Tsirkin wrote:
> > On Mon, Jan 08, 2018 at 09:14:41AM +0000, Peter Maydell wrote:
> > > On 21 December 2017 at 23:43, Michael S. Tsirkin <mst@redhat.com> wrote:
> > > >> you also need to drop "hw/pci: remove obsolete PCIDevice->init()"
> > > >> (applied in your tree as 18951fce55d5aa58cd1629b4cb704ee51bab4420)
> > > >> else the not-yet-QOM'ified NVME won't work anymore.
> > > >
> > > > Done that too, thanks a lot
> > > 
> > > Hi. I'm afraid this pullreq (merge of 880b1ff) has new runtime
> > > errors from the clang sanitizer:
> > > 
> > > /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
> > > runtime error: member access within misaligned address 0x55b4ffee8246
> > > for type 'struct ip_header', which requires 4 byte alignment
> > > 0x55b4ffee8246: note: pointer points here
> > >  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> > > ff ff 00 00 00 00 00 00  00 00
> > >              ^
> > > /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
> > > runtime error: load of misaligned address 0x55b4ffee8246 for type
> > > 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
> > > 0x55b4ffee8246: note: pointer points here
> > >  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> > > ff ff 00 00 00 00 00 00  00 00
> > >              ^
> > > /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:208:65:
> > > runtime error: member access within misaligned address 0x55b4ffee8246
> > > for type 'struct ip_header', which requires 4 byte alignment
> > > 0x55b4ffee8246: note: pointer points here
> > >  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> > > ff ff 00 00 00 00 00 00  00 00
> > >              ^
> > > /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
> > > runtime error: member access within misaligned address 0x55b4ffee8246
> > > for type 'struct ip_header', which requires 4 byte alignment
> > > 0x55b4ffee8246: note: pointer points here
> > >  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> > > ff ff 00 00 00 00 00 00  00 00
> > >              ^
> > > /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
> > > runtime error: load of misaligned address 0x55b4ffee8246 for type
> > > 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
> > > 0x55b4ffee8246: note: pointer points here
> > >  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> > > ff ff 00 00 00 00 00 00  00 00
> > >              ^
> > > 
> > > Sorry for the late report, I didn't quite have time
> > > to process the pull before Christmas holidays.
> > > 
> > > thanks
> > > -- PMM
> > 
> > So I bisected and the reason is this commit:
> > 
> > commit 18b20bb43a2f37f0c8ae23a3e9b3d9a4a05b6bd4
> > Author: David Gibson <david@gibson.dropbear.id.au>
> > Date:   Tue Dec 19 15:45:22 2017 +1100
> > 
> >     tests/pxe-test: Add some extra tests
> >     
> >     Previously virtio-net was only tested for ppc64 in "slow" mode.  That
> >     doesn't make much sense since virtio-net is used much more often in
> >     practice than the spapr-vlan device which was tested always.  So, move
> >     virtio-net to always be tested on ppc64.
> >     
> >     We had no tests at all for the q35 machine, which doesn't seem wise
> >     given its increasing prominence.  Add a couple of tests for it,
> >     including testing the newer e1000e adapter.
> >     
> >     Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> >     Reviewed-by: Thomas Huth <thuth@redhat.com>
> >     Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> >     Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > 
> > :040000 040000 5a982bfea24b9ac3c651b84425a39b3c85f4871e 771af3fdfb2778c6d6ed6b1098d1e79c181d6fb0 M      tests
> > 
> > Pls either fix or drop e1000e test
> 
> Feel free to drop this patch for now.  I'll debug and repost it when I
> have a chance.
> 
> -- 
> David Gibson			| I'll have my music baroque, and my code
> david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
> 				| _way_ _around_!
> http://www.ozlabs.org/~dgibson

BTw, Jason, you might want to take a look.
I suspect it's a bug somewhere in the e1000e emulation.

-- 
MST

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Jason Wang 6 years, 3 months ago

On 2018年01月16日 10:48, Michael S. Tsirkin wrote:
> On Tue, Jan 09, 2018 at 12:10:10PM +1100, David Gibson wrote:
>> On Mon, Jan 08, 2018 at 08:10:23PM +0200, Michael S. Tsirkin wrote:
>>> On Mon, Jan 08, 2018 at 09:14:41AM +0000, Peter Maydell wrote:
>>>> On 21 December 2017 at 23:43, Michael S. Tsirkin <mst@redhat.com> wrote:
>>>>>> you also need to drop "hw/pci: remove obsolete PCIDevice->init()"
>>>>>> (applied in your tree as 18951fce55d5aa58cd1629b4cb704ee51bab4420)
>>>>>> else the not-yet-QOM'ified NVME won't work anymore.
>>>>> Done that too, thanks a lot
>>>> Hi. I'm afraid this pullreq (merge of 880b1ff) has new runtime
>>>> errors from the clang sanitizer:
>>>>
>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
>>>> runtime error: member access within misaligned address 0x55b4ffee8246
>>>> for type 'struct ip_header', which requires 4 byte alignment
>>>> 0x55b4ffee8246: note: pointer points here
>>>>   01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>> ff ff 00 00 00 00 00 00  00 00
>>>>               ^
>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
>>>> runtime error: load of misaligned address 0x55b4ffee8246 for type
>>>> 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
>>>> 0x55b4ffee8246: note: pointer points here
>>>>   01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>> ff ff 00 00 00 00 00 00  00 00
>>>>               ^
>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:208:65:
>>>> runtime error: member access within misaligned address 0x55b4ffee8246
>>>> for type 'struct ip_header', which requires 4 byte alignment
>>>> 0x55b4ffee8246: note: pointer points here
>>>>   01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>> ff ff 00 00 00 00 00 00  00 00
>>>>               ^
>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
>>>> runtime error: member access within misaligned address 0x55b4ffee8246
>>>> for type 'struct ip_header', which requires 4 byte alignment
>>>> 0x55b4ffee8246: note: pointer points here
>>>>   01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>> ff ff 00 00 00 00 00 00  00 00
>>>>               ^
>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
>>>> runtime error: load of misaligned address 0x55b4ffee8246 for type
>>>> 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
>>>> 0x55b4ffee8246: note: pointer points here
>>>>   01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>> ff ff 00 00 00 00 00 00  00 00
>>>>               ^
>>>>
>>>> Sorry for the late report, I didn't quite have time
>>>> to process the pull before Christmas holidays.
>>>>
>>>> thanks
>>>> -- PMM
>>> So I bisected and the reason is this commit:
>>>
>>> commit 18b20bb43a2f37f0c8ae23a3e9b3d9a4a05b6bd4
>>> Author: David Gibson <david@gibson.dropbear.id.au>
>>> Date:   Tue Dec 19 15:45:22 2017 +1100
>>>
>>>      tests/pxe-test: Add some extra tests
>>>      
>>>      Previously virtio-net was only tested for ppc64 in "slow" mode.  That
>>>      doesn't make much sense since virtio-net is used much more often in
>>>      practice than the spapr-vlan device which was tested always.  So, move
>>>      virtio-net to always be tested on ppc64.
>>>      
>>>      We had no tests at all for the q35 machine, which doesn't seem wise
>>>      given its increasing prominence.  Add a couple of tests for it,
>>>      including testing the newer e1000e adapter.
>>>      
>>>      Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
>>>      Reviewed-by: Thomas Huth <thuth@redhat.com>
>>>      Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
>>>      Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>>>
>>> :040000 040000 5a982bfea24b9ac3c651b84425a39b3c85f4871e 771af3fdfb2778c6d6ed6b1098d1e79c181d6fb0 M      tests
>>>
>>> Pls either fix or drop e1000e test
>> Feel free to drop this patch for now.  I'll debug and repost it when I
>> have a chance.
>>
>> -- 
>> David Gibson			| I'll have my music baroque, and my code
>> david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
>> 				| _way_ _around_!
>> http://www.ozlabs.org/~dgibson
> BTw, Jason, you might want to take a look.
> I suspect it's a bug somewhere in the e1000e emulation.
>

Will have a look.

cc Dmitry for more thoughts.

Thanks

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Jason Wang 6 years, 3 months ago

On 2018年01月16日 14:28, Jason Wang wrote:
>
>
> On 2018年01月16日 10:48, Michael S. Tsirkin wrote:
>> On Tue, Jan 09, 2018 at 12:10:10PM +1100, David Gibson wrote:
>>> On Mon, Jan 08, 2018 at 08:10:23PM +0200, Michael S. Tsirkin wrote:
>>>> On Mon, Jan 08, 2018 at 09:14:41AM +0000, Peter Maydell wrote:
>>>>> On 21 December 2017 at 23:43, Michael S. Tsirkin <mst@redhat.com> 
>>>>> wrote:
>>>>>>> you also need to drop "hw/pci: remove obsolete PCIDevice->init()"
>>>>>>> (applied in your tree as 18951fce55d5aa58cd1629b4cb704ee51bab4420)
>>>>>>> else the not-yet-QOM'ified NVME won't work anymore.
>>>>>> Done that too, thanks a lot
>>>>> Hi. I'm afraid this pullreq (merge of 880b1ff) has new runtime
>>>>> errors from the clang sanitizer:
>>>>>
>>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
>>>>> runtime error: member access within misaligned address 0x55b4ffee8246
>>>>> for type 'struct ip_header', which requires 4 byte alignment
>>>>> 0x55b4ffee8246: note: pointer points here
>>>>>   01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>>> ff ff 00 00 00 00 00 00  00 00
>>>>>               ^
>>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
>>>>> runtime error: load of misaligned address 0x55b4ffee8246 for type
>>>>> 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
>>>>> 0x55b4ffee8246: note: pointer points here
>>>>>   01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>>> ff ff 00 00 00 00 00 00  00 00
>>>>>               ^
>>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:208:65:
>>>>> runtime error: member access within misaligned address 0x55b4ffee8246
>>>>> for type 'struct ip_header', which requires 4 byte alignment
>>>>> 0x55b4ffee8246: note: pointer points here
>>>>>   01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>>> ff ff 00 00 00 00 00 00  00 00
>>>>>               ^
>>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
>>>>> runtime error: member access within misaligned address 0x55b4ffee8246
>>>>> for type 'struct ip_header', which requires 4 byte alignment
>>>>> 0x55b4ffee8246: note: pointer points here
>>>>>   01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>>> ff ff 00 00 00 00 00 00  00 00
>>>>>               ^
>>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
>>>>> runtime error: load of misaligned address 0x55b4ffee8246 for type
>>>>> 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
>>>>> 0x55b4ffee8246: note: pointer points here
>>>>>   01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>>> ff ff 00 00 00 00 00 00  00 00
>>>>>               ^
>>>>>
>>>>> Sorry for the late report, I didn't quite have time
>>>>> to process the pull before Christmas holidays.
>>>>>
>>>>> thanks
>>>>> -- PMM
>>>> So I bisected and the reason is this commit:
>>>>
>>>> commit 18b20bb43a2f37f0c8ae23a3e9b3d9a4a05b6bd4
>>>> Author: David Gibson <david@gibson.dropbear.id.au>
>>>> Date:   Tue Dec 19 15:45:22 2017 +1100
>>>>
>>>>      tests/pxe-test: Add some extra tests
>>>>           Previously virtio-net was only tested for ppc64 in "slow" 
>>>> mode.  That
>>>>      doesn't make much sense since virtio-net is used much more 
>>>> often in
>>>>      practice than the spapr-vlan device which was tested always.  
>>>> So, move
>>>>      virtio-net to always be tested on ppc64.
>>>>           We had no tests at all for the q35 machine, which doesn't 
>>>> seem wise
>>>>      given its increasing prominence.  Add a couple of tests for it,
>>>>      including testing the newer e1000e adapter.
>>>>           Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
>>>>      Reviewed-by: Thomas Huth <thuth@redhat.com>
>>>>      Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
>>>>      Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>>>>
>>>> :040000 040000 5a982bfea24b9ac3c651b84425a39b3c85f4871e 
>>>> 771af3fdfb2778c6d6ed6b1098d1e79c181d6fb0 M      tests
>>>>
>>>> Pls either fix or drop e1000e test
>>> Feel free to drop this patch for now.  I'll debug and repost it when I
>>> have a chance.
>>>
>>> -- 
>>> David Gibson            | I'll have my music baroque, and my code
>>> david AT gibson.dropbear.id.au    | minimalist, thank you. NOT _the_ 
>>> _other_
>>>                 | _way_ _around_!
>>> http://www.ozlabs.org/~dgibson
>> BTw, Jason, you might want to take a look.
>> I suspect it's a bug somewhere in the e1000e emulation.
>>
>
> Will have a look.
>
> cc Dmitry for more thoughts.
>
> Thanks
>

Cc again with the correct address.

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Dmitry Fleytman 6 years, 3 months ago

> On 16 Jan 2018, at 8:28, Jason Wang <jasowang@redhat.com> wrote:
> 
> 
> 
> On 2018年01月16日 10:48, Michael S. Tsirkin wrote:
>> On Tue, Jan 09, 2018 at 12:10:10PM +1100, David Gibson wrote:
>>> On Mon, Jan 08, 2018 at 08:10:23PM +0200, Michael S. Tsirkin wrote:
>>>> On Mon, Jan 08, 2018 at 09:14:41AM +0000, Peter Maydell wrote:
>>>>> On 21 December 2017 at 23:43, Michael S. Tsirkin <mst@redhat.com> wrote:
>>>>>>> you also need to drop "hw/pci: remove obsolete PCIDevice->init()"
>>>>>>> (applied in your tree as 18951fce55d5aa58cd1629b4cb704ee51bab4420)
>>>>>>> else the not-yet-QOM'ified NVME won't work anymore.
>>>>>> Done that too, thanks a lot
>>>>> Hi. I'm afraid this pullreq (merge of 880b1ff) has new runtime
>>>>> errors from the clang sanitizer:
>>>>> 
>>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
>>>>> runtime error: member access within misaligned address 0x55b4ffee8246
>>>>> for type 'struct ip_header', which requires 4 byte alignment
>>>>> 0x55b4ffee8246: note: pointer points here
>>>>>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>>> ff ff 00 00 00 00 00 00  00 00
>>>>>              ^
>>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
>>>>> runtime error: load of misaligned address 0x55b4ffee8246 for type
>>>>> 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
>>>>> 0x55b4ffee8246: note: pointer points here
>>>>>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>>> ff ff 00 00 00 00 00 00  00 00
>>>>>              ^
>>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:208:65:
>>>>> runtime error: member access within misaligned address 0x55b4ffee8246
>>>>> for type 'struct ip_header', which requires 4 byte alignment
>>>>> 0x55b4ffee8246: note: pointer points here
>>>>>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>>> ff ff 00 00 00 00 00 00  00 00
>>>>>              ^
>>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
>>>>> runtime error: member access within misaligned address 0x55b4ffee8246
>>>>> for type 'struct ip_header', which requires 4 byte alignment
>>>>> 0x55b4ffee8246: note: pointer points here
>>>>>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>>> ff ff 00 00 00 00 00 00  00 00
>>>>>              ^
>>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
>>>>> runtime error: load of misaligned address 0x55b4ffee8246 for type
>>>>> 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
>>>>> 0x55b4ffee8246: note: pointer points here
>>>>>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>>> ff ff 00 00 00 00 00 00  00 00
>>>>>              ^
>>>>> 
>>>>> Sorry for the late report, I didn't quite have time
>>>>> to process the pull before Christmas holidays.
>>>>> 
>>>>> thanks
>>>>> -- PMM
>>>> So I bisected and the reason is this commit:
>>>> 
>>>> commit 18b20bb43a2f37f0c8ae23a3e9b3d9a4a05b6bd4
>>>> Author: David Gibson <david@gibson.dropbear.id.au>
>>>> Date:   Tue Dec 19 15:45:22 2017 +1100
>>>> 
>>>>     tests/pxe-test: Add some extra tests
>>>>          Previously virtio-net was only tested for ppc64 in "slow" mode.  That
>>>>     doesn't make much sense since virtio-net is used much more often in
>>>>     practice than the spapr-vlan device which was tested always.  So, move
>>>>     virtio-net to always be tested on ppc64.
>>>>          We had no tests at all for the q35 machine, which doesn't seem wise
>>>>     given its increasing prominence.  Add a couple of tests for it,
>>>>     including testing the newer e1000e adapter.
>>>>          Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
>>>>     Reviewed-by: Thomas Huth <thuth@redhat.com>
>>>>     Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
>>>>     Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>>>> 
>>>> :040000 040000 5a982bfea24b9ac3c651b84425a39b3c85f4871e 771af3fdfb2778c6d6ed6b1098d1e79c181d6fb0 M      tests
>>>> 
>>>> Pls either fix or drop e1000e test
>>> Feel free to drop this patch for now.  I'll debug and repost it when I
>>> have a chance.
>>> 
>>> -- 
>>> David Gibson			| I'll have my music baroque, and my code
>>> david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
>>> 				| _way_ _around_!
>>> http://www.ozlabs.org/~dgibson
>> BTw, Jason, you might want to take a look.
>> I suspect it's a bug somewhere in the e1000e emulation.
>> 
> 
> Will have a look.
> 
> cc Dmitry for more thoughts.

Not all uint8_t fields in IP header are aligned by 32 bit. Should type of those fields be changed to something that does not require alignment?

> 
> Thanks


Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Jason Wang 6 years, 3 months ago

On 2018年01月16日 16:03, Dmitry Fleytman wrote:
>
>> On 16 Jan 2018, at 8:28, Jason Wang <jasowang@redhat.com> wrote:
>>
>>
>>
>> On 2018年01月16日 10:48, Michael S. Tsirkin wrote:
>>> On Tue, Jan 09, 2018 at 12:10:10PM +1100, David Gibson wrote:
>>>> On Mon, Jan 08, 2018 at 08:10:23PM +0200, Michael S. Tsirkin wrote:
>>>>> On Mon, Jan 08, 2018 at 09:14:41AM +0000, Peter Maydell wrote:
>>>>>> On 21 December 2017 at 23:43, Michael S. Tsirkin <mst@redhat.com> wrote:
>>>>>>>> you also need to drop "hw/pci: remove obsolete PCIDevice->init()"
>>>>>>>> (applied in your tree as 18951fce55d5aa58cd1629b4cb704ee51bab4420)
>>>>>>>> else the not-yet-QOM'ified NVME won't work anymore.
>>>>>>> Done that too, thanks a lot
>>>>>> Hi. I'm afraid this pullreq (merge of 880b1ff) has new runtime
>>>>>> errors from the clang sanitizer:
>>>>>>
>>>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
>>>>>> runtime error: member access within misaligned address 0x55b4ffee8246
>>>>>> for type 'struct ip_header', which requires 4 byte alignment
>>>>>> 0x55b4ffee8246: note: pointer points here
>>>>>>   01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>>>> ff ff 00 00 00 00 00 00  00 00
>>>>>>               ^
>>>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
>>>>>> runtime error: load of misaligned address 0x55b4ffee8246 for type
>>>>>> 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
>>>>>> 0x55b4ffee8246: note: pointer points here
>>>>>>   01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>>>> ff ff 00 00 00 00 00 00  00 00
>>>>>>               ^
>>>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:208:65:
>>>>>> runtime error: member access within misaligned address 0x55b4ffee8246
>>>>>> for type 'struct ip_header', which requires 4 byte alignment
>>>>>> 0x55b4ffee8246: note: pointer points here
>>>>>>   01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>>>> ff ff 00 00 00 00 00 00  00 00
>>>>>>               ^
>>>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
>>>>>> runtime error: member access within misaligned address 0x55b4ffee8246
>>>>>> for type 'struct ip_header', which requires 4 byte alignment
>>>>>> 0x55b4ffee8246: note: pointer points here
>>>>>>   01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>>>> ff ff 00 00 00 00 00 00  00 00
>>>>>>               ^
>>>>>> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
>>>>>> runtime error: load of misaligned address 0x55b4ffee8246 for type
>>>>>> 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
>>>>>> 0x55b4ffee8246: note: pointer points here
>>>>>>   01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
>>>>>> ff ff 00 00 00 00 00 00  00 00
>>>>>>               ^
>>>>>>
>>>>>> Sorry for the late report, I didn't quite have time
>>>>>> to process the pull before Christmas holidays.
>>>>>>
>>>>>> thanks
>>>>>> -- PMM
>>>>> So I bisected and the reason is this commit:
>>>>>
>>>>> commit 18b20bb43a2f37f0c8ae23a3e9b3d9a4a05b6bd4
>>>>> Author: David Gibson <david@gibson.dropbear.id.au>
>>>>> Date:   Tue Dec 19 15:45:22 2017 +1100
>>>>>
>>>>>      tests/pxe-test: Add some extra tests
>>>>>           Previously virtio-net was only tested for ppc64 in "slow" mode.  That
>>>>>      doesn't make much sense since virtio-net is used much more often in
>>>>>      practice than the spapr-vlan device which was tested always.  So, move
>>>>>      virtio-net to always be tested on ppc64.
>>>>>           We had no tests at all for the q35 machine, which doesn't seem wise
>>>>>      given its increasing prominence.  Add a couple of tests for it,
>>>>>      including testing the newer e1000e adapter.
>>>>>           Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
>>>>>      Reviewed-by: Thomas Huth <thuth@redhat.com>
>>>>>      Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
>>>>>      Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>>>>>
>>>>> :040000 040000 5a982bfea24b9ac3c651b84425a39b3c85f4871e 771af3fdfb2778c6d6ed6b1098d1e79c181d6fb0 M      tests
>>>>>
>>>>> Pls either fix or drop e1000e test
>>>> Feel free to drop this patch for now.  I'll debug and repost it when I
>>>> have a chance.
>>>>
>>>> -- 
>>>> David Gibson			| I'll have my music baroque, and my code
>>>> david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
>>>> 				| _way_ _around_!
>>>> http://www.ozlabs.org/~dgibson
>>> BTw, Jason, you might want to take a look.
>>> I suspect it's a bug somewhere in the e1000e emulation.
>>>
>> Will have a look.
>>
>> cc Dmitry for more thoughts.
> Not all uint8_t fields in IP header are aligned by 32 bit. Should type of those fields be changed to something that does not require alignment?

I'm not quite sure but according to C11 draft 6.3.2.3[1]:

A pointer to an object type may be converted to a pointer to a different 
object type.  If the resulting  pointer  is  not correctly  aligned 68) 
for  the  referenced  type,  the  behavior is undefined.

We should do it.

[1] http://www.open-std.org/jtc1/sc22/WG14/www/docs/n1570.pdf

Thanks

>
>> Thanks


Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Michael S. Tsirkin 6 years, 3 months ago
On Mon, Jan 08, 2018 at 09:14:41AM +0000, Peter Maydell wrote:
> On 21 December 2017 at 23:43, Michael S. Tsirkin <mst@redhat.com> wrote:
> >> you also need to drop "hw/pci: remove obsolete PCIDevice->init()"
> >> (applied in your tree as 18951fce55d5aa58cd1629b4cb704ee51bab4420)
> >> else the not-yet-QOM'ified NVME won't work anymore.
> >
> > Done that too, thanks a lot
> 
> Hi. I'm afraid this pullreq (merge of 880b1ff) has new runtime
> errors from the clang sanitizer:
> 
> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
> runtime error: member access within misaligned address 0x55b4ffee8246
> for type 'struct ip_header', which requires 4 byte alignment
> 0x55b4ffee8246: note: pointer points here
>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> ff ff 00 00 00 00 00 00  00 00
>              ^
> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:201:27:
> runtime error: load of misaligned address 0x55b4ffee8246 for type
> 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
> 0x55b4ffee8246: note: pointer points here
>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> ff ff 00 00 00 00 00 00  00 00
>              ^
> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:208:65:
> runtime error: member access within misaligned address 0x55b4ffee8246
> for type 'struct ip_header', which requires 4 byte alignment
> 0x55b4ffee8246: note: pointer points here
>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> ff ff 00 00 00 00 00 00  00 00
>              ^
> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
> runtime error: member access within misaligned address 0x55b4ffee8246
> for type 'struct ip_header', which requires 4 byte alignment
> 0x55b4ffee8246: note: pointer points here
>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> ff ff 00 00 00 00 00 00  00 00
>              ^
> /home/petmay01/linaro/qemu-for-merges/hw/net/net_tx_pkt.c:210:13:
> runtime error: load of misaligned address 0x55b4ffee8246 for type
> 'uint8_t' (aka 'unsigned char'), which requires 4 byte alignment
> 0x55b4ffee8246: note: pointer points here
>  01 00 00 00 45 00  01 a9 01 00 00 00 40 11  78 45 00 00 00 00 ff ff
> ff ff 00 00 00 00 00 00  00 00
>              ^
> 
> Sorry for the late report, I didn't quite have time
> to process the pull before Christmas holidays.
> 
> thanks
> -- PMM

So it's an existing bug exposed by the test.
I've reverted the test for now but I didn't rebase
as there are downstream trees based on this pull req.

-- 
MST

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Peter Maydell 6 years, 3 months ago
On 9 January 2018 at 04:11, Michael S. Tsirkin <mst@redhat.com> wrote:
> So it's an existing bug exposed by the test.
> I've reverted the test for now but I didn't rebase
> as there are downstream trees based on this pull req.

Hi -- I'm afraid this seems to have conflicts with the sparc
pullreq. I tried the simple textual merge resolution for
hw/pci-host/apb.c, but that then fails to compile.
Can you fix up and resend, please?

thanks
-- PMM

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Michael S. Tsirkin 6 years, 3 months ago
On Thu, Jan 11, 2018 at 03:31:08PM +0000, Peter Maydell wrote:
> On 9 January 2018 at 04:11, Michael S. Tsirkin <mst@redhat.com> wrote:
> > So it's an existing bug exposed by the test.
> > I've reverted the test for now but I didn't rebase
> > as there are downstream trees based on this pull req.
> 
> Hi -- I'm afraid this seems to have conflicts with the sparc
> pullreq. I tried the simple textual merge resolution for
> hw/pci-host/apb.c, but that then fails to compile.
> Can you fix up and resend, please?
> 
> thanks
> -- PMM

It should be pretty simple - all we did on pci tree
is change register bus to register root bus.
I'll do the merge.

-- 
MST

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Michael S. Tsirkin 6 years, 3 months ago
On Thu, Jan 11, 2018 at 03:31:08PM +0000, Peter Maydell wrote:
> On 9 January 2018 at 04:11, Michael S. Tsirkin <mst@redhat.com> wrote:
> > So it's an existing bug exposed by the test.
> > I've reverted the test for now but I didn't rebase
> > as there are downstream trees based on this pull req.
> 
> Hi -- I'm afraid this seems to have conflicts with the sparc
> pullreq. I tried the simple textual merge resolution for
> hw/pci-host/apb.c, but that then fails to compile.
> Can you fix up and resend, please?
> 
> thanks
> -- PMM

Pushed what I think is the fix. Testing it, but I saw
some changes in submodules and I screwed them up in
the past - could you pls help check and make sure
I didn't do anything wrong?

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Michael S. Tsirkin 6 years, 3 months ago
On Thu, Jan 11, 2018 at 03:31:08PM +0000, Peter Maydell wrote:
> On 9 January 2018 at 04:11, Michael S. Tsirkin <mst@redhat.com> wrote:
> > So it's an existing bug exposed by the test.
> > I've reverted the test for now but I didn't rebase
> > as there are downstream trees based on this pull req.
> 
> Hi -- I'm afraid this seems to have conflicts with the sparc
> pullreq. I tried the simple textual merge resolution for
> hw/pci-host/apb.c, but that then fails to compile.
> Can you fix up and resend, please?
> 
> thanks
> -- PMM

Merged and pushed. Pls merge, but please also make sure
I didn't modify any submodules by mistake.

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Peter Maydell 6 years, 3 months ago
On 11 January 2018 at 21:05, Michael S. Tsirkin <mst@redhat.com> wrote:
> Merged and pushed. Pls merge, but please also make sure
> I didn't modify any submodules by mistake.


Applied, thanks. Submodule stuff all ok (my apply-pullreq
script checks these days that there aren't any submodule
changes in by mistake).

-- PMM

Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups
Posted by Michael S. Tsirkin 6 years, 3 months ago
On Fri, Jan 12, 2018 at 10:44:39AM +0000, Peter Maydell wrote:
> On 11 January 2018 at 21:05, Michael S. Tsirkin <mst@redhat.com> wrote:
> > Merged and pushed. Pls merge, but please also make sure
> > I didn't modify any submodules by mistake.
> 
> 
> Applied, thanks. Submodule stuff all ok (my apply-pullreq
> script checks these days that there aren't any submodule
> changes in by mistake).
> 
> -- PMM

Good to know. Note to self: don't merge upstream into a branch
in the future. Always checkout upstream, merge branch there.

-- 
MST