Patchwork [PULL] virtio,make,pci,e1000

login
register
mail settings
Submitter Michael S. Tsirkin
Date Jan. 24, 2013, 5:20 p.m.
Message ID <20130124172053.GA11776@redhat.com>
Download mbox
Permalink /patch/216266/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_anthony

Comments

Michael S. Tsirkin - Jan. 24, 2013, 5:20 p.m.
The following changes since commit 1356b98d3e95a85071e6bf9a99e8799e1ae1bbee:

  sysbus: Drop sysbus_from_qdev() cast macro (2013-01-21 13:52:24 -0600)

are available in the git repository at:

  git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_anthony

for you to fetch changes up to eb023c60c9a1a7fad3058dbb578c69d8ee0e676b:

  ich9: add support for pci assignment (2013-01-23 17:47:27 +0200)

----------------------------------------------------------------
virtio,make,pci,e1000

This includes my timestamp generation cleanup,
Amos's and my work on virtio net commands,
pci and e1000 fixes.

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

----------------------------------------------------------------
Amos Kong (2):
      virtio-net: introduce a new macaddr control
      virtio-net: rename ctrl rx commands

Jason Baron (1):
      ich9: add support for pci assignment

Michael S. Tsirkin (7):
      e1000: document ICS read behaviour
      pci: make secondary bus reset explicit
      rules.mak: cleanup config generation rules
      Makefile: clean timestamp generation rule
      rules/mak: make clean should blow away timestamp files
      virtio-net: revert mac on reset
      virtio-net: remove layout assumptions for ctrl vq

 hw/e1000.c          |  10 ++++
 hw/ich9.h           |   1 +
 hw/lpc_ich9.c       |  33 ++++++++++++
 hw/pc_piix.c        |   4 ++
 hw/pc_q35.c         |   1 +
 hw/pci/pci.c        |   2 +-
 hw/pci/pci_bridge.c |   6 ++-
 hw/virtio-net.c     | 143 ++++++++++++++++++++++++++++++++--------------------
 hw/virtio-net.h     |  26 ++++++----
 rules.mak           |  14 +++--
 trace/Makefile.objs |   4 +-
 11 files changed, 171 insertions(+), 73 deletions(-)
Anthony Liguori - Jan. 29, 2013, 10:54 p.m.
"Michael S. Tsirkin" <mst@redhat.com> writes:

> The following changes since commit 1356b98d3e95a85071e6bf9a99e8799e1ae1bbee:
>
>   sysbus: Drop sysbus_from_qdev() cast macro (2013-01-21 13:52:24 -0600)
>
> are available in the git repository at:
>
>   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_anthony
>
> for you to fetch changes up to eb023c60c9a1a7fad3058dbb578c69d8ee0e676b:
>
>   ich9: add support for pci assignment (2013-01-23 17:47:27 +0200)

make check fails with the fdc-test qtest:

  LINK  tests/m48t59-test
GTESTER check-qtest-i386
**
ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
GTester: last random seed: R02S38e20b385311b7c6c10b2c92b399dd52
**
ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
GTester: last random seed: R02S5ebbf3ecb38f1a464703189ceb73fe1a
**
ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
GTester: last random seed: R02S9f87188247ec150bcd16270f5d4ac8b5
**
ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
GTester: last random seed: R02Se2b142608b05530b716e46f4a5f80795
**
ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
GTester: last random seed: R02S50c8584bbcbc65e0591df076ff55d11e
**
ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
GTester: last random seed: R02Sd89c43672f192301e75412f669fb5565
**
ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
GTester: last random seed: R02Sfd58f4c52349e36d7bb14e3da6502bea
**
ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
GTester: last random seed: R02S8b1db835a1ac3717c1e7ea221561e958
**
ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
GTester: last random seed: R02S60c3bc23909713e5b7ad5883b30472cb
**
ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
GTester: last random seed: R02S142c378bdcb027ca403c167b2544df1f
**
ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
GTester: last random seed: R02S4b841f7154f9fe3d170e284ce7d3a801
make: *** [check-qtest-i386] Error 1

Regards,

Anthony Liguori


>
> ----------------------------------------------------------------
> virtio,make,pci,e1000
>
> This includes my timestamp generation cleanup,
> Amos's and my work on virtio net commands,
> pci and e1000 fixes.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> ----------------------------------------------------------------
> Amos Kong (2):
>       virtio-net: introduce a new macaddr control
>       virtio-net: rename ctrl rx commands
>
> Jason Baron (1):
>       ich9: add support for pci assignment
>
> Michael S. Tsirkin (7):
>       e1000: document ICS read behaviour
>       pci: make secondary bus reset explicit
>       rules.mak: cleanup config generation rules
>       Makefile: clean timestamp generation rule
>       rules/mak: make clean should blow away timestamp files
>       virtio-net: revert mac on reset
>       virtio-net: remove layout assumptions for ctrl vq
>
>  hw/e1000.c          |  10 ++++
>  hw/ich9.h           |   1 +
>  hw/lpc_ich9.c       |  33 ++++++++++++
>  hw/pc_piix.c        |   4 ++
>  hw/pc_q35.c         |   1 +
>  hw/pci/pci.c        |   2 +-
>  hw/pci/pci_bridge.c |   6 ++-
>  hw/virtio-net.c     | 143 ++++++++++++++++++++++++++++++++--------------------
>  hw/virtio-net.h     |  26 ++++++----
>  rules.mak           |  14 +++--
>  trace/Makefile.objs |   4 +-
>  11 files changed, 171 insertions(+), 73 deletions(-)
Michael S. Tsirkin - Jan. 29, 2013, 11:28 p.m.
On Tue, Jan 29, 2013 at 04:54:35PM -0600, Anthony Liguori wrote:
> "Michael S. Tsirkin" <mst@redhat.com> writes:
> 
> > The following changes since commit 1356b98d3e95a85071e6bf9a99e8799e1ae1bbee:
> >
> >   sysbus: Drop sysbus_from_qdev() cast macro (2013-01-21 13:52:24 -0600)
> >
> > are available in the git repository at:
> >
> >   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_anthony
> >
> > for you to fetch changes up to eb023c60c9a1a7fad3058dbb578c69d8ee0e676b:
> >
> >   ich9: add support for pci assignment (2013-01-23 17:47:27 +0200)
> 
> make check fails with the fdc-test qtest:
> 
>   LINK  tests/m48t59-test
> GTESTER check-qtest-i386
> **
> ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> GTester: last random seed: R02S38e20b385311b7c6c10b2c92b399dd52
> **
> ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> GTester: last random seed: R02S5ebbf3ecb38f1a464703189ceb73fe1a
> **
> ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> GTester: last random seed: R02S9f87188247ec150bcd16270f5d4ac8b5
> **
> ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> GTester: last random seed: R02Se2b142608b05530b716e46f4a5f80795
> **
> ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> GTester: last random seed: R02S50c8584bbcbc65e0591df076ff55d11e
> **
> ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> GTester: last random seed: R02Sd89c43672f192301e75412f669fb5565
> **
> ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> GTester: last random seed: R02Sfd58f4c52349e36d7bb14e3da6502bea
> **
> ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> GTester: last random seed: R02S8b1db835a1ac3717c1e7ea221561e958
> **
> ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> GTester: last random seed: R02S60c3bc23909713e5b7ad5883b30472cb
> **
> ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> GTester: last random seed: R02S142c378bdcb027ca403c167b2544df1f
> **
> ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> GTester: last random seed: R02S4b841f7154f9fe3d170e284ce7d3a801
> make: *** [check-qtest-i386] Error 1
> 
> Regards,
> 
> Anthony Liguori
> 

Nasty turns out for pci branch buildbot does not make check.
Anyone knows how to fix this?


> >
> > ----------------------------------------------------------------
> > virtio,make,pci,e1000
> >
> > This includes my timestamp generation cleanup,
> > Amos's and my work on virtio net commands,
> > pci and e1000 fixes.
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> >
> > ----------------------------------------------------------------
> > Amos Kong (2):
> >       virtio-net: introduce a new macaddr control
> >       virtio-net: rename ctrl rx commands
> >
> > Jason Baron (1):
> >       ich9: add support for pci assignment
> >
> > Michael S. Tsirkin (7):
> >       e1000: document ICS read behaviour
> >       pci: make secondary bus reset explicit
> >       rules.mak: cleanup config generation rules
> >       Makefile: clean timestamp generation rule
> >       rules/mak: make clean should blow away timestamp files
> >       virtio-net: revert mac on reset
> >       virtio-net: remove layout assumptions for ctrl vq
> >
> >  hw/e1000.c          |  10 ++++
> >  hw/ich9.h           |   1 +
> >  hw/lpc_ich9.c       |  33 ++++++++++++
> >  hw/pc_piix.c        |   4 ++
> >  hw/pc_q35.c         |   1 +
> >  hw/pci/pci.c        |   2 +-
> >  hw/pci/pci_bridge.c |   6 ++-
> >  hw/virtio-net.c     | 143 ++++++++++++++++++++++++++++++++--------------------
> >  hw/virtio-net.h     |  26 ++++++----
> >  rules.mak           |  14 +++--
> >  trace/Makefile.objs |   4 +-
> >  11 files changed, 171 insertions(+), 73 deletions(-)
Andreas Färber - Jan. 30, 2013, 12:05 a.m.
Am 30.01.2013 00:28, schrieb Michael S. Tsirkin:
> On Tue, Jan 29, 2013 at 04:54:35PM -0600, Anthony Liguori wrote:
>> ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
>> GTester: last random seed: R02S4b841f7154f9fe3d170e284ce7d3a801
>> make: *** [check-qtest-i386] Error 1
> 
> Nasty turns out for pci branch buildbot does not make check.
> Anyone knows how to fix this?

The KVM call agenda thread has a link to a GitHub repository with the
buildbot config (Python file) for us to propose changes.

