Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.1-20190529' into staging

[mirror_qemu.git] / util / fifo8.c

diff --git a/util/fifo8.c b/util/fifo8.c
index 6a43482c9e12ef1564965a1e5bf12d87740aaba1..d38b3bdaa5951d9babe8173b6eee19bd8f7b2256 100644 (file)
--- a/util/fifo8.c
+++ b/util/fifo8.c
@@ -12,6 +12,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/fifo8.h"
 
@@ -116,9 +117,8 @@ const VMStateDescription vmstate_fifo8 = {
     .name = "Fifo8",
     .version_id = 1,
     .minimum_version_id = 1,
-    .minimum_version_id_old = 1,
-    .fields      = (VMStateField[]) {
-        VMSTATE_VBUFFER_UINT32(data, Fifo8, 1, NULL, 0, capacity),
+    .fields = (VMStateField[]) {
+        VMSTATE_VBUFFER_UINT32(data, Fifo8, 1, NULL, capacity),
         VMSTATE_UINT32(head, Fifo8),
         VMSTATE_UINT32(num, Fifo8),
         VMSTATE_END_OF_LIST()