[Qemu-devel] [PATCH 1/2] .gitignore update

[Qemu-devel] [PATCH 1/2] .gitignore update

[David Gibson]

This adds a few previously missing generated files to .gitignore: the
qemu-bridge-helper binary, and the linuxboot and multiboot images from
pc-bios/optionrom.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 .gitignore                   |    1 +
 pc-bios/optionrom/.gitignore |    5 +++++
 2 files changed, 6 insertions(+), 0 deletions(-)
 create mode 100644 pc-bios/optionrom/.gitignore

diff --git a/.gitignore b/.gitignore
index 81b1510..b290954 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,7 @@ qemu-img-cmds.texi
 qemu-img-cmds.h
 qemu-io
 qemu-ga
+qemu-bridge-helper
 qemu-monitor.texi
 QMP/qmp-commands.txt
 test-coroutine
diff --git a/pc-bios/optionrom/.gitignore b/pc-bios/optionrom/.gitignore
new file mode 100644
index 0000000..57b036c
--- /dev/null
+++ b/pc-bios/optionrom/.gitignore
@@ -0,0 +1,5 @@
+linuxboot.img
+linuxboot.raw
+multiboot.img
+kvmvapic.img
+kvmvapic.raw
-- 
1.7.9.1

[Qemu-devel] [PATCH 2/2] cache-utils.h needs stdint.h for uintptr_t

[David Gibson]

cache-utils.h uses the C99 standard uintptr_t type.  However, that type
comes from stdint.h which is not #included before cache-utils.h in all
configurations.  This patch adds the necessary include to fix this.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 cache-utils.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/cache-utils.h b/cache-utils.h
index 04a6e2e..b0f1786 100644
--- a/cache-utils.h
+++ b/cache-utils.h
@@ -1,6 +1,8 @@
 #ifndef QEMU_CACHE_UTILS_H
 #define QEMU_CACHE_UTILS_H
 
+#include <stdint.h>
+
 #if defined(_ARCH_PPC)
 struct qemu_cache_conf {
     unsigned long dcache_bsize;
-- 
1.7.9.1

Re: [Qemu-devel] [PATCH 2/2] cache-utils.h needs stdint.h for uintptr_t

[Stefan Weil]

Am 08.03.2012 02:09, schrieb David Gibson:
> cache-utils.h uses the C99 standard uintptr_t type.  However, that type
> comes from stdint.h which is not #included before cache-utils.h in all
> configurations.  This patch adds the necessary include to fix this.
>
> Signed-off-by: David Gibson<david@gibson.dropbear.id.au>
> ---
>   cache-utils.h |    2 ++
>   1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/cache-utils.h b/cache-utils.h
> index 04a6e2e..b0f1786 100644
> --- a/cache-utils.h
> +++ b/cache-utils.h
> @@ -1,6 +1,8 @@
>   #ifndef QEMU_CACHE_UTILS_H
>   #define QEMU_CACHE_UTILS_H
>
> +#include<stdint.h>
> +
>   #if defined(_ARCH_PPC)
>   struct qemu_cache_conf {
>       unsigned long dcache_bsize;

The include statement is only needed for _ARCH_PPC.

See http://patchwork.ozlabs.org/patch/144763/ which
fixes the same issue.

Anthony, Blue, could someone please commit my patch?

Regards,

Stefan W.

Re: [Qemu-devel] [PATCH 2/2] cache-utils.h needs stdint.h for uintptr_t

[David Gibson]

On Thu, Mar 08, 2012 at 07:10:38AM +0100, Stefan Weil wrote:
> Am 08.03.2012 02:09, schrieb David Gibson:
> >cache-utils.h uses the C99 standard uintptr_t type.  However, that type
> >comes from stdint.h which is not #included before cache-utils.h in all
> >configurations.  This patch adds the necessary include to fix this.
> >
> >Signed-off-by: David Gibson<david@gibson.dropbear.id.au>
> >---
> >  cache-utils.h |    2 ++
> >  1 files changed, 2 insertions(+), 0 deletions(-)
> >
> >diff --git a/cache-utils.h b/cache-utils.h
> >index 04a6e2e..b0f1786 100644
> >--- a/cache-utils.h
> >+++ b/cache-utils.h
> >@@ -1,6 +1,8 @@
> >  #ifndef QEMU_CACHE_UTILS_H
> >  #define QEMU_CACHE_UTILS_H
> >
> >+#include<stdint.h>
> >+
> >  #if defined(_ARCH_PPC)
> >  struct qemu_cache_conf {
> >      unsigned long dcache_bsize;
> 
> The include statement is only needed for _ARCH_PPC.
> 
> See http://patchwork.ozlabs.org/patch/144763/ which
> fixes the same issue.

Ok, cool, didn't spot that one.

> Anthony, Blue, could someone please commit my patch?
> 
> Regards,
> 
> Stefan W.
> 

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

Re: [Qemu-devel] [PATCH 1/2] .gitignore update

[Stefan Hajnoczi]

On Thu, Mar 08, 2012 at 12:09:40PM +1100, David Gibson wrote:
> This adds a few previously missing generated files to .gitignore: the
> qemu-bridge-helper binary, and the linuxboot and multiboot images from
> pc-bios/optionrom.
> 
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> ---
>  .gitignore                   |    1 +
>  pc-bios/optionrom/.gitignore |    5 +++++
>  2 files changed, 6 insertions(+), 0 deletions(-)
>  create mode 100644 pc-bios/optionrom/.gitignore

Only taking Patch 1, since Patch 2 seems to be covered by a
yet-to-be-merged patch on the list.

Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches

Stefan