Andreas
Anthony Liguori - Jan. 30, 2013, 12:19 a.m.
Andreas Färber <afaerber@suse.de> writes:

> Am 30.01.2013 00:28, schrieb Michael S. Tsirkin:
>> On Tue, Jan 29, 2013 at 04:54:35PM -0600, Anthony Liguori wrote:
>>> ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
>>> GTester: last random seed: R02S4b841f7154f9fe3d170e284ce7d3a801
>>> make: *** [check-qtest-i386] Error 1
>> 
>> Nasty turns out for pci branch buildbot does not make check.
>> Anyone knows how to fix this?
>
> The KVM call agenda thread has a link to a GitHub repository with the
> buildbot config (Python file) for us to propose changes.

I looked earlier and it appears that all submaintainer trees are lacking
an addStep(Test(...) command.  Does anyone know if this was a oversight
when test support was added to buildbot or was there a reasonf or this?

Regards,

Anthony Liguori

>
> Andreas
>
> -- 
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Stefan Hajnoczi - Jan. 30, 2013, 8:03 a.m.
On Tue, Jan 29, 2013 at 06:19:21PM -0600, Anthony Liguori wrote:
> Andreas Färber <afaerber@suse.de> writes:
> 
> > Am 30.01.2013 00:28, schrieb Michael S. Tsirkin:
> >> On Tue, Jan 29, 2013 at 04:54:35PM -0600, Anthony Liguori wrote:
> >>> ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> >>> GTester: last random seed: R02S4b841f7154f9fe3d170e284ce7d3a801
> >>> make: *** [check-qtest-i386] Error 1
> >> 
> >> Nasty turns out for pci branch buildbot does not make check.
> >> Anyone knows how to fix this?
> >
> > The KVM call agenda thread has a link to a GitHub repository with the
> > buildbot config (Python file) for us to propose changes.
> 
> I looked earlier and it appears that all submaintainer trees are lacking
> an addStep(Test(...) command.  Does anyone know if this was a oversight
> when test support was added to buildbot or was there a reasonf or this?

I'm not aware of a reason to skip make check for submaintainer trees.

Stefan
Stefan Hajnoczi - Jan. 30, 2013, 12:34 p.m.
On Wed, Jan 30, 2013 at 01:28:30AM +0200, Michael S. Tsirkin wrote:
> On Tue, Jan 29, 2013 at 04:54:35PM -0600, Anthony Liguori wrote:
> > "Michael S. Tsirkin" <mst@redhat.com> writes:
> > 
> > > The following changes since commit 1356b98d3e95a85071e6bf9a99e8799e1ae1bbee:
> > >
> > >   sysbus: Drop sysbus_from_qdev() cast macro (2013-01-21 13:52:24 -0600)
> > >
> > > are available in the git repository at:
> > >
> > >   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_anthony
> > >
> > > for you to fetch changes up to eb023c60c9a1a7fad3058dbb578c69d8ee0e676b:
> > >
> > >   ich9: add support for pci assignment (2013-01-23 17:47:27 +0200)
> > 
> > make check fails with the fdc-test qtest:
> > 
> >   LINK  tests/m48t59-test
> > GTESTER check-qtest-i386
> > **
> > ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> > GTester: last random seed: R02S38e20b385311b7c6c10b2c92b399dd52
> > **
> > ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> > GTester: last random seed: R02S5ebbf3ecb38f1a464703189ceb73fe1a
> > **
> > ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> > GTester: last random seed: R02S9f87188247ec150bcd16270f5d4ac8b5
> > **
> > ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> > GTester: last random seed: R02Se2b142608b05530b716e46f4a5f80795
> > **
> > ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> > GTester: last random seed: R02S50c8584bbcbc65e0591df076ff55d11e
> > **
> > ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> > GTester: last random seed: R02Sd89c43672f192301e75412f669fb5565
> > **
> > ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> > GTester: last random seed: R02Sfd58f4c52349e36d7bb14e3da6502bea
> > **
> > ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> > GTester: last random seed: R02S8b1db835a1ac3717c1e7ea221561e958
> > **
> > ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> > GTester: last random seed: R02S60c3bc23909713e5b7ad5883b30472cb
> > **
> > ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> > GTester: last random seed: R02S142c378bdcb027ca403c167b2544df1f
> > **
> > ERROR:/home/aliguori/git/qemu/tests/fdc-test.c:84:floppy_send: assertion failed ((msr) & (RQM) == (RQM)): (0x00000000 == 0x00000080)
> > GTester: last random seed: R02S4b841f7154f9fe3d170e284ce7d3a801
> > make: *** [check-qtest-i386] Error 1
> > 
> > Regards,
> > 
> > Anthony Liguori
> > 
> 
> Nasty turns out for pci branch buildbot does not make check.
> Anyone knows how to fix this?

I sent Christian a pull request to clean up the BuildFactory recipes and
always include "make check":

https://github.com/stefanha/buildbot/commit/58a2d8ad5f68e0a034e137a66cbe692e05743a9d

Stefan