* [Qemu-devel] [PULL 0/9] Trivial patches for 28 January to 10 February 2012
@ 2012-02-10 11:34 Stefan Hajnoczi
2012-02-10 11:34 ` [Qemu-devel] [PATCH 1/9] linux-user: fail execve() if env/args too big Stefan Hajnoczi
` (9 more replies)
0 siblings, 10 replies; 13+ messages in thread
From: Stefan Hajnoczi @ 2012-02-10 11:34 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
The following changes since commit 57c83dacfe179bf061b8fa79d9553ebabe4d2ff4:
make: Remove duplicate use of GLIB_CFLAGS (2012-02-09 20:44:38 +0400)
are available in the git repository at:
git://github.com/stefanha/qemu.git trivial-patches
Benjamin MARSILI (1):
net: remove extra spaces in help messages
Hervé Poussineau (1):
ide: fix compilation errors when DEBUG_IDE is set
Luiz Capitulino (1):
virtio: Remove unneeded g_free() check in virtio_cleanup()
Paul Brook (1):
linux-user: brk() debugging
Peter Maydell (2):
CODING_STYLE: Clarify style for enum and function type names
vl.c: Fix typo in variable name
Stefan Weil (1):
fmopl: Fix typo in function name
Ulrich Hecht (1):
linux-user: fail execve() if env/args too big
陳韋任 (1):
cpu-exec.c: Correct comment about this file and indentation cleanup
CODING_STYLE | 3 ++-
cpu-exec.c | 10 +++++-----
hw/fmopl.c | 4 ++--
hw/ide/pci.c | 2 +-
hw/ide/piix.c | 4 ++--
hw/virtio.c | 3 +--
linux-user/syscall.c | 25 ++++++++++++++++++-------
net/socket.c | 8 ++++----
vl.c | 10 +++++-----
9 files changed, 40 insertions(+), 29 deletions(-)
--
1.7.8.3
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH 1/9] linux-user: fail execve() if env/args too big
2012-02-10 11:34 [Qemu-devel] [PULL 0/9] Trivial patches for 28 January to 10 February 2012 Stefan Hajnoczi
@ 2012-02-10 11:34 ` Stefan Hajnoczi
2012-02-10 11:34 ` [Qemu-devel] [PATCH 2/9] CODING_STYLE: Clarify style for enum and function type names Stefan Hajnoczi
` (8 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Stefan Hajnoczi @ 2012-02-10 11:34 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Ulrich Hecht <uli@suse.de>
If the host's page size is equal to or smaller than the target's, native
execve() will fail appropriately with E2BIG if called with too big an
environment for the target to handle. It may falsely succeed, however, if
the host's page size is bigger, and feed the executed target process an
environment that is too big for it to handle, at which point QEMU barfs and
exits, confusing procmail's autoconf script and causing the build to fail.
This patch makes sure that execve() will return E2BIG if the environment is
too large for the target.
Signed-off-by: Ulrich Hecht <uli@suse.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
linux-user/syscall.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index ee8899e..e868ec6 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -4949,6 +4949,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
abi_ulong guest_envp;
abi_ulong addr;
char **q;
+ int total_size = 0;
argc = 0;
guest_argp = arg2;
@@ -4980,6 +4981,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
break;
if (!(*q = lock_user_string(addr)))
goto execve_efault;
+ total_size += strlen(*q) + 1;
}
*q = NULL;
@@ -4991,9 +4993,16 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
break;
if (!(*q = lock_user_string(addr)))
goto execve_efault;
+ total_size += strlen(*q) + 1;
}
*q = NULL;
+ /* This case will not be caught by the host's execve() if its
+ page size is bigger than the target's. */
+ if (total_size > MAX_ARG_PAGES * TARGET_PAGE_SIZE) {
+ ret = -TARGET_E2BIG;
+ goto execve_end;
+ }
if (!(p = lock_user_string(arg1)))
goto execve_efault;
ret = get_errno(execve(p, argp, envp));
--
1.7.8.3
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH 2/9] CODING_STYLE: Clarify style for enum and function type names
2012-02-10 11:34 [Qemu-devel] [PULL 0/9] Trivial patches for 28 January to 10 February 2012 Stefan Hajnoczi
2012-02-10 11:34 ` [Qemu-devel] [PATCH 1/9] linux-user: fail execve() if env/args too big Stefan Hajnoczi
@ 2012-02-10 11:34 ` Stefan Hajnoczi
2012-02-10 11:34 ` [Qemu-devel] [PATCH 3/9] cpu-exec.c: Correct comment about this file and indentation cleanup Stefan Hajnoczi
` (7 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Stefan Hajnoczi @ 2012-02-10 11:34 UTC (permalink / raw)
To: Anthony Liguori; +Cc: Peter Maydell, qemu-devel, Stefan Hajnoczi
From: Peter Maydell <peter.maydell@linaro.org>
Clarify that enum type names and function type names should follow
the CamelCase style used for structured type names.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
CODING_STYLE | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/CODING_STYLE b/CODING_STYLE
index 6e61c49..7c82d4d 100644
--- a/CODING_STYLE
+++ b/CODING_STYLE
@@ -44,7 +44,8 @@ Rationale:
3. Naming
Variables are lower_case_with_underscores; easy to type and read. Structured
-type names are in CamelCase; harder to type but standing out. Scalar type
+type names are in CamelCase; harder to type but standing out. Enum type
+names and function type names should also be in CamelCase. Scalar type
names are lower_case_with_underscores_ending_with_a_t, like the POSIX
uint64_t and family. Note that this last convention contradicts POSIX
and is therefore likely to be changed.
--
1.7.8.3
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH 3/9] cpu-exec.c: Correct comment about this file and indentation cleanup
2012-02-10 11:34 [Qemu-devel] [PULL 0/9] Trivial patches for 28 January to 10 February 2012 Stefan Hajnoczi
2012-02-10 11:34 ` [Qemu-devel] [PATCH 1/9] linux-user: fail execve() if env/args too big Stefan Hajnoczi
2012-02-10 11:34 ` [Qemu-devel] [PATCH 2/9] CODING_STYLE: Clarify style for enum and function type names Stefan Hajnoczi
@ 2012-02-10 11:34 ` Stefan Hajnoczi
2012-02-10 11:34 ` [Qemu-devel] [PATCH 4/9] ide: fix compilation errors when DEBUG_IDE is set Stefan Hajnoczi
` (6 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Stefan Hajnoczi @ 2012-02-10 11:34 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, 陳韋任, Stefan Hajnoczi
From: 陳韋任 <chenwj@iis.sinica.edu.tw>
Each target uses the #define macro (in target-xxx/cpu.h) to rename
cpu_exec (cpu-exec.c) to cpu_xxx_exec, then defines its own cpu_loop
which calls cpu_xxx_exec. So basically, cpu-exec.c is not only the i386
emulator main execution loop. This patch corrects the comment of this
file and does indentation cleanup.
Signed-off-by: Chen Wei-Ren (陳韋任) <chenwj@iis.sinica.edu.tw>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
cpu-exec.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cpu-exec.c b/cpu-exec.c
index a9fa608..2c2d24e 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -1,5 +1,5 @@
/*
- * i386 emulator main execution loop
+ * emulator main execution loop
*
* Copyright (c) 2003-2005 Fabrice Bellard
*
@@ -304,7 +304,7 @@ int cpu_exec(CPUState *env)
env->hflags2 |= HF2_NMI_MASK;
do_interrupt_x86_hardirq(env, EXCP02_NMI, 1);
next_tb = 0;
- } else if (interrupt_request & CPU_INTERRUPT_MCE) {
+ } else if (interrupt_request & CPU_INTERRUPT_MCE) {
env->interrupt_request &= ~CPU_INTERRUPT_MCE;
do_interrupt_x86_hardirq(env, EXCP12_MCHK, 0);
next_tb = 0;
@@ -390,7 +390,7 @@ int cpu_exec(CPUState *env)
next_tb = 0;
}
}
- }
+ }
#elif defined(TARGET_ARM)
if (interrupt_request & CPU_INTERRUPT_FIQ
&& !(env->uncached_cpsr & CPSR_F)) {
@@ -429,7 +429,7 @@ int cpu_exec(CPUState *env)
{
int idx = -1;
/* ??? This hard-codes the OSF/1 interrupt levels. */
- switch (env->pal_mode ? 7 : env->ps & PS_INT_MASK) {
+ switch (env->pal_mode ? 7 : env->ps & PS_INT_MASK) {
case 0 ... 3:
if (interrupt_request & CPU_INTERRUPT_HARD) {
idx = EXCP_DEV_INTERRUPT;
@@ -562,7 +562,7 @@ int cpu_exec(CPUState *env)
barrier();
if (likely(!env->exit_request)) {
tc_ptr = tb->tc_ptr;
- /* execute the generated code */
+ /* execute the generated code */
next_tb = tcg_qemu_tb_exec(env, tc_ptr);
if ((next_tb & 3) == 2) {
/* Instruction counter expired. */
--
1.7.8.3
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH 4/9] ide: fix compilation errors when DEBUG_IDE is set
2012-02-10 11:34 [Qemu-devel] [PULL 0/9] Trivial patches for 28 January to 10 February 2012 Stefan Hajnoczi
` (2 preceding siblings ...)
2012-02-10 11:34 ` [Qemu-devel] [PATCH 3/9] cpu-exec.c: Correct comment about this file and indentation cleanup Stefan Hajnoczi
@ 2012-02-10 11:34 ` Stefan Hajnoczi
2012-02-10 11:34 ` [Qemu-devel] [PATCH 5/9] vl.c: Fix typo in variable name Stefan Hajnoczi
` (5 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Stefan Hajnoczi @ 2012-02-10 11:34 UTC (permalink / raw)
To: Anthony Liguori; +Cc: Hervé Poussineau, qemu-devel, Stefan Hajnoczi
From: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
hw/ide/pci.c | 2 +-
hw/ide/piix.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 246dd57..88c0942 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -336,7 +336,7 @@ static uint64_t bmdma_addr_read(void *opaque, target_phys_addr_t addr,
data = (bm->addr >> (addr * 8)) & mask;
#ifdef DEBUG_IDE
- printf("%s: 0x%08x\n", __func__, (unsigned)*data);
+ printf("%s: 0x%08x\n", __func__, (unsigned)data);
#endif
return data;
}
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index bf4465b..76cf209 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -53,7 +53,7 @@ static uint64_t bmdma_read(void *opaque, target_phys_addr_t addr, unsigned size)
break;
}
#ifdef DEBUG_IDE
- printf("bmdma: readb 0x%02x : 0x%02x\n", addr, val);
+ printf("bmdma: readb 0x%02x : 0x%02x\n", (uint8_t)addr, val);
#endif
return val;
}
@@ -68,7 +68,7 @@ static void bmdma_write(void *opaque, target_phys_addr_t addr,
}
#ifdef DEBUG_IDE
- printf("bmdma: writeb 0x%02x : 0x%02x\n", addr, val);
+ printf("bmdma: writeb 0x%02x : 0x%02x\n", (uint8_t)addr, (uint8_t)val);
#endif
switch(addr & 3) {
case 0:
--
1.7.8.3
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH 5/9] vl.c: Fix typo in variable name
2012-02-10 11:34 [Qemu-devel] [PULL 0/9] Trivial patches for 28 January to 10 February 2012 Stefan Hajnoczi
` (3 preceding siblings ...)
2012-02-10 11:34 ` [Qemu-devel] [PATCH 4/9] ide: fix compilation errors when DEBUG_IDE is set Stefan Hajnoczi
@ 2012-02-10 11:34 ` Stefan Hajnoczi
2012-02-10 11:34 ` [Qemu-devel] [PATCH 6/9] fmopl: Fix typo in function name Stefan Hajnoczi
` (4 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Stefan Hajnoczi @ 2012-02-10 11:34 UTC (permalink / raw)
To: Anthony Liguori; +Cc: Peter Maydell, qemu-devel, Stefan Hajnoczi
From: Peter Maydell <peter.maydell@linaro.org>
Fix a typo in a local variable name.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
vl.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/vl.c b/vl.c
index 63dd725..c4b3aab 100644
--- a/vl.c
+++ b/vl.c
@@ -2030,7 +2030,7 @@ static int configure_accelerator(void)
const char *p = NULL;
char buf[10];
int i, ret;
- bool accel_initalised = 0;
+ bool accel_initialised = 0;
bool init_failed = 0;
QemuOptsList *list = qemu_find_opts("machine");
@@ -2043,7 +2043,7 @@ static int configure_accelerator(void)
p = "tcg";
}
- while (!accel_initalised && *p != '\0') {
+ while (!accel_initialised && *p != '\0') {
if (*p == ':') {
p++;
}
@@ -2064,7 +2064,7 @@ static int configure_accelerator(void)
}
*(accel_list[i].allowed) = 0;
} else {
- accel_initalised = 1;
+ accel_initialised = 1;
}
break;
}
@@ -2074,7 +2074,7 @@ static int configure_accelerator(void)
}
}
- if (!accel_initalised) {
+ if (!accel_initialised) {
fprintf(stderr, "No accelerator found!\n");
exit(1);
}
@@ -2083,7 +2083,7 @@ static int configure_accelerator(void)
fprintf(stderr, "Back to %s accelerator.\n", accel_list[i].name);
}
- return !accel_initalised;
+ return !accel_initialised;
}
void qemu_add_exit_notifier(Notifier *notify)
--
1.7.8.3
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH 6/9] fmopl: Fix typo in function name
2012-02-10 11:34 [Qemu-devel] [PULL 0/9] Trivial patches for 28 January to 10 February 2012 Stefan Hajnoczi
` (4 preceding siblings ...)
2012-02-10 11:34 ` [Qemu-devel] [PATCH 5/9] vl.c: Fix typo in variable name Stefan Hajnoczi
@ 2012-02-10 11:34 ` Stefan Hajnoczi
2012-02-10 11:34 ` [Qemu-devel] [PATCH 7/9] net: remove extra spaces in help messages Stefan Hajnoczi
` (3 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Stefan Hajnoczi @ 2012-02-10 11:34 UTC (permalink / raw)
To: Anthony Liguori; +Cc: Stefan Weil, qemu-devel, Stefan Hajnoczi
From: Stefan Weil <sw@weilnetz.de>
Fix a typo in a local function name.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
hw/fmopl.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/fmopl.c b/hw/fmopl.c
index 734d2f4..f0a0234 100644
--- a/hw/fmopl.c
+++ b/hw/fmopl.c
@@ -733,7 +733,7 @@ INLINE void CSMKeyControll(OPL_CH *CH)
}
/* ---------- opl initialize ---------- */
-static void OPL_initalize(FM_OPL *OPL)
+static void OPL_initialize(FM_OPL *OPL)
{
int fn;
@@ -1239,7 +1239,7 @@ FM_OPL *OPLCreate(int type, int clock, int rate)
OPL->rate = rate;
OPL->max_ch = max_ch;
/* init grobal tables */
- OPL_initalize(OPL);
+ OPL_initialize(OPL);
/* reset chip */
OPLResetChip(OPL);
#ifdef OPL_OUTPUT_LOG
--
1.7.8.3
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH 7/9] net: remove extra spaces in help messages
2012-02-10 11:34 [Qemu-devel] [PULL 0/9] Trivial patches for 28 January to 10 February 2012 Stefan Hajnoczi
` (5 preceding siblings ...)
2012-02-10 11:34 ` [Qemu-devel] [PATCH 6/9] fmopl: Fix typo in function name Stefan Hajnoczi
@ 2012-02-10 11:34 ` Stefan Hajnoczi
2012-02-17 6:34 ` Zhi Yong Wu
2012-02-10 11:34 ` [Qemu-devel] [PATCH 8/9] virtio: Remove unneeded g_free() check in virtio_cleanup() Stefan Hajnoczi
` (2 subsequent siblings)
9 siblings, 1 reply; 13+ messages in thread
From: Stefan Hajnoczi @ 2012-02-10 11:34 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi, Benjamin MARSILI
From: Benjamin MARSILI <mlspirat42@gmail.com>
Signed-off-by: Benjamin MARSILI <mlspirat42@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
net/socket.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/socket.c b/net/socket.c
index d4c2002..0bcf229 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -664,8 +664,8 @@ int net_init_socket(QemuOpts *opts,
qemu_opt_get(opts, "connect") ||
qemu_opt_get(opts, "listen") ||
qemu_opt_get(opts, "mcast")) {
- error_report("fd=, connect=, listen=\
- and mcast= is invalid with udp=");
+ error_report("fd=, connect=, listen="
+ " and mcast= is invalid with udp=");
return -1;
}
@@ -680,8 +680,8 @@ int net_init_socket(QemuOpts *opts,
return -1;
}
} else {
- error_report("-socket requires fd=, listen=, \
- connect=, mcast= or udp=");
+ error_report("-socket requires fd=, listen=,"
+ " connect=, mcast= or udp=");
return -1;
}
return 0;
--
1.7.8.3
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH 8/9] virtio: Remove unneeded g_free() check in virtio_cleanup()
2012-02-10 11:34 [Qemu-devel] [PULL 0/9] Trivial patches for 28 January to 10 February 2012 Stefan Hajnoczi
` (6 preceding siblings ...)
2012-02-10 11:34 ` [Qemu-devel] [PATCH 7/9] net: remove extra spaces in help messages Stefan Hajnoczi
@ 2012-02-10 11:34 ` Stefan Hajnoczi
2012-02-10 11:34 ` [Qemu-devel] [PATCH 9/9] linux-user: brk() debugging Stefan Hajnoczi
2012-02-17 13:53 ` [Qemu-devel] [PULL 0/9] Trivial patches for 28 January to 10 February 2012 Anthony Liguori
9 siblings, 0 replies; 13+ messages in thread
From: Stefan Hajnoczi @ 2012-02-10 11:34 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi, Luiz Capitulino
From: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
hw/virtio.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/hw/virtio.c b/hw/virtio.c
index 74cc038..064aecf 100644
--- a/hw/virtio.c
+++ b/hw/virtio.c
@@ -845,8 +845,7 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f)
void virtio_cleanup(VirtIODevice *vdev)
{
qemu_del_vm_change_state_handler(vdev->vmstate);
- if (vdev->config)
- g_free(vdev->config);
+ g_free(vdev->config);
g_free(vdev->vq);
g_free(vdev);
}
--
1.7.8.3
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH 9/9] linux-user: brk() debugging
2012-02-10 11:34 [Qemu-devel] [PULL 0/9] Trivial patches for 28 January to 10 February 2012 Stefan Hajnoczi
` (7 preceding siblings ...)
2012-02-10 11:34 ` [Qemu-devel] [PATCH 8/9] virtio: Remove unneeded g_free() check in virtio_cleanup() Stefan Hajnoczi
@ 2012-02-10 11:34 ` Stefan Hajnoczi
2012-02-17 13:53 ` [Qemu-devel] [PULL 0/9] Trivial patches for 28 January to 10 February 2012 Anthony Liguori
9 siblings, 0 replies; 13+ messages in thread
From: Stefan Hajnoczi @ 2012-02-10 11:34 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi, Paul Brook
From: Paul Brook <paul@codesourcery.com>
Fix format type mismatches in do_brk debug printfs.
Signed-off-by: Paul Brook <paul@codesourcery.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
linux-user/syscall.c | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index e868ec6..8a11213 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -756,14 +756,15 @@ abi_long do_brk(abi_ulong new_brk)
abi_long mapped_addr;
int new_alloc_size;
- DEBUGF_BRK("do_brk(%#010x) -> ", new_brk);
+ DEBUGF_BRK("do_brk(" TARGET_ABI_FMT_lx ") -> ", new_brk);
if (!new_brk) {
- DEBUGF_BRK("%#010x (!new_brk)\n", target_brk);
+ DEBUGF_BRK(TARGET_ABI_FMT_lx " (!new_brk)\n", target_brk);
return target_brk;
}
if (new_brk < target_original_brk) {
- DEBUGF_BRK("%#010x (new_brk < target_original_brk)\n", target_brk);
+ DEBUGF_BRK(TARGET_ABI_FMT_lx " (new_brk < target_original_brk)\n",
+ target_brk);
return target_brk;
}
@@ -776,7 +777,7 @@ abi_long do_brk(abi_ulong new_brk)
memset(g2h(target_brk), 0, new_brk - target_brk);
}
target_brk = new_brk;
- DEBUGF_BRK("%#010x (new_brk <= brk_page)\n", target_brk);
+ DEBUGF_BRK(TARGET_ABI_FMT_lx " (new_brk <= brk_page)\n", target_brk);
return target_brk;
}
@@ -803,7 +804,8 @@ abi_long do_brk(abi_ulong new_brk)
target_brk = new_brk;
brk_page = HOST_PAGE_ALIGN(target_brk);
- DEBUGF_BRK("%#010x (mapped_addr == brk_page)\n", target_brk);
+ DEBUGF_BRK(TARGET_ABI_FMT_lx " (mapped_addr == brk_page)\n",
+ target_brk);
return target_brk;
} else if (mapped_addr != -1) {
/* Mapped but at wrong address, meaning there wasn't actually
@@ -811,10 +813,10 @@ abi_long do_brk(abi_ulong new_brk)
*/
target_munmap(mapped_addr, new_alloc_size);
mapped_addr = -1;
- DEBUGF_BRK("%#010x (mapped_addr != -1)\n", target_brk);
+ DEBUGF_BRK(TARGET_ABI_FMT_lx " (mapped_addr != -1)\n", target_brk);
}
else {
- DEBUGF_BRK("%#010x (otherwise)\n", target_brk);
+ DEBUGF_BRK(TARGET_ABI_FMT_lx " (otherwise)\n", target_brk);
}
#if defined(TARGET_ALPHA)
--
1.7.8.3
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH 7/9] net: remove extra spaces in help messages
2012-02-10 11:34 ` [Qemu-devel] [PATCH 7/9] net: remove extra spaces in help messages Stefan Hajnoczi
@ 2012-02-17 6:34 ` Zhi Yong Wu
2012-02-17 6:53 ` Zhi Yong Wu
0 siblings, 1 reply; 13+ messages in thread
From: Zhi Yong Wu @ 2012-02-17 6:34 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: Anthony Liguori, qemu-devel, Benjamin MARSILI
I would like to know if some one is playing around with the patchset.
If yes, can you make one response? I am very interested in rebasing
it, and then playing with it.
On Fri, Feb 10, 2012 at 7:34 PM, Stefan Hajnoczi
<stefanha@linux.vnet.ibm.com> wrote:
> From: Benjamin MARSILI <mlspirat42@gmail.com>
>
> Signed-off-by: Benjamin MARSILI <mlspirat42@gmail.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
> ---
> net/socket.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/net/socket.c b/net/socket.c
> index d4c2002..0bcf229 100644
> --- a/net/socket.c
> +++ b/net/socket.c
> @@ -664,8 +664,8 @@ int net_init_socket(QemuOpts *opts,
> qemu_opt_get(opts, "connect") ||
> qemu_opt_get(opts, "listen") ||
> qemu_opt_get(opts, "mcast")) {
> - error_report("fd=, connect=, listen=\
> - and mcast= is invalid with udp=");
> + error_report("fd=, connect=, listen="
> + " and mcast= is invalid with udp=");
> return -1;
> }
>
> @@ -680,8 +680,8 @@ int net_init_socket(QemuOpts *opts,
> return -1;
> }
> } else {
> - error_report("-socket requires fd=, listen=, \
> - connect=, mcast= or udp=");
> + error_report("-socket requires fd=, listen=,"
> + " connect=, mcast= or udp=");
> return -1;
> }
> return 0;
> --
> 1.7.8.3
>
>
--
Regards,
Zhi Yong Wu
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH 7/9] net: remove extra spaces in help messages
2012-02-17 6:34 ` Zhi Yong Wu
@ 2012-02-17 6:53 ` Zhi Yong Wu
0 siblings, 0 replies; 13+ messages in thread
From: Zhi Yong Wu @ 2012-02-17 6:53 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: Anthony Liguori, qemu-devel, Benjamin MARSILI
sorry, made one mistake
On Fri, Feb 17, 2012 at 2:34 PM, Zhi Yong Wu <zwu.kernel@gmail.com> wrote:
> I would like to know if some one is playing around with the patchset.
>
> If yes, can you make one response? I am very interested in rebasing
> it, and then playing with it.
>
> On Fri, Feb 10, 2012 at 7:34 PM, Stefan Hajnoczi
> <stefanha@linux.vnet.ibm.com> wrote:
>> From: Benjamin MARSILI <mlspirat42@gmail.com>
>>
>> Signed-off-by: Benjamin MARSILI <mlspirat42@gmail.com>
>> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
>> ---
>> net/socket.c | 8 ++++----
>> 1 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/net/socket.c b/net/socket.c
>> index d4c2002..0bcf229 100644
>> --- a/net/socket.c
>> +++ b/net/socket.c
>> @@ -664,8 +664,8 @@ int net_init_socket(QemuOpts *opts,
>> qemu_opt_get(opts, "connect") ||
>> qemu_opt_get(opts, "listen") ||
>> qemu_opt_get(opts, "mcast")) {
>> - error_report("fd=, connect=, listen=\
>> - and mcast= is invalid with udp=");
>> + error_report("fd=, connect=, listen="
>> + " and mcast= is invalid with udp=");
>> return -1;
>> }
>>
>> @@ -680,8 +680,8 @@ int net_init_socket(QemuOpts *opts,
>> return -1;
>> }
>> } else {
>> - error_report("-socket requires fd=, listen=, \
>> - connect=, mcast= or udp=");
>> + error_report("-socket requires fd=, listen=,"
>> + " connect=, mcast= or udp=");
>> return -1;
>> }
>> return 0;
>> --
>> 1.7.8.3
>>
>>
>
>
>
> --
> Regards,
>
> Zhi Yong Wu
--
Regards,
Zhi Yong Wu
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PULL 0/9] Trivial patches for 28 January to 10 February 2012
2012-02-10 11:34 [Qemu-devel] [PULL 0/9] Trivial patches for 28 January to 10 February 2012 Stefan Hajnoczi
` (8 preceding siblings ...)
2012-02-10 11:34 ` [Qemu-devel] [PATCH 9/9] linux-user: brk() debugging Stefan Hajnoczi
@ 2012-02-17 13:53 ` Anthony Liguori
9 siblings, 0 replies; 13+ messages in thread
From: Anthony Liguori @ 2012-02-17 13:53 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel
On 02/10/2012 05:34 AM, Stefan Hajnoczi wrote:
> The following changes since commit 57c83dacfe179bf061b8fa79d9553ebabe4d2ff4:
>
> make: Remove duplicate use of GLIB_CFLAGS (2012-02-09 20:44:38 +0400)
>
> are available in the git repository at:
> git://github.com/stefanha/qemu.git trivial-patches
Pulled. Thanks.
Regards,
Anthony Liguori
>
> Benjamin MARSILI (1):
> net: remove extra spaces in help messages
>
> Hervé Poussineau (1):
> ide: fix compilation errors when DEBUG_IDE is set
>
> Luiz Capitulino (1):
> virtio: Remove unneeded g_free() check in virtio_cleanup()
>
> Paul Brook (1):
> linux-user: brk() debugging
>
> Peter Maydell (2):
> CODING_STYLE: Clarify style for enum and function type names
> vl.c: Fix typo in variable name
>
> Stefan Weil (1):
> fmopl: Fix typo in function name
>
> Ulrich Hecht (1):
> linux-user: fail execve() if env/args too big
>
> 陳韋任 (1):
> cpu-exec.c: Correct comment about this file and indentation cleanup
>
> CODING_STYLE | 3 ++-
> cpu-exec.c | 10 +++++-----
> hw/fmopl.c | 4 ++--
> hw/ide/pci.c | 2 +-
> hw/ide/piix.c | 4 ++--
> hw/virtio.c | 3 +--
> linux-user/syscall.c | 25 ++++++++++++++++++-------
> net/socket.c | 8 ++++----
> vl.c | 10 +++++-----
> 9 files changed, 40 insertions(+), 29 deletions(-)
>
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2012-02-17 14:05 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-10 11:34 [Qemu-devel] [PULL 0/9] Trivial patches for 28 January to 10 February 2012 Stefan Hajnoczi
2012-02-10 11:34 ` [Qemu-devel] [PATCH 1/9] linux-user: fail execve() if env/args too big Stefan Hajnoczi
2012-02-10 11:34 ` [Qemu-devel] [PATCH 2/9] CODING_STYLE: Clarify style for enum and function type names Stefan Hajnoczi
2012-02-10 11:34 ` [Qemu-devel] [PATCH 3/9] cpu-exec.c: Correct comment about this file and indentation cleanup Stefan Hajnoczi
2012-02-10 11:34 ` [Qemu-devel] [PATCH 4/9] ide: fix compilation errors when DEBUG_IDE is set Stefan Hajnoczi
2012-02-10 11:34 ` [Qemu-devel] [PATCH 5/9] vl.c: Fix typo in variable name Stefan Hajnoczi
2012-02-10 11:34 ` [Qemu-devel] [PATCH 6/9] fmopl: Fix typo in function name Stefan Hajnoczi
2012-02-10 11:34 ` [Qemu-devel] [PATCH 7/9] net: remove extra spaces in help messages Stefan Hajnoczi
2012-02-17 6:34 ` Zhi Yong Wu
2012-02-17 6:53 ` Zhi Yong Wu
2012-02-10 11:34 ` [Qemu-devel] [PATCH 8/9] virtio: Remove unneeded g_free() check in virtio_cleanup() Stefan Hajnoczi
2012-02-10 11:34 ` [Qemu-devel] [PATCH 9/9] linux-user: brk() debugging Stefan Hajnoczi
2012-02-17 13:53 ` [Qemu-devel] [PULL 0/9] Trivial patches for 28 January to 10 February 2012 Anthony Liguori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).