Done.
On Thu, Feb 21, 2013 at 12:47 PM, Stefan Hajnoczi <stefa...@gmail.com>wrote: > Hi Dmitry, > The net multiqueue feature went into QEMU 1.4 and conflicts with vmxnet3.c. > > Please post a rebased version onto qemu.git/master so vmxnet3 can be > merged. I'm currently getting the following compiler errors with > these patches: > > hw/vmxnet3.c: In function ‘vmxnet3_set_variable_mac’: > hw/vmxnet3.c:438:37: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c: In function ‘vmxnet3_send_packet’: > hw/vmxnet3.c:680:47: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c: In function ‘vmxnet3_update_features’: > hw/vmxnet3.c:1285:31: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c: In function ‘vmxnet3_can_receive’: > hw/vmxnet3.c:1715:94: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c:1715:162: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c:1715:178: error: initialization from incompatible pointer > type [-Werror] > hw/vmxnet3.c:1715:178: error: (near initialization for ‘s’) [-Werror] > hw/vmxnet3.c:1715:216: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c:1715:72: error: unused variable ‘offset_must_be_zero’ > [-Werror=unused-variable] > hw/vmxnet3.c: In function ‘vmxnet3_receive’: > hw/vmxnet3.c:1795:94: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c:1795:162: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c:1795:178: error: initialization from incompatible pointer > type [-Werror] > hw/vmxnet3.c:1795:178: error: (near initialization for ‘s’) [-Werror] > hw/vmxnet3.c:1795:216: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c:1795:72: error: unused variable ‘offset_must_be_zero’ > [-Werror=unused-variable] > hw/vmxnet3.c:1798:37: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c: In function ‘vmxnet3_cleanup’: > hw/vmxnet3.c:1830:94: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c:1830:162: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c:1830:178: error: initialization from incompatible pointer > type [-Werror] > hw/vmxnet3.c:1830:178: error: (near initialization for ‘s’) [-Werror] > hw/vmxnet3.c:1830:216: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c:1830:72: error: unused variable ‘offset_must_be_zero’ > [-Werror=unused-variable] > hw/vmxnet3.c: In function ‘vmxnet3_set_link_status’: > hw/vmxnet3.c:1836:94: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c:1836:162: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c:1836:178: error: initialization from incompatible pointer > type [-Werror] > hw/vmxnet3.c:1836:178: error: (near initialization for ‘s’) [-Werror] > hw/vmxnet3.c:1836:216: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c:1836:72: error: unused variable ‘offset_must_be_zero’ > [-Werror=unused-variable] > hw/vmxnet3.c: In function ‘vmxnet3_peer_has_vnet_hdr’: > hw/vmxnet3.c:1859:34: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c: In function ‘vmxnet3_net_uninit’: > hw/vmxnet3.c:1877:32: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c: In function ‘vmxnet3_net_init’: > hw/vmxnet3.c:1909:36: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c:1910:34: error: ‘NICState’ has no member named ‘nc’ > hw/vmxnet3.c:1913:37: error: ‘NICState’ has no member named ‘nc’ >
