Re: [libvirt] [Qemu-devel] [PATCH for-3.1] s390x: remove 's390-squash-mcss' option

On Wed, Aug 1, 2018 at 9:18 PM Cornelia Huck <cohuck(a)redhat.com&gt; wrote: > > On Wed, 1 Aug 2018 15:11:23 +0200 > Cornelia Huck <cohuck(a)redhat.com&gt; wrote: > > > On Wed, 1 Aug 2018 14:54:51 +0200 > > Cornelia Huck <cohuck(a)redhat.com&gt; wrote: > > > > > On Wed, 1 Aug 2018 18:21:27 +0800 > > > Fam Zheng <famz(a)redhat.com&gt; 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