| Message ID | 1465233367-8150-1-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 6 June 2016 at 18:16, Paolo Bonzini <pbonzini@redhat.com> wrote: > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > hw/intc/aspeed_vic.c | 1 - > hw/net/net_tx_pkt.c | 1 + > hw/net/net_tx_pkt.h | 1 - > hw/timer/mc146818rtc.c | 1 - > hw/usb/xen-usb.c | 5 +---- > include/exec/hwaddr.h | 2 -- > include/hw/xen/xen.h | 1 - > include/qemu/fifo32.h | 1 - > replay/replay-char.c | 4 ---- > 9 files changed, 2 insertions(+), 15 deletions(-) I think most or all of these are already fixed in patches in the qemu-trivial queue (which aren't in master yet because of a bounced pullreq for some other failure). thanks -- PMM
On 06/06/2016 19:55, Peter Maydell wrote: >> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> >> > --- >> > hw/intc/aspeed_vic.c | 1 - >> > hw/net/net_tx_pkt.c | 1 + >> > hw/net/net_tx_pkt.h | 1 - >> > hw/timer/mc146818rtc.c | 1 - >> > hw/usb/xen-usb.c | 5 +---- >> > include/exec/hwaddr.h | 2 -- >> > include/hw/xen/xen.h | 1 - >> > include/qemu/fifo32.h | 1 - >> > replay/replay-char.c | 4 ---- >> > 9 files changed, 2 insertions(+), 15 deletions(-) > I think most or all of these are already fixed in patches > in the qemu-trivial queue (which aren't in master yet because > of a bounced pullreq for some other failure). Good, I'm not hurrying this one in so I'll rebase after the qemu- trivial pull request goes in. Thanks, Paolo
diff --git a/hw/intc/aspeed_vic.c b/hw/intc/aspeed_vic.c index 725d5b6..2370e74 100644 --- a/hw/intc/aspeed_vic.c +++ b/hw/intc/aspeed_vic.c @@ -28,7 +28,6 @@ */ #include "qemu/osdep.h" -#include <inttypes.h> #include "hw/intc/aspeed_vic.h" #include "qemu/bitops.h" #include "qemu/log.h" diff --git a/hw/net/net_tx_pkt.c b/hw/net/net_tx_pkt.c index e4478be..efd43b4 100644 --- a/hw/net/net_tx_pkt.c +++ b/hw/net/net_tx_pkt.c @@ -15,6 +15,7 @@ * */ +#include "qemu/osdep.h" #include "net_tx_pkt.h" #include "net/eth.h" #include "net/checksum.h" diff --git a/hw/net/net_tx_pkt.h b/hw/net/net_tx_pkt.h index 07b9a20..212ecc6 100644 --- a/hw/net/net_tx_pkt.h +++ b/hw/net/net_tx_pkt.h @@ -18,7 +18,6 @@ #ifndef NET_TX_PKT_H #define NET_TX_PKT_H -#include "qemu/osdep.h" #include "net/eth.h" #include "exec/hwaddr.h" diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 2ac0fd3..a11b8b4 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -22,7 +22,6 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "config-target.h" #include "qemu/cutils.h" #include "qemu/bcd.h" #include "hw/hw.h" diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c index 09e9656..0fd34c6 100644 --- a/hw/usb/xen-usb.c +++ b/hw/usb/xen-usb.c @@ -19,12 +19,9 @@ * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include <libusb.h> -#include <stdio.h> -#include <sys/types.h> -#include <sys/time.h> -#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/config-file.h" #include "hw/sysbus.h" diff --git a/include/exec/hwaddr.h b/include/exec/hwaddr.h index bb41588..c9eb78f 100644 --- a/include/exec/hwaddr.h +++ b/include/exec/hwaddr.h @@ -3,8 +3,6 @@ #ifndef HWADDR_H #define HWADDR_H -#include <inttypes.h> - #define HWADDR_BITS 64 /* hwaddr is the type of a physical address (its size can be different from 'target_ulong'). */ diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 6365483..b2cd992 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -8,7 +8,6 @@ */ #include "qemu-common.h" -#include "qemu/typedefs.h" #include "exec/cpu-common.h" #include "hw/irq.h" diff --git a/include/qemu/fifo32.h b/include/qemu/fifo32.h index 2e5a0cc..4e9fd1b 100644 --- a/include/qemu/fifo32.h +++ b/include/qemu/fifo32.h @@ -15,7 +15,6 @@ #ifndef FIFO32_H #define FIFO32_H -#include "qemu/osdep.h" #include "qemu/fifo8.h" typedef struct { diff --git a/replay/replay-char.c b/replay/replay-char.c index 23b6922..edf46ab 100755 --- a/replay/replay-char.c +++ b/replay/replay-char.c @@ -9,10 +9,6 @@ * */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - #include "qemu/osdep.h" #include "qemu/error-report.h" #include "sysemu/replay.h"
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- hw/intc/aspeed_vic.c | 1 - hw/net/net_tx_pkt.c | 1 + hw/net/net_tx_pkt.h | 1 - hw/timer/mc146818rtc.c | 1 - hw/usb/xen-usb.c | 5 +---- include/exec/hwaddr.h | 2 -- include/hw/xen/xen.h | 1 - include/qemu/fifo32.h | 1 - replay/replay-char.c | 4 ---- 9 files changed, 2 insertions(+), 15 deletions(-)