diff mbox series

qom: Fix "typddef" typo

Message ID 20201007220255.1170167-1-ehabkost@redhat.com
State New
Headers show
Series qom: Fix "typddef" typo | expand

Commit Message

Eduardo Habkost Oct. 7, 2020, 10:02 p.m. UTC
Fix typo introduced in the C11 #ifdef for qemu_max_align_t.  It
never caused any problems because we always compile using
-std=gnu99.

Fixes: 4c880f363e9e ("qom: Allow objects to be allocated with increased alignment")
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qom/object.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Marc-André Lureau Oct. 8, 2020, 7:01 a.m. UTC | #1
On Thu, Oct 8, 2020 at 2:04 AM Eduardo Habkost <ehabkost@redhat.com> wrote:

> Fix typo introduced in the C11 #ifdef for qemu_max_align_t.  It
> never caused any problems because we always compile using
> -std=gnu99.
>
> Fixes: 4c880f363e9e ("qom: Allow objects to be allocated with increased
> alignment")
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>


> ---
>  qom/object.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/qom/object.c b/qom/object.c
> index c335dce7e4..125dabd28b 100644
> --- a/qom/object.c
> +++ b/qom/object.c
> @@ -692,7 +692,7 @@ static void object_finalize(void *data)
>
>  /* Find the minimum alignment guaranteed by the system malloc. */
>  #if __STDC_VERSION__ >= 201112L
> -typddef max_align_t qemu_max_align_t;
> +typedef max_align_t qemu_max_align_t;
>  #else
>  typedef union {
>      long l;
> --
> 2.26.2
>
>
>
Philippe Mathieu-Daudé Oct. 8, 2020, 7:44 a.m. UTC | #2
On 10/8/20 12:02 AM, Eduardo Habkost wrote:
> Fix typo introduced in the C11 #ifdef for qemu_max_align_t.  It
> never caused any problems because we always compile using
> -std=gnu99.
> 
> Fixes: 4c880f363e9e ("qom: Allow objects to be allocated with increased alignment")
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>  qom/object.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/qom/object.c b/qom/object.c
> index c335dce7e4..125dabd28b 100644
> --- a/qom/object.c
> +++ b/qom/object.c
> @@ -692,7 +692,7 @@ static void object_finalize(void *data)
>  
>  /* Find the minimum alignment guaranteed by the system malloc. */
>  #if __STDC_VERSION__ >= 201112L
> -typddef max_align_t qemu_max_align_t;
> +typedef max_align_t qemu_max_align_t;

Oops
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

>  #else
>  typedef union {
>      long l;
>
Laurent Vivier Oct. 12, 2020, 2:32 p.m. UTC | #3
Le 08/10/2020 à 00:02, Eduardo Habkost a écrit :
> Fix typo introduced in the C11 #ifdef for qemu_max_align_t.  It

> never caused any problems because we always compile using

> -std=gnu99.

> 

> Fixes: 4c880f363e9e ("qom: Allow objects to be allocated with increased alignment")

> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

> ---

>  qom/object.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/qom/object.c b/qom/object.c

> index c335dce7e4..125dabd28b 100644

> --- a/qom/object.c

> +++ b/qom/object.c

> @@ -692,7 +692,7 @@ static void object_finalize(void *data)

>  

>  /* Find the minimum alignment guaranteed by the system malloc. */

>  #if __STDC_VERSION__ >= 201112L

> -typddef max_align_t qemu_max_align_t;

> +typedef max_align_t qemu_max_align_t;

>  #else

>  typedef union {

>      long l;

> 


Applied to my trivial-patches branch.

Thanks,
Laurent
Daniel P. Berrangé Oct. 12, 2020, 2:45 p.m. UTC | #4
On Wed, Oct 07, 2020 at 06:02:55PM -0400, Eduardo Habkost wrote:
> Fix typo introduced in the C11 #ifdef for qemu_max_align_t.  It

> never caused any problems because we always compile using

> -std=gnu99.

> 

> Fixes: 4c880f363e9e ("qom: Allow objects to be allocated with increased alignment")

> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

> ---

>  qom/object.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/qom/object.c b/qom/object.c

> index c335dce7e4..125dabd28b 100644

> --- a/qom/object.c

> +++ b/qom/object.c

> @@ -692,7 +692,7 @@ static void object_finalize(void *data)

>  

>  /* Find the minimum alignment guaranteed by the system malloc. */

>  #if __STDC_VERSION__ >= 201112L

> -typddef max_align_t qemu_max_align_t;

> +typedef max_align_t qemu_max_align_t;

>  #else


Why do we need / have this first part of the #if at all ?  We
unconditionally add  -std=gnu99, so surely this has always
been dead code and can just be better deleted.

>  typedef union {

>      long l;

> -- 

> 2.26.2

> 


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
Laurent Vivier Oct. 12, 2020, 3:24 p.m. UTC | #5
Le 12/10/2020 à 16:45, Daniel P. Berrangé a écrit :
> On Wed, Oct 07, 2020 at 06:02:55PM -0400, Eduardo Habkost wrote:

>> Fix typo introduced in the C11 #ifdef for qemu_max_align_t.  It

>> never caused any problems because we always compile using

>> -std=gnu99.

>>

>> Fixes: 4c880f363e9e ("qom: Allow objects to be allocated with increased alignment")

>> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

>> ---

>>  qom/object.c | 2 +-

>>  1 file changed, 1 insertion(+), 1 deletion(-)

>>

>> diff --git a/qom/object.c b/qom/object.c

>> index c335dce7e4..125dabd28b 100644

>> --- a/qom/object.c

>> +++ b/qom/object.c

>> @@ -692,7 +692,7 @@ static void object_finalize(void *data)

>>  

>>  /* Find the minimum alignment guaranteed by the system malloc. */

>>  #if __STDC_VERSION__ >= 201112L

>> -typddef max_align_t qemu_max_align_t;

>> +typedef max_align_t qemu_max_align_t;

>>  #else

> 

> Why do we need / have this first part of the #if at all ?  We

> unconditionally add  -std=gnu99, so surely this has always

> been dead code and can just be better deleted.

> 


I've removed the patch from my queue.

But perhaps it will be needed in the future if we switch to a newer
standard version?

Thanks,
Laurent
Eduardo Habkost Oct. 13, 2020, 1:16 p.m. UTC | #6
On Mon, Oct 12, 2020 at 03:45:12PM +0100, Daniel P. Berrangé wrote:
> On Wed, Oct 07, 2020 at 06:02:55PM -0400, Eduardo Habkost wrote:
> > Fix typo introduced in the C11 #ifdef for qemu_max_align_t.  It
> > never caused any problems because we always compile using
> > -std=gnu99.
> > 
> > Fixes: 4c880f363e9e ("qom: Allow objects to be allocated with increased alignment")
> > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> > ---
> >  qom/object.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/qom/object.c b/qom/object.c
> > index c335dce7e4..125dabd28b 100644
> > --- a/qom/object.c
> > +++ b/qom/object.c
> > @@ -692,7 +692,7 @@ static void object_finalize(void *data)
> >  
> >  /* Find the minimum alignment guaranteed by the system malloc. */
> >  #if __STDC_VERSION__ >= 201112L
> > -typddef max_align_t qemu_max_align_t;
> > +typedef max_align_t qemu_max_align_t;
> >  #else
> 
> Why do we need / have this first part of the #if at all ?  We
> unconditionally add  -std=gnu99, so surely this has always
> been dead code and can just be better deleted.

It has the same function as a comment saying "we can use
max_align_t as soon as we move to C11".  The difference is that
it doesn't need us to manually change the code once we do.
diff mbox series

Patch

diff --git a/qom/object.c b/qom/object.c
index c335dce7e4..125dabd28b 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -692,7 +692,7 @@  static void object_finalize(void *data)
 
 /* Find the minimum alignment guaranteed by the system malloc. */
 #if __STDC_VERSION__ >= 201112L
-typddef max_align_t qemu_max_align_t;
+typedef max_align_t qemu_max_align_t;
 #else
 typedef union {
     long l;