diff mbox

[v2,02/13] typedefs: Add BdrvDirtyBitmap

Message ID 1453270306-16608-3-git-send-email-famz@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Fam Zheng Jan. 20, 2016, 6:11 a.m. UTC 
Following patches to refactor and move block dirty bitmap code could use
this.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 include/block/block.h   | 3 +--
 include/qemu/typedefs.h | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Eric Blake Jan. 20, 2016, 4:56 p.m. UTC | #1 
On 01/19/2016 11:11 PM, Fam Zheng wrote:
> Following patches to refactor and move block dirty bitmap code could use
> this.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  include/block/block.h   | 3 +--
>  include/qemu/typedefs.h | 1 +
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/block/block.h b/include/block/block.h
> index c96923d..483bfd3 100644
> --- a/include/block/block.h
> +++ b/include/block/block.h
> @@ -8,6 +8,7 @@
>  #include "block/accounting.h"
>  #include "qapi/qmp/qobject.h"
>  #include "qapi-types.h"
> +#include "qemu/hbitmap.h"
>  
>  /* block.c */
>  typedef struct BlockDriver BlockDriver;
> @@ -472,8 +473,6 @@ void *qemu_try_blockalign(BlockDriverState *bs, size_t size);
>  void *qemu_try_blockalign0(BlockDriverState *bs, size_t size);
>  bool bdrv_qiov_is_aligned(BlockDriverState *bs, QEMUIOVector *qiov);
>  
> -struct HBitmapIter;

You didn't mention removing this forward declaration in the commit
message, making it look like an accident.
Fam Zheng Jan. 21, 2016, 3:05 a.m. UTC | #2 
On Wed, 01/20 09:56, Eric Blake wrote:
> On 01/19/2016 11:11 PM, Fam Zheng wrote:
> > Following patches to refactor and move block dirty bitmap code could use
> > this.
> > 
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > ---
> >  include/block/block.h   | 3 +--
> >  include/qemu/typedefs.h | 1 +
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/include/block/block.h b/include/block/block.h
> > index c96923d..483bfd3 100644
> > --- a/include/block/block.h
> > +++ b/include/block/block.h
> > @@ -8,6 +8,7 @@
> >  #include "block/accounting.h"
> >  #include "qapi/qmp/qobject.h"
> >  #include "qapi-types.h"
> > +#include "qemu/hbitmap.h"
> >  
> >  /* block.c */
> >  typedef struct BlockDriver BlockDriver;
> > @@ -472,8 +473,6 @@ void *qemu_try_blockalign(BlockDriverState *bs, size_t size);
> >  void *qemu_try_blockalign0(BlockDriverState *bs, size_t size);
> >  bool bdrv_qiov_is_aligned(BlockDriverState *bs, QEMUIOVector *qiov);
> >  
> > -struct HBitmapIter;
> 
> You didn't mention removing this forward declaration in the commit
> message, making it look like an accident.
> 

It was intended, so it's the commit message. But I'll split the "#include" and
"HBitmapIter" hunks into another patch.

Fam
John Snow Jan. 25, 2016, 8:37 p.m. UTC | #3 
On 01/20/2016 01:11 AM, Fam Zheng wrote:
> Following patches to refactor and move block dirty bitmap code could use
> this.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  include/block/block.h   | 3 +--
>  include/qemu/typedefs.h | 1 +
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/block/block.h b/include/block/block.h
> index c96923d..483bfd3 100644
> --- a/include/block/block.h
> +++ b/include/block/block.h
> @@ -8,6 +8,7 @@
>  #include "block/accounting.h"
>  #include "qapi/qmp/qobject.h"
>  #include "qapi-types.h"
> +#include "qemu/hbitmap.h"
>  
>  /* block.c */
>  typedef struct BlockDriver BlockDriver;
> @@ -472,8 +473,6 @@ void *qemu_try_blockalign(BlockDriverState *bs, size_t size);
>  void *qemu_try_blockalign0(BlockDriverState *bs, size_t size);
>  bool bdrv_qiov_is_aligned(BlockDriverState *bs, QEMUIOVector *qiov);
>  
> -struct HBitmapIter;
> -typedef struct BdrvDirtyBitmap BdrvDirtyBitmap;
>  BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs,
>                                            uint32_t granularity,
>                                            const char *name,
> diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
> index 78fe6e8..0cf9d74 100644
> --- a/include/qemu/typedefs.h
> +++ b/include/qemu/typedefs.h
> @@ -10,6 +10,7 @@ typedef struct AddressSpace AddressSpace;
>  typedef struct AioContext AioContext;
>  typedef struct AllwinnerAHCIState AllwinnerAHCIState;
>  typedef struct AudioState AudioState;
> +typedef struct BdrvDirtyBitmap BdrvDirtyBitmap;
>  typedef struct BlockBackend BlockBackend;
>  typedef struct BlockBackendRootState BlockBackendRootState;
>  typedef struct BlockDriverState BlockDriverState;
> 

Reviewed-by: John Snow <jsnow@redhat.com>
diff mbox

Patch

diff --git a/include/block/block.h b/include/block/block.h
index c96923d..483bfd3 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -8,6 +8,7 @@ 
 #include "block/accounting.h"
 #include "qapi/qmp/qobject.h"
 #include "qapi-types.h"
+#include "qemu/hbitmap.h"
 
 /* block.c */
 typedef struct BlockDriver BlockDriver;
@@ -472,8 +473,6 @@  void *qemu_try_blockalign(BlockDriverState *bs, size_t size);
 void *qemu_try_blockalign0(BlockDriverState *bs, size_t size);
 bool bdrv_qiov_is_aligned(BlockDriverState *bs, QEMUIOVector *qiov);
 
-struct HBitmapIter;
-typedef struct BdrvDirtyBitmap BdrvDirtyBitmap;
 BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs,
                                           uint32_t granularity,
                                           const char *name,
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 78fe6e8..0cf9d74 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -10,6 +10,7 @@  typedef struct AddressSpace AddressSpace;
 typedef struct AioContext AioContext;
 typedef struct AllwinnerAHCIState AllwinnerAHCIState;
 typedef struct AudioState AudioState;
+typedef struct BdrvDirtyBitmap BdrvDirtyBitmap;
 typedef struct BlockBackend BlockBackend;
 typedef struct BlockBackendRootState BlockBackendRootState;
 typedef struct BlockDriverState BlockDriverState;