OSDN Git Service

tools/lguest: don't use legacy definitions for net device in example launcher.
authorRusty Russell <rusty@rustcorp.com.au>
Fri, 13 Feb 2015 06:43:44 +0000 (17:13 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Fri, 13 Feb 2015 06:45:55 +0000 (17:15 +1030)
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
tools/lguest/lguest.c

index eebe94b..e440524 100644 (file)
@@ -66,6 +66,7 @@ typedef uint8_t u8;
 #define VIRTIO_CONFIG_NO_LEGACY
 #define VIRTIO_PCI_NO_LEGACY
 #define VIRTIO_BLK_NO_LEGACY
+#define VIRTIO_NET_NO_LEGACY
 
 /* Use in-kernel ones, which defines VIRTIO_F_VERSION_1 */
 #include "../../include/uapi/linux/virtio_config.h"
@@ -2816,7 +2817,7 @@ static int get_tun_device(char tapif[IFNAMSIZ])
         * about our expanded header (which is called
         * virtio_net_hdr_mrg_rxbuf in the legacy system).
         */
-       vnet_hdr_sz = sizeof(struct virtio_net_hdr_mrg_rxbuf);
+       vnet_hdr_sz = sizeof(struct virtio_net_hdr_v1);
        if (ioctl(netfd, TUNSETVNETHDRSZ, &vnet_hdr_sz) != 0)
                err(1, "Setting tun header size to %u", vnet_hdr_sz);