Patchwork remove duplicate typedef

login
register
mail settings
Submitter Paolo Bonzini
Date Sept. 21, 2011, 9:16 a.m.
Message ID <1316596582-9417-1-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/115718/
State New
Headers show

Comments

Paolo Bonzini - Sept. 21, 2011, 9:16 a.m.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
	This is failing with some versions of GCC but not others,
	apparently.

 qemu-common.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
Stefan Hajnoczi - Sept. 21, 2011, 10:07 a.m.
On Wed, Sep 21, 2011 at 10:16 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> diff --git a/qemu-common.h b/qemu-common.h
> index ef9a2bb..404c421 100644
> --- a/qemu-common.h
> +++ b/qemu-common.h
> @@ -18,7 +18,6 @@ typedef struct DeviceState DeviceState;
>
>  struct Monitor;
>  typedef struct Monitor Monitor;
> -typedef struct QEMUSGList QEMUSGList;

Weird I don't have this in my tree.  There's nothing to remove but a
quick probe of history also doesn't show it ever being there.

Stefan
Paolo Bonzini - Sept. 21, 2011, 10:14 a.m.
On 09/21/2011 12:07 PM, Stefan Hajnoczi wrote:
> On Wed, Sep 21, 2011 at 10:16 AM, Paolo Bonzini<pbonzini@redhat.com>  wrote:
>> diff --git a/qemu-common.h b/qemu-common.h
>> index ef9a2bb..404c421 100644
>> --- a/qemu-common.h
>> +++ b/qemu-common.h
>> @@ -18,7 +18,6 @@ typedef struct DeviceState DeviceState;
>>
>>   struct Monitor;
>>   typedef struct Monitor Monitor;
>> -typedef struct QEMUSGList QEMUSGList;
>
> Weird I don't have this in my tree.  There's nothing to remove but a
> quick probe of history also doesn't show it ever being there.

Doubly weird.  I have it in my development branch, but not in the 
integration branch from which I sent patches to Kevin.  So it didn't 
reach upstream indeed.

Paolo
Kevin Wolf - Sept. 21, 2011, 10:15 a.m.
Am 21.09.2011 12:07, schrieb Stefan Hajnoczi:
> On Wed, Sep 21, 2011 at 10:16 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
>> diff --git a/qemu-common.h b/qemu-common.h
>> index ef9a2bb..404c421 100644
>> --- a/qemu-common.h
>> +++ b/qemu-common.h
>> @@ -18,7 +18,6 @@ typedef struct DeviceState DeviceState;
>>
>>  struct Monitor;
>>  typedef struct Monitor Monitor;
>> -typedef struct QEMUSGList QEMUSGList;
> 
> Weird I don't have this in my tree.  There's nothing to remove but a
> quick probe of history also doesn't show it ever being there.

One of Paolo's block patches added it, I dropped it before sending the
pull request (and looks like I forgot to send a mail about it). So I
guess he's on his development branch and the rebase left a patch with
this hunk in place.

Kevin

Patch

diff --git a/qemu-common.h b/qemu-common.h
index ef9a2bb..404c421 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -18,7 +18,6 @@  typedef struct DeviceState DeviceState;
 
 struct Monitor;
 typedef struct Monitor Monitor;
-typedef struct QEMUSGList QEMUSGList;
 
 /* we put basic includes here to avoid repeating them in device drivers */
 #include <stdlib.h>