Re: [libvirt] [Qemu-devel] [PATCH for-3.1] s390x: remove 's390-squash-mcss' option
On Thu, 2 Aug 2018 09:15:24 +0200
Cornelia Huck <cohuck(a)redhat.com> wrote:
On Thu, 2 Aug 2018 09:34:37 +0800
Fam Zheng <famz(a)redhat.com> wrote:
> On Wed, Aug 1, 2018 at 9:18 PM Cornelia Huck <cohuck(a)redhat.com> wrote:
> >
> > On Wed, 1 Aug 2018 15:11:23 +0200
> > Cornelia Huck <cohuck(a)redhat.com> wrote:
> >
> > > On Wed, 1 Aug 2018 14:54:51 +0200
> > > Cornelia Huck <cohuck(a)redhat.com> wrote:
> > >
> > > > On Wed, 1 Aug 2018 18:21:27 +0800
> > > > Fam Zheng <famz(a)redhat.com> wrote:
> > > >
> > > > > On Tue, 07/24 11:24, Cornelia Huck wrote:
> > > > > > diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c
> > > > > > index a02d708239..1bd6c8b458 100644
> > > > > > --- a/hw/s390x/css-bridge.c
> > > > > > +++ b/hw/s390x/css-bridge.c
> > > > > > @@ -106,7 +106,6 @@ VirtualCssBus
*virtual_css_bus_init(void)
> > > > > > /* Create bus on bridge device */
> > > > > > bus = qbus_create(TYPE_VIRTUAL_CSS_BUS, dev,
"virtual-css");
> > > > > > cbus = VIRTUAL_CSS_BUS(bus);
> > > > >
> > > > > Not used now?
> > > > >
> > > > > Fam
> > > >
> > > > Indeed, we can ditch the cbus variable.
> > >
> > > ...or not :) We still need it for the return value, which is processed
> > > in ccw_init(). We could change the return code of the function to
> > > BusState, but I'm not sure it is worth the hassle.
> >
> > ...but we can indeed get rid of the cbus and qbus variables in
> > s390_ccw_realize().
>
> I got this from a patchew.org test (make docker-test-clang@ubuntu):
>
> /tmp/qemu-test/src/hw/s390x/3270-ccw.c:103:20: error: unused variable
> 'cbus' [-Werror,-Wunused-variable]
> VirtualCssBus *cbus = VIRTUAL_CSS_BUS(qbus);
> ^
> 1 error generated.
> /tmp/qemu-test/src/rules.mak:69: recipe for target 'hw/s390x/3270-ccw.o'
failed
Odd, why didn't I see that...
...oh wait. Why do I have -disable-werror set? I'll send a patch.
On second thought, I'll just merge in the following:
diff --git a/hw/s390x/3270-ccw.c b/hw/s390x/3270-ccw.c
index cf58b81fc0..2c8d16ccf7 100644
--- a/hw/s390x/3270-ccw.c
+++ b/hw/s390x/3270-ccw.c
@@ -98,9 +98,6 @@ static void emulated_ccw_3270_realize(DeviceState *ds, Error **errp)
EmulatedCcw3270Class *ck = EMULATED_CCW_3270_GET_CLASS(dev);
CcwDevice *cdev = CCW_DEVICE(ds);
CCWDeviceClass *cdk = CCW_DEVICE_GET_CLASS(cdev);
- DeviceState *parent = DEVICE(cdev);
- BusState *qbus = qdev_get_parent_bus(parent);
- VirtualCssBus *cbus = VIRTUAL_CSS_BUS(qbus);
SubchDev *sch;
Error *err = NULL;
diff --git a/hw/s390x/s390-ccw.c b/hw/s390x/s390-ccw.c
index d1280bf631..cad91ee626 100644
--- a/hw/s390x/s390-ccw.c
+++ b/hw/s390x/s390-ccw.c
@@ -67,8 +67,6 @@ static void s390_ccw_realize(S390CCWDevice *cdev, char *sysfsdev, Error
**errp)
CcwDevice *ccw_dev = CCW_DEVICE(cdev);
CCWDeviceClass *ck = CCW_DEVICE_GET_CLASS(ccw_dev);
DeviceState *parent = DEVICE(ccw_dev);
- BusState *qbus = qdev_get_parent_bus(parent);
- VirtualCssBus *cbus = VIRTUAL_CSS_BUS(qbus);
SubchDev *sch;
int ret;
Error *err = NULL;