Skip to contentSkip to conversation

memsave: Add a space after address in error message

PATCH In review Borislav Petkov 3 participants 6 messages Feb 7, 2015 – Feb 10, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 memsave: Add a space after address in error message

From: Borislav Petkov <[email protected]>

Add the missing space to separate address from "specified".

Cc Anthony Liguori <[email protected]>
Cc Paolo Bonzini <[email protected]>
---
 cpus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
cpus.c +1 -1
index 0cdd1d71560b..4fa196d48207 100644
@@ -1489,7 +1489,7 @@ void qmp_memsave(int64_t addr, int64_t size, const char *filename,
         if (l > size)
             l = size;
         if (cpu_memory_rw_debug(cpu, addr, buf, l, 0) != 0) {
-            error_setg(errp, "Invalid addr 0x%016" PRIx64 "specified", addr);
+            error_setg(errp, "Invalid addr 0x%016" PRIx64 " specified", addr);
             goto exit;
         }
         if (fwrite(buf, 1, l, f) != l) {
Signature · 1 line
2.2.0.33.gc18b867
#1 lore raw
Quoted 25 lines · Borislav Petkov

From: Borislav Petkov <[email protected]>

Add the missing space to separate address from "specified".

Cc Anthony Liguori <[email protected]>
Cc Paolo Bonzini <[email protected]>
---
 cpus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
cpus.c +1 -1
index 0cdd1d71560b..4fa196d48207 100644
@@ -1489,7 +1489,7 @@ void qmp_memsave(int64_t addr, int64_t size, const char *filename,
         if (l > size)
             l = size;
         if (cpu_memory_rw_debug(cpu, addr, buf, l, 0) != 0) {
-            error_setg(errp, "Invalid addr 0x%016" PRIx64 "specified", addr);
+            error_setg(errp, "Invalid addr 0x%016" PRIx64 " specified", addr);
             goto exit;
         }
         if (fwrite(buf, 1, l, f) != l) {
#2 lore raw

PATCH 1/1 memsave: Improve and disambiguate error message

Quoted 1 line · Paolo Bonzini

Thanks.

But, there's more b0rked with this error message so you might wanna take the patch below instead.

Btw, what are the vim settings when doing patches for qemu, this must be documented somewhere as coding style differs significantly from that of the kernel?

:-)

---
From: Borislav Petkov <[email protected]>
Subject: [PATCH] memsave: Improve and disambiguate error message

When requesting a size which cannot be read, the error message shows a different address which is misleading to the user and it looks like something's wrong with the address parsing. This is because the input @addr variable is incremented in the memory dumping loop:

(qemu) memsave 0xffffffff8418069c 0xb00000 mem
Invalid addr 0xffffffff849ffe9c specified

Fix that by saving the original address and size and use them in the error message:

(qemu) memsave 0xffffffff8418069c 0xb00000 mem Invalid addr 0xffffffff8418069c/size 11534336 specified

Cc Anthony Liguori <[email protected]>
Cc Paolo Bonzini <[email protected]>
---
 cpus.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
cpus.c +3 -1
index 0cdd1d71560b..a5c7cad00fc9 100644
@@ -1466,6 +1466,7 @@ void qmp_memsave(int64_t addr, int64_t size, const char *filename,
     uint32_t l;
     CPUState *cpu;
     uint8_t buf[1024];
+    int64_t orig_addr = addr, orig_size = size;
 
     if (!has_cpu) {
         cpu_index = 0;
@@ -1489,7 +1490,8 @@ void qmp_memsave(int64_t addr, int64_t size, const char *filename,
         if (l > size)
             l = size;
         if (cpu_memory_rw_debug(cpu, addr, buf, l, 0) != 0) {
-            error_setg(errp, "Invalid addr 0x%016" PRIx64 "specified", addr);
+            error_setg(errp, "Invalid addr 0x%016" PRIx64 "/size %" PRId64
+                             " specified", orig_addr, orig_size);
             goto exit;
         }
         if (fwrite(buf, 1, l, f) != l) {
Signature · 8 lines
2.2.0.33.gc18b867

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--
#3 lore raw

Re: [Qemu-devel] [PATCH] memsave: Improve and disambiguate error message

Quoted 11 lines · Borislav Petkov
Quoted 1 line · Paolo Bonzini

Thanks.

But, there's more b0rked with this error message so you might wanna take the patch below instead.

Btw, what are the vim settings when doing patches for qemu, this must be documented somewhere as coding style differs significantly from that of the kernel?

I use ":set shiftwidth=4 expandtab" and c-indent mode.

Quick googling for "vim four spaces" suggests the following alternatives:

* ":set tabstop=8 expandtab shiftwidth=4 softtabstop=4"

* "set tabstop=8 softtabstop=0 expandtab shiftwidth=4 smarttab".

Paolo

#4 lore raw

Re: [Qemu-devel] [PATCH] memsave: Improve and disambiguate error message

Quoted 7 lines · Paolo Bonzini

I use ":set shiftwidth=4 expandtab" and c-indent mode.

Quick googling for "vim four spaces" suggests the following alternatives:

* ":set tabstop=8 expandtab shiftwidth=4 softtabstop=4"

* "set tabstop=8 softtabstop=0 expandtab shiftwidth=4 smarttab".

Thanks Paolo!

:-)

Signature · 5 lines
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--
#5 lore raw

Re: [Qemu-devel] [Qemu-trivial] [PATCH] memsave: Improve and disambiguate error message

In reply to Borislav Petkov
Quoted 14 lines · Borislav Petkov
Quoted 1 line · Paolo Bonzini

Thanks.

But, there's more b0rked with this error message so you might wanna take the patch below instead.

Btw, what are the vim settings when doing patches for qemu, this must be documented somewhere as coding style differs significantly from that of the kernel?

:-)

Quoted 8 lines

---
From: Borislav Petkov <[email protected]>
Subject: [PATCH] memsave: Improve and disambiguate error message

When requesting a size which cannot be read, the error message shows a different address which is misleading to the user and it looks like something's wrong with the address parsing. This is because the input @addr variable is incremented in the memory dumping loop:

Applied this version to -trivial, thank you!

/mjt

Quoted 39 lines

(qemu) memsave 0xffffffff8418069c 0xb00000 mem
Invalid addr 0xffffffff849ffe9c specified

Fix that by saving the original address and size and use them in the error message:

(qemu) memsave 0xffffffff8418069c 0xb00000 mem Invalid addr 0xffffffff8418069c/size 11534336 specified

Cc Anthony Liguori <[email protected]>
Cc Paolo Bonzini <[email protected]>
---
 cpus.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
cpus.c +3 -1
index 0cdd1d71560b..a5c7cad00fc9 100644
@@ -1466,6 +1466,7 @@ void qmp_memsave(int64_t addr, int64_t size, const char *filename,
     uint32_t l;
     CPUState *cpu;
     uint8_t buf[1024];
+    int64_t orig_addr = addr, orig_size = size;
 
     if (!has_cpu) {
         cpu_index = 0;
@@ -1489,7 +1490,8 @@ void qmp_memsave(int64_t addr, int64_t size, const char *filename,
         if (l > size)
             l = size;
         if (cpu_memory_rw_debug(cpu, addr, buf, l, 0) != 0) {
-            error_setg(errp, "Invalid addr 0x%016" PRIx64 "specified", addr);
+            error_setg(errp, "Invalid addr 0x%016" PRIx64 "/size %" PRId64
+                             " specified", orig_addr, orig_size);
             goto exit;
         }
         if (fwrite(buf, 1, l, f) != l) {