From 947cb62493520c838f839039e7a815231db9db54 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Fri, 8 Mar 2013 10:56:31 +0100 Subject: [PATCH] --- yaml --- r: 366271 b: refs/heads/master c: d097ddaf529f69b9fea1efec2c9dd5e82ce388c1 h: refs/heads/master i: 366269: 59af273a61fb81cb0d1e78ac9260ccd683e5a119 366267: 878eade6a77fd29a5583ace12b7c33866f2d7d15 366263: 209ff84f90f925802b26b4e702c02ee88ffce887 366255: cae2d283595638a44bd43c44e867f4ecada1d634 366239: f5a3c79883533372c0159eb7d528f01e94878221 366207: 6979896acfea554cfffb8980cfc7e3fa9bc28931 v: v3 --- [refs] | 2 +- trunk/Documentation/virtual/virtio-spec.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ef0be48fd822..7acfd86c5802 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6fcece92a94bcf71f21b8b02685a9fd395527fc +refs/heads/master: d097ddaf529f69b9fea1efec2c9dd5e82ce388c1 diff --git a/trunk/Documentation/virtual/virtio-spec.txt b/trunk/Documentation/virtual/virtio-spec.txt index 0d6ec85481cb..eb094039b50d 100644 --- a/trunk/Documentation/virtual/virtio-spec.txt +++ b/trunk/Documentation/virtual/virtio-spec.txt @@ -1389,7 +1389,7 @@ segmentation, if both guests are amenable. Packets are transmitted by placing them in the transmitq, and buffers for incoming packets are placed in the receiveq. In each -case, the packet itself is preceeded by a header: +case, the packet itself is preceded by a header: struct virtio_net_hdr { @@ -1631,7 +1631,7 @@ struct virtio_net_ctrl_mac { The device can filter incoming packets by any number of destination MAC addresses.[footnote: -Since there are no guarentees, it can use a hash filter +Since there are no guarantees, it can use a hash filter orsilently switch to allmulti or promiscuous mode if it is given too many addresses. ] This table is set using the class VIRTIO_NET_CTRL_MAC and the @@ -1822,7 +1822,7 @@ the FLUSH and FLUSH_OUT types are equivalent, the device does not distinguish between them ]). If the device has VIRTIO_BLK_F_BARRIER feature the high bit (VIRTIO_BLK_T_BARRIER) indicates that this request acts as a -barrier and that all preceeding requests must be complete before +barrier and that all preceding requests must be complete before this one, and all following requests must not be started until this is complete. Note that a barrier does not flush caches in the underlying backend device in host, and thus does not serve as