On Mon, 16 Feb 2015 22:35:57 +0100
"Michael S. Tsirkin" <m...@redhat.com> wrote:
> Drop code duplicated from standard headers.
>
> Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
> ---
> hw/9pfs/virtio-9p.h | 17 +----------------
> 1 file changed, 1 insertion(+), 16 deletions(-)
>
> diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h
> index 0776424..58dafa9 100644
> --- a/hw/9pfs/virtio-9p.h
> +++ b/hw/9pfs/virtio-9p.h
> @@ -7,6 +7,7 @@
> #include <utime.h>
> #include <sys/resource.h>
> #include <glib.h>
> +#include "standard-headers/linux/virtio_9p.h"
> #include "hw/virtio/virtio.h"
> #include "hw/virtio/virtio-9p.h"
> #include "fsdev/file-op-9p.h"
> @@ -14,10 +15,6 @@
> #include "qemu/thread.h"
> #include "block/coroutine.h"
>
> -/* The feature bitmap for virtio 9P */
> -/* The mount point is specified in a config variable */
> -#define VIRTIO_9P_MOUNT_TAG 0
> -
> enum {
> P9_TLERROR = 6,
> P9_RLERROR,
> @@ -145,10 +142,6 @@ struct V9fsPDU
> * 1) change user needs to set groups and stuff
> */
>
> -/* from Linux's linux/virtio_9p.h */
> -
> -/* The ID for virtio console */
> -#define VIRTIO_ID_9P 9
> #define MAX_REQ 128
> #define MAX_TAG_LEN 32
>
> @@ -278,14 +271,6 @@ typedef struct V9fsWriteState {
> int cnt;
> } V9fsWriteState;
>
> -struct virtio_9p_config
> -{
> - /* number of characters in tag */
> - uint16_t tag_len;
> - /* Variable size tag name */
> - uint8_t tag[0];
> -} QEMU_PACKED;
> -
> typedef struct V9fsMkState {
> V9fsPDU *pdu;
> size_t offset;
Reviewed-by: Thomas Huth <th...@linux.vnet.ibm.com>
