From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55815) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1nBt-0008Ql-Fw for qemu-devel@nongnu.org; Sat, 02 Feb 2013 19:12:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U1nBr-0000Kg-Fe for qemu-devel@nongnu.org; Sat, 02 Feb 2013 19:12:13 -0500 Received: from cantor2.suse.de ([195.135.220.15]:55456 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1nBr-0000Kb-6L for qemu-devel@nongnu.org; Sat, 02 Feb 2013 19:12:11 -0500 Message-ID: <510DAB55.50507@suse.de> Date: Sun, 03 Feb 2013 01:12:05 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1359846384-3771-1-git-send-email-aliguori@us.ibm.com> <1359846384-3771-2-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1359846384-3771-2-git-send-email-aliguori@us.ibm.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 1/2] virtio-net: pass host features to virtio_net_init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Michael Tokarev , qemu-devel@nongnu.org Am 03.02.2013 00:06, schrieb Anthony Liguori: > Signed-off-by: Anthony Liguori > --- > hw/s390x/s390-virtio-bus.c | 3 ++- > hw/s390x/virtio-ccw.c | 3 ++- > hw/virtio-pci.c | 3 ++- > hw/virtio.h | 3 ++- > 4 files changed, 8 insertions(+), 4 deletions(-) >=20 > diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c > index d467781..089ed92 100644 > --- a/hw/s390x/s390-virtio-bus.c > +++ b/hw/s390x/s390-virtio-bus.c > @@ -153,7 +153,8 @@ static int s390_virtio_net_init(VirtIOS390Device *d= ev) > { > VirtIODevice *vdev; > =20 > - vdev =3D virtio_net_init((DeviceState *)dev, &dev->nic, &dev->net)= ; > + vdev =3D virtio_net_init((DeviceState *)dev, &dev->nic, &dev->net, > + dev->host_features); > if (!vdev) { > return -1; > } > diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c > index 231f81e..d92e427 100644 > --- a/hw/s390x/virtio-ccw.c > +++ b/hw/s390x/virtio-ccw.c > @@ -555,7 +555,8 @@ static int virtio_ccw_net_init(VirtioCcwDevice *dev= ) > { > VirtIODevice *vdev; > =20 > - vdev =3D virtio_net_init((DeviceState *)dev, &dev->nic, &dev->net)= ; > + vdev =3D virtio_net_init((DeviceState *)dev, &dev->nic, &dev->net, > + dev->host_features[0]); > if (!vdev) { > return -1; > } > diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c > index 9abbcdf..a869f53 100644 > --- a/hw/virtio-pci.c > +++ b/hw/virtio-pci.c > @@ -997,7 +997,8 @@ static int virtio_net_init_pci(PCIDevice *pci_dev) > VirtIOPCIProxy *proxy =3D DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_d= ev); > VirtIODevice *vdev; > =20 > - vdev =3D virtio_net_init(&pci_dev->qdev, &proxy->nic, &proxy->net)= ; > + vdev =3D virtio_net_init(&pci_dev->qdev, &proxy->nic, &proxy->net, > + proxy->host_features); > =20 > vdev->nvectors =3D proxy->nvectors; > virtio_init_pci(proxy, vdev); > diff --git a/hw/virtio.h b/hw/virtio.h > index a29a54d..1e206b8 100644 > --- a/hw/virtio.h > +++ b/hw/virtio.h > @@ -243,7 +243,8 @@ typedef struct VirtIOBlkConf VirtIOBlkConf; > VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk); > struct virtio_net_conf; > VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf, > - struct virtio_net_conf *net); > + struct virtio_net_conf *net, > + uint32_t host_features); > typedef struct virtio_serial_conf virtio_serial_conf; > VirtIODevice *virtio_serial_init(DeviceState *dev, virtio_serial_conf = *serial); > VirtIODevice *virtio_balloon_init(DeviceState *dev); The virtio_net_init() implementation went into 2/2 so this breaks. Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg