Re: [Qemu-devel] [PATCH v3 05/17] virtio-balloon: use standard headers

[Thomas Huth]

On Mon, 16 Feb 2015 22:35:52 +0100
"Michael S. Tsirkin" <address@hidden> wrote:

> Drop code duplicated from standard headers.
> 
> Signed-off-by: Michael S. Tsirkin <address@hidden>
> ---
>  include/hw/virtio/virtio-balloon.h | 35 ++---------------------------------
>  1 file changed, 2 insertions(+), 33 deletions(-)
> 
> diff --git a/include/hw/virtio/virtio-balloon.h 
> b/include/hw/virtio/virtio-balloon.h
> index f863bfe..4ab8f54 100644
> --- a/include/hw/virtio/virtio-balloon.h
> +++ b/include/hw/virtio/virtio-balloon.h
> @@ -15,6 +15,7 @@
>  #ifndef _QEMU_VIRTIO_BALLOON_H
>  #define _QEMU_VIRTIO_BALLOON_H
> 
> +#include "standard-headers/linux/virtio_balloon.h"
>  #include "hw/virtio/virtio.h"
>  #include "hw/pci/pci.h"
> 
> @@ -22,39 +23,7 @@
>  #define VIRTIO_BALLOON(obj) \
>          OBJECT_CHECK(VirtIOBalloon, (obj), TYPE_VIRTIO_BALLOON)
> 
> -/* from Linux's linux/virtio_balloon.h */
> -
> -/* The ID for virtio_balloon */
> -#define VIRTIO_ID_BALLOON 5
> -
> -/* The feature bitmap for virtio balloon */
> -#define VIRTIO_BALLOON_F_MUST_TELL_HOST 0 /* Tell before reclaiming pages */
> -#define VIRTIO_BALLOON_F_STATS_VQ 1       /* Memory stats virtqueue */
> -
> -/* Size of a PFN in the balloon interface. */
> -#define VIRTIO_BALLOON_PFN_SHIFT 12
> -
> -struct virtio_balloon_config
> -{
> -    /* Number of pages host wants Guest to give up. */
> -    uint32_t num_pages;
> -    /* Number of pages we've actually got in balloon. */
> -    uint32_t actual;
> -};
> -
> -/* Memory Statistics */
> -#define VIRTIO_BALLOON_S_SWAP_IN  0   /* Amount of memory swapped in */
> -#define VIRTIO_BALLOON_S_SWAP_OUT 1   /* Amount of memory swapped out */
> -#define VIRTIO_BALLOON_S_MAJFLT   2   /* Number of major faults */
> -#define VIRTIO_BALLOON_S_MINFLT   3   /* Number of minor faults */
> -#define VIRTIO_BALLOON_S_MEMFREE  4   /* Total amount of free memory */
> -#define VIRTIO_BALLOON_S_MEMTOT   5   /* Total amount of memory */
> -#define VIRTIO_BALLOON_S_NR       6
> -
> -typedef struct VirtIOBalloonStat {
> -    uint16_t tag;
> -    uint64_t val;
> -} QEMU_PACKED VirtIOBalloonStat;
> +typedef struct virtio_balloon_stat VirtIOBalloonStat;
> 
>  typedef struct VirtIOBalloon {
>      VirtIODevice parent_obj;

Reviewed-by: Thomas Huth <address@hidden>