mbox

[PULL,00/15] s390 patch queue 2013-01-25

Message ID 1359118138-9367-1-git-send-email-agraf@suse.de
State New
Headers show

Pull-request

git://repo.or.cz/qemu/agraf.git s390-for-upstream

Message

Alexander Graf Jan. 25, 2013, 12:48 p.m. UTC
Hi Blue / Aurelien,

This is my current patch queue for s390.  Please pull.

Alex


The following changes since commit 11c29918be32be5b00f367c7da9724a5cddbbb0f:
  Anthony Liguori (1):
        Merge remote-tracking branch 'bonzini/scsi-next' into staging

are available in the git repository at:

  git://repo.or.cz/qemu/agraf.git s390-for-upstream

Alexander Graf (3):
      s390: Add default support for SCLP console
      s390: Make typeinfo const
      s390: Move hw files to hw/s390x

Andreas Färber (1):
      s390-virtio: Check for NULL device in reset hypercall

Cornelia Huck (10):
      s390: Lowcore mapping helper.
      s390: Add mapping helper functions.
      s390: Channel I/O basic definitions.
      s390: I/O interrupt and machine check injection.
      s390: Add channel I/O instructions.
      s390: Virtual channel subsystem support.
      s390: Wire up channel I/O in kvm.
      s390-virtio: Factor out some initialization code.
      s390: Add new channel I/O based virtio transport.
      s390: Add s390-ccw-virtio machine.

Paolo Bonzini (1):
      virtio-s390: add a reset function to virtio-s390 devices

 hw/boards.h                      |    1 +
 hw/s390-virtio.h                 |   22 -
 hw/s390x/Makefile.objs           |    5 +-
 hw/s390x/css.c                   | 1277 ++++++++++++++++++++++++++++++++++++++
 hw/s390x/css.h                   |   99 +++
 hw/s390x/ipl.c                   |    2 +-
 hw/{ => s390x}/s390-virtio-bus.c |   16 +-
 hw/{ => s390x}/s390-virtio-bus.h |   12 +-
 hw/s390x/s390-virtio-ccw.c       |  134 ++++
 hw/s390x/s390-virtio-hcall.c     |    2 +-
 hw/{ => s390x}/s390-virtio.c     |  131 +++--
 hw/s390x/s390-virtio.h           |   28 +
 hw/s390x/virtio-ccw.c            |  960 ++++++++++++++++++++++++++++
 hw/s390x/virtio-ccw.h            |   98 +++
 target-s390x/Makefile.objs       |    2 +-
 target-s390x/cpu.h               |  247 ++++++++-
 target-s390x/helper.c            |  200 ++++++-
 target-s390x/ioinst.c            |  752 ++++++++++++++++++++++
 target-s390x/ioinst.h            |  223 +++++++
 target-s390x/kvm.c               |  239 +++++++-
 trace-events                     |   18 +
 vl.c                             |   51 ++
 22 files changed, 4403 insertions(+), 116 deletions(-)
 delete mode 100644 hw/s390-virtio.h
 create mode 100644 hw/s390x/css.c
 create mode 100644 hw/s390x/css.h
 rename hw/{ => s390x}/s390-virtio-bus.c (98%)
 rename hw/{ => s390x}/s390-virtio-bus.h (95%)
 create mode 100644 hw/s390x/s390-virtio-ccw.c
 rename hw/{ => s390x}/s390-virtio.c (85%)
 create mode 100644 hw/s390x/s390-virtio.h
 create mode 100644 hw/s390x/virtio-ccw.c
 create mode 100644 hw/s390x/virtio-ccw.h
 create mode 100644 target-s390x/ioinst.c
 create mode 100644 target-s390x/ioinst.h

Comments

Blue Swirl Jan. 26, 2013, 2:17 p.m. UTC | #1
On Fri, Jan 25, 2013 at 12:48 PM, Alexander Graf <agraf@suse.de> wrote:
> Hi Blue / Aurelien,
>
> This is my current patch queue for s390.  Please pull.
>
> Alex
>
>
> The following changes since commit 11c29918be32be5b00f367c7da9724a5cddbbb0f:
>   Anthony Liguori (1):
>         Merge remote-tracking branch 'bonzini/scsi-next' into staging
>
> are available in the git repository at:
>
>   git://repo.or.cz/qemu/agraf.git s390-for-upstream
>
> Alexander Graf (3):
>       s390: Add default support for SCLP console
>       s390: Make typeinfo const
>       s390: Move hw files to hw/s390x
>
> Andreas Färber (1):
>       s390-virtio: Check for NULL device in reset hypercall
>
> Cornelia Huck (10):
>       s390: Lowcore mapping helper.
>       s390: Add mapping helper functions.
>       s390: Channel I/O basic definitions.
>       s390: I/O interrupt and machine check injection.
>       s390: Add channel I/O instructions.
>       s390: Virtual channel subsystem support.

This would break build on mingw32:
  CC    s390x-softmmu/hw/s390x/css.o
/src/qemu/hw/s390x/css.c: In function 'css_interpret_ccw':
/src/qemu/hw/s390x/css.c:226:17: error: 'ERESTART' undeclared (first
use in this function)
/src/qemu/hw/s390x/css.c:226:17: note: each undeclared identifier is
reported only once for each function it appears in
/src/qemu/hw/s390x/css.c:294:20: error: 'EOPNOTSUPP' undeclared (first
use in this function)
/src/qemu/hw/s390x/css.c: In function 'sch_handle_start_func':
/src/qemu/hw/s390x/css.c:350:15: error: 'EOPNOTSUPP' undeclared (first
use in this function)
/src/qemu/hw/s390x/css.c:375:15: error: 'ERESTART' undeclared (first
use in this function)

>       s390: Wire up channel I/O in kvm.
>       s390-virtio: Factor out some initialization code.
>       s390: Add new channel I/O based virtio transport.
>       s390: Add s390-ccw-virtio machine.
>
> Paolo Bonzini (1):
>       virtio-s390: add a reset function to virtio-s390 devices
>
>  hw/boards.h                      |    1 +
>  hw/s390-virtio.h                 |   22 -
>  hw/s390x/Makefile.objs           |    5 +-
>  hw/s390x/css.c                   | 1277 ++++++++++++++++++++++++++++++++++++++
>  hw/s390x/css.h                   |   99 +++
>  hw/s390x/ipl.c                   |    2 +-
>  hw/{ => s390x}/s390-virtio-bus.c |   16 +-
>  hw/{ => s390x}/s390-virtio-bus.h |   12 +-
>  hw/s390x/s390-virtio-ccw.c       |  134 ++++
>  hw/s390x/s390-virtio-hcall.c     |    2 +-
>  hw/{ => s390x}/s390-virtio.c     |  131 +++--
>  hw/s390x/s390-virtio.h           |   28 +
>  hw/s390x/virtio-ccw.c            |  960 ++++++++++++++++++++++++++++
>  hw/s390x/virtio-ccw.h            |   98 +++
>  target-s390x/Makefile.objs       |    2 +-
>  target-s390x/cpu.h               |  247 ++++++++-
>  target-s390x/helper.c            |  200 ++++++-
>  target-s390x/ioinst.c            |  752 ++++++++++++++++++++++
>  target-s390x/ioinst.h            |  223 +++++++
>  target-s390x/kvm.c               |  239 +++++++-
>  trace-events                     |   18 +
>  vl.c                             |   51 ++
>  22 files changed, 4403 insertions(+), 116 deletions(-)
>  delete mode 100644 hw/s390-virtio.h
>  create mode 100644 hw/s390x/css.c
>  create mode 100644 hw/s390x/css.h
>  rename hw/{ => s390x}/s390-virtio-bus.c (98%)
>  rename hw/{ => s390x}/s390-virtio-bus.h (95%)
>  create mode 100644 hw/s390x/s390-virtio-ccw.c
>  rename hw/{ => s390x}/s390-virtio.c (85%)
>  create mode 100644 hw/s390x/s390-virtio.h
>  create mode 100644 hw/s390x/virtio-ccw.c
>  create mode 100644 hw/s390x/virtio-ccw.h
>  create mode 100644 target-s390x/ioinst.c
>  create mode 100644 target-s390x/ioinst.h
Alexander Graf Jan. 26, 2013, 9:31 p.m. UTC | #2
On 26.01.2013, at 15:17, Blue Swirl wrote:

> On Fri, Jan 25, 2013 at 12:48 PM, Alexander Graf <agraf@suse.de> wrote:
>> Hi Blue / Aurelien,
>> 
>> This is my current patch queue for s390.  Please pull.
>> 
>> Alex
>> 
>> 
>> The following changes since commit 11c29918be32be5b00f367c7da9724a5cddbbb0f:
>>  Anthony Liguori (1):
>>        Merge remote-tracking branch 'bonzini/scsi-next' into staging
>> 
>> are available in the git repository at:
>> 
>>  git://repo.or.cz/qemu/agraf.git s390-for-upstream
>> 
>> Alexander Graf (3):
>>      s390: Add default support for SCLP console
>>      s390: Make typeinfo const
>>      s390: Move hw files to hw/s390x
>> 
>> Andreas Färber (1):
>>      s390-virtio: Check for NULL device in reset hypercall
>> 
>> Cornelia Huck (10):
>>      s390: Lowcore mapping helper.
>>      s390: Add mapping helper functions.
>>      s390: Channel I/O basic definitions.
>>      s390: I/O interrupt and machine check injection.
>>      s390: Add channel I/O instructions.
>>      s390: Virtual channel subsystem support.
> 
> This would break build on mingw32:
>  CC    s390x-softmmu/hw/s390x/css.o
> /src/qemu/hw/s390x/css.c: In function 'css_interpret_ccw':
> /src/qemu/hw/s390x/css.c:226:17: error: 'ERESTART' undeclared (first
> use in this function)
> /src/qemu/hw/s390x/css.c:226:17: note: each undeclared identifier is
> reported only once for each function it appears in
> /src/qemu/hw/s390x/css.c:294:20: error: 'EOPNOTSUPP' undeclared (first
> use in this function)
> /src/qemu/hw/s390x/css.c: In function 'sch_handle_start_func':
> /src/qemu/hw/s390x/css.c:350:15: error: 'EOPNOTSUPP' undeclared (first
> use in this function)
> /src/qemu/hw/s390x/css.c:375:15: error: 'ERESTART' undeclared (first
> use in this function)

Stefan, any particular reason I didn't get a buildbot error message about this yet? :)


Alex
Andreas Färber Jan. 26, 2013, 9:46 p.m. UTC | #3
Am 26.01.2013 22:31, schrieb Alexander Graf:
> 
> On 26.01.2013, at 15:17, Blue Swirl wrote:
> 
>> On Fri, Jan 25, 2013 at 12:48 PM, Alexander Graf <agraf@suse.de> wrote:
>>> Cornelia Huck (10):
>>>      s390: Lowcore mapping helper.
>>>      s390: Add mapping helper functions.
>>>      s390: Channel I/O basic definitions.
>>>      s390: I/O interrupt and machine check injection.
>>>      s390: Add channel I/O instructions.
>>>      s390: Virtual channel subsystem support.
>>
>> This would break build on mingw32:
>>  CC    s390x-softmmu/hw/s390x/css.o
>> /src/qemu/hw/s390x/css.c: In function 'css_interpret_ccw':
>> /src/qemu/hw/s390x/css.c:226:17: error: 'ERESTART' undeclared (first
>> use in this function)
>> /src/qemu/hw/s390x/css.c:226:17: note: each undeclared identifier is
>> reported only once for each function it appears in
>> /src/qemu/hw/s390x/css.c:294:20: error: 'EOPNOTSUPP' undeclared (first
>> use in this function)
>> /src/qemu/hw/s390x/css.c: In function 'sch_handle_start_func':
>> /src/qemu/hw/s390x/css.c:350:15: error: 'EOPNOTSUPP' undeclared (first
>> use in this function)
>> /src/qemu/hw/s390x/css.c:375:15: error: 'ERESTART' undeclared (first
>> use in this function)
> 
> Stefan, any particular reason I didn't get a buildbot error message about this yet? :)

Quite simply there is no mingw builder running against s390-next. ;)

http://buildbot.b1-systems.de/qemu/buildslaves

Just like nobody is setting up any builder against qom-cpu... :(
I believe only Daniel can set them up, ping.

Andreas
Alexander Graf Jan. 26, 2013, 10:07 p.m. UTC | #4
On 26.01.2013, at 22:46, Andreas Färber wrote:

> Am 26.01.2013 22:31, schrieb Alexander Graf:
>> 
>> On 26.01.2013, at 15:17, Blue Swirl wrote:
>> 
>>> On Fri, Jan 25, 2013 at 12:48 PM, Alexander Graf <agraf@suse.de> wrote:
>>>> Cornelia Huck (10):
>>>>     s390: Lowcore mapping helper.
>>>>     s390: Add mapping helper functions.
>>>>     s390: Channel I/O basic definitions.
>>>>     s390: I/O interrupt and machine check injection.
>>>>     s390: Add channel I/O instructions.
>>>>     s390: Virtual channel subsystem support.
>>> 
>>> This would break build on mingw32:
>>> CC    s390x-softmmu/hw/s390x/css.o
>>> /src/qemu/hw/s390x/css.c: In function 'css_interpret_ccw':
>>> /src/qemu/hw/s390x/css.c:226:17: error: 'ERESTART' undeclared (first
>>> use in this function)
>>> /src/qemu/hw/s390x/css.c:226:17: note: each undeclared identifier is
>>> reported only once for each function it appears in
>>> /src/qemu/hw/s390x/css.c:294:20: error: 'EOPNOTSUPP' undeclared (first
>>> use in this function)
>>> /src/qemu/hw/s390x/css.c: In function 'sch_handle_start_func':
>>> /src/qemu/hw/s390x/css.c:350:15: error: 'EOPNOTSUPP' undeclared (first
>>> use in this function)
>>> /src/qemu/hw/s390x/css.c:375:15: error: 'ERESTART' undeclared (first
>>> use in this function)
>> 
>> Stefan, any particular reason I didn't get a buildbot error message about this yet? :)
> 
> Quite simply there is no mingw builder running against s390-next. ;)
> 
> http://buildbot.b1-systems.de/qemu/buildslaves
> 
> Just like nobody is setting up any builder against qom-cpu... :(
> I believe only Daniel can set them up, ping.

IMHO builders should build all trees against all targets, not just particular ones.


Alex
Cornelia Huck Jan. 28, 2013, 10:06 a.m. UTC | #5
On Sat, 26 Jan 2013 14:17:36 +0000
Blue Swirl <blauwirbel@gmail.com> wrote:

> On Fri, Jan 25, 2013 at 12:48 PM, Alexander Graf <agraf@suse.de> wrote:
> > Hi Blue / Aurelien,
> >
> > This is my current patch queue for s390.  Please pull.
> >
> > Alex
> >
> >
> > The following changes since commit 11c29918be32be5b00f367c7da9724a5cddbbb0f:
> >   Anthony Liguori (1):
> >         Merge remote-tracking branch 'bonzini/scsi-next' into staging
> >
> > are available in the git repository at:
> >
> >   git://repo.or.cz/qemu/agraf.git s390-for-upstream
> >
> > Alexander Graf (3):
> >       s390: Add default support for SCLP console
> >       s390: Make typeinfo const
> >       s390: Move hw files to hw/s390x
> >
> > Andreas Färber (1):
> >       s390-virtio: Check for NULL device in reset hypercall
> >
> > Cornelia Huck (10):
> >       s390: Lowcore mapping helper.
> >       s390: Add mapping helper functions.
> >       s390: Channel I/O basic definitions.
> >       s390: I/O interrupt and machine check injection.
> >       s390: Add channel I/O instructions.
> >       s390: Virtual channel subsystem support.
> 
> This would break build on mingw32:
>   CC    s390x-softmmu/hw/s390x/css.o
> /src/qemu/hw/s390x/css.c: In function 'css_interpret_ccw':
> /src/qemu/hw/s390x/css.c:226:17: error: 'ERESTART' undeclared (first
> use in this function)
> /src/qemu/hw/s390x/css.c:226:17: note: each undeclared identifier is
> reported only once for each function it appears in
> /src/qemu/hw/s390x/css.c:294:20: error: 'EOPNOTSUPP' undeclared (first
> use in this function)
> /src/qemu/hw/s390x/css.c: In function 'sch_handle_start_func':
> /src/qemu/hw/s390x/css.c:350:15: error: 'EOPNOTSUPP' undeclared (first
> use in this function)
> /src/qemu/hw/s390x/css.c:375:15: error: 'ERESTART' undeclared (first
> use in this function)

That's unfortunate :(

Are there some kinds of compatibility headers that define the missing
error codes, or does something need to be fenced off here?

I would appreciate it if somebody could give me a hand here, especially
as I don't have a mingw32 environment around...

> 
> >       s390: Wire up channel I/O in kvm.
> >       s390-virtio: Factor out some initialization code.
> >       s390: Add new channel I/O based virtio transport.
> >       s390: Add s390-ccw-virtio machine.
> >
> > Paolo Bonzini (1):
> >       virtio-s390: add a reset function to virtio-s390 devices
> >
> >  hw/boards.h                      |    1 +
> >  hw/s390-virtio.h                 |   22 -
> >  hw/s390x/Makefile.objs           |    5 +-
> >  hw/s390x/css.c                   | 1277 ++++++++++++++++++++++++++++++++++++++
> >  hw/s390x/css.h                   |   99 +++
> >  hw/s390x/ipl.c                   |    2 +-
> >  hw/{ => s390x}/s390-virtio-bus.c |   16 +-
> >  hw/{ => s390x}/s390-virtio-bus.h |   12 +-
> >  hw/s390x/s390-virtio-ccw.c       |  134 ++++
> >  hw/s390x/s390-virtio-hcall.c     |    2 +-
> >  hw/{ => s390x}/s390-virtio.c     |  131 +++--
> >  hw/s390x/s390-virtio.h           |   28 +
> >  hw/s390x/virtio-ccw.c            |  960 ++++++++++++++++++++++++++++
> >  hw/s390x/virtio-ccw.h            |   98 +++
> >  target-s390x/Makefile.objs       |    2 +-
> >  target-s390x/cpu.h               |  247 ++++++++-
> >  target-s390x/helper.c            |  200 ++++++-
> >  target-s390x/ioinst.c            |  752 ++++++++++++++++++++++
> >  target-s390x/ioinst.h            |  223 +++++++
> >  target-s390x/kvm.c               |  239 +++++++-
> >  trace-events                     |   18 +
> >  vl.c                             |   51 ++
> >  22 files changed, 4403 insertions(+), 116 deletions(-)
> >  delete mode 100644 hw/s390-virtio.h
> >  create mode 100644 hw/s390x/css.c
> >  create mode 100644 hw/s390x/css.h
> >  rename hw/{ => s390x}/s390-virtio-bus.c (98%)
> >  rename hw/{ => s390x}/s390-virtio-bus.h (95%)
> >  create mode 100644 hw/s390x/s390-virtio-ccw.c
> >  rename hw/{ => s390x}/s390-virtio.c (85%)
> >  create mode 100644 hw/s390x/s390-virtio.h
> >  create mode 100644 hw/s390x/virtio-ccw.c
> >  create mode 100644 hw/s390x/virtio-ccw.h
> >  create mode 100644 target-s390x/ioinst.c
> >  create mode 100644 target-s390x/ioinst.h
>
Alexander Graf Jan. 28, 2013, 12:42 p.m. UTC | #6
On 01/28/2013 11:06 AM, Cornelia Huck wrote:
> On Sat, 26 Jan 2013 14:17:36 +0000
> Blue Swirl<blauwirbel@gmail.com>  wrote:
>
>> On Fri, Jan 25, 2013 at 12:48 PM, Alexander Graf<agraf@suse.de>  wrote:
>>> Hi Blue / Aurelien,
>>>
>>> This is my current patch queue for s390.  Please pull.
>>>
>>> Alex
>>>
>>>
>>> The following changes since commit 11c29918be32be5b00f367c7da9724a5cddbbb0f:
>>>    Anthony Liguori (1):
>>>          Merge remote-tracking branch 'bonzini/scsi-next' into staging
>>>
>>> are available in the git repository at:
>>>
>>>    git://repo.or.cz/qemu/agraf.git s390-for-upstream
>>>
>>> Alexander Graf (3):
>>>        s390: Add default support for SCLP console
>>>        s390: Make typeinfo const
>>>        s390: Move hw files to hw/s390x
>>>
>>> Andreas Färber (1):
>>>        s390-virtio: Check for NULL device in reset hypercall
>>>
>>> Cornelia Huck (10):
>>>        s390: Lowcore mapping helper.
>>>        s390: Add mapping helper functions.
>>>        s390: Channel I/O basic definitions.
>>>        s390: I/O interrupt and machine check injection.
>>>        s390: Add channel I/O instructions.
>>>        s390: Virtual channel subsystem support.
>> This would break build on mingw32:
>>    CC    s390x-softmmu/hw/s390x/css.o
>> /src/qemu/hw/s390x/css.c: In function 'css_interpret_ccw':
>> /src/qemu/hw/s390x/css.c:226:17: error: 'ERESTART' undeclared (first
>> use in this function)
>> /src/qemu/hw/s390x/css.c:226:17: note: each undeclared identifier is
>> reported only once for each function it appears in
>> /src/qemu/hw/s390x/css.c:294:20: error: 'EOPNOTSUPP' undeclared (first
>> use in this function)
>> /src/qemu/hw/s390x/css.c: In function 'sch_handle_start_func':
>> /src/qemu/hw/s390x/css.c:350:15: error: 'EOPNOTSUPP' undeclared (first
>> use in this function)
>> /src/qemu/hw/s390x/css.c:375:15: error: 'ERESTART' undeclared (first
>> use in this function)
> That's unfortunate :(
>
> Are there some kinds of compatibility headers that define the missing
> error codes, or does something need to be fenced off here?
>
> I would appreciate it if somebody could give me a hand here, especially
> as I don't have a mingw32 environment around...

Stefan, could you please help out?


Alex