On Wed, 26 Apr 2017 16:49:20 +0800 Dong Jia Shi <bjsdjshi@xxxxxxxxxxxxxxxxxx> wrote: > * Dong Jia Shi <bjsdjshi@xxxxxxxxxxxxxxxxxx> [2017-04-25 13:15:19 +0800]: > > > * Alex Williamson <alex.williamson@xxxxxxxxxx> [2017-04-24 16:56:28 -0600]: > > > > [...] > > > > > diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c > > > > > new file mode 100644 > > > > > index 0000000..c491bee > > > > > --- /dev/null > > > > > +++ b/hw/vfio/ccw.c > > > > > @@ -0,0 +1,207 @@ > > > > > +/* > > > > > + * vfio based subchannel assignment support > > > > > + * > > > > > + * Copyright 2017 IBM Corp. > > > > > + * Author(s): Dong Jia Shi <bjsdjshi@xxxxxxxxxxxxxxxxxx> > > > > > + * Xiao Feng Ren <renxiaof@xxxxxxxxxxxxxxxxxx> > > > > > + * Pierre Morel <pmorel@xxxxxxxxxxxxxxxxxx> > > > > > + * > > > > > + * This work is licensed under the terms of the GNU GPL, version 2 or(at > > > > > + * your option) any version. See the COPYING file in the top-level > > > > > + * directory. > > > > > + */ > > > > > + > > > > > +#include <linux/vfio.h> > > > > > +#include <sys/ioctl.h> > > > > > + > > > > > +#include "qemu/osdep.h" > > > > > +#include "qapi/error.h" > > > > > +#include "hw/sysbus.h" > > > > > +#include "hw/vfio/vfio.h" > > > > > +#include "hw/vfio/vfio-common.h" > > > > > +#include "hw/s390x/s390-ccw.h" > > > > > +#include "hw/s390x/ccw-device.h" > > > > > + > > > > > +#define TYPE_VFIO_CCW "vfio-ccw" > > > > > +typedef struct VFIOCCWDevice { > > > > > + S390CCWDevice cdev; > > > > > + VFIODevice vdev; > > > > > +} VFIOCCWDevice; > > > > > + > > > > > +static void vfio_ccw_compute_needs_reset(VFIODevice *vdev) > > > > > +{ > > > > > + vdev->needs_reset = false; > > > > > +} > > > > > + > > > > > +/* > > > > > + * We don't need vfio_hot_reset_multi and vfio_eoi operationis for > > > > > > One more: > > > > > > s/operationis/operations/ > > > > > Ok. > > > > Hi Conny, > > I have pulled your cohuck-qemu/s390-next branch, and prepared a new > patch set with all of these problems fixed directly on the coressponding > commits on it. Fine to send out the new version as that? > > Or I should rebase them against the latest master branch? As I currently don't have things in my next branch that should interact with your changes, either is fine :) [I'll take a look at the new version then]