From 437fd90c0250dee670290f9b714253671a990160 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Wed, 18 May 2016 13:18:31 +0300 Subject: These changes are the raw update to qemu-2.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Collission happened in the following patches: migration: do cleanup operation after completion(738df5b9) Bug fix.(1750c932f86) kvmclock: add a new function to update env->tsc.(b52baab2) The code provided by the patches was already in the upstreamed version. Change-Id: I3cc11841a6a76ae20887b2e245710199e1ea7f9a Signed-off-by: José Pekkarinen --- qemu/hw/9pfs/virtio-9p-synth.h | 54 ------------------------------------------ 1 file changed, 54 deletions(-) delete mode 100644 qemu/hw/9pfs/virtio-9p-synth.h (limited to 'qemu/hw/9pfs/virtio-9p-synth.h') diff --git a/qemu/hw/9pfs/virtio-9p-synth.h b/qemu/hw/9pfs/virtio-9p-synth.h deleted file mode 100644 index ab05a8e78..000000000 --- a/qemu/hw/9pfs/virtio-9p-synth.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Virtio 9p - * - * Copyright IBM, Corp. 2011 - * - * Authors: - * Aneesh Kumar K.V - * - * This work is licensed under the terms of the GNU GPL, version 2. See - * the COPYING file in the top-level directory. - * - */ -#ifndef HW_9PFS_VIRTIO9P_SYNTH_H -#define HW_9PFS_VIRTIO9P_SYNTH_H 1 - -#include -#include -#include - -typedef struct V9fsSynthNode V9fsSynthNode; -typedef ssize_t (*v9fs_synth_read)(void *buf, int len, off_t offset, - void *arg); -typedef ssize_t (*v9fs_synth_write)(void *buf, int len, off_t offset, - void *arg); -typedef struct V9fsSynthNodeAttr { - int mode; - int inode; - int nlink; - v9fs_synth_read read; - v9fs_synth_write write; -} V9fsSynthNodeAttr; - -struct V9fsSynthNode { - QLIST_HEAD(, V9fsSynthNode) child; - QLIST_ENTRY(V9fsSynthNode) sibling; - char name[NAME_MAX]; - V9fsSynthNodeAttr *attr; - V9fsSynthNodeAttr actual_attr; - void *private; - int open_count; -}; - -typedef struct V9fsSynthOpenState { - off_t offset; - V9fsSynthNode *node; -} V9fsSynthOpenState; - -extern int qemu_v9fs_synth_mkdir(V9fsSynthNode *parent, int mode, - const char *name, V9fsSynthNode **result); -extern int qemu_v9fs_synth_add_file(V9fsSynthNode *parent, int mode, - const char *name, v9fs_synth_read read, - v9fs_synth_write write, void *arg); - -#endif -- cgit 1.2.3-korg