openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

QMP patches 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUSRlQAAoJEDu+7JDiTtWngIUP/1NRBkMazjSXwFyEsBNmfrdf
 +W+MeicR13/H1AcjGLQxcosG4BrjbhqbAvFisAAoj1xufZ/VzKrOyInSTso6/OAG
 xex8MxPl9lNn86pekr4UofIb/zTQu9OWAUX8/gdsCjX7+oahpk2cxhhrvNCvV9kN
 FjO0jLIAVbpoE5wpr48OboPjJHdkgiOL17O5RMsZqBb4OvkQQafY/Y/E5BTF7LLr
 Od7Ah/MqGYeldO9LUpIPSZN+wsTmMlls0iEtW+2k+WNdRP7WE07OvTgbD0eCBrTs
 lHTqC9WfKCIgH2BeoVelDVwbO8miy/YchsGpFyn6HeVjgDvA9RDCbiVoRimP8nVD
 MnwV1DhdETVBNLga8/Wk4FcqS8AWJz5J7uA0qb+mVzj+QzGFTshQxft+ibrWbctL
 d7Ph+pTRwfockPj8LVakMig5qNMmsj7ZaQUfTf5IIKMBrL2EhvEAQS+PM9x5zP4A
 AkphHAEle1kthn+4Ql8kvOmPKLu7li9cqr7OFyWcRYcjTGdB5m8M9UM/2eZzk9pz
 4WX5vHalzV9dmNFKFXyCflN31eD+nyks/b2GwpJxNniairliW8SSSDhhg2mKNpI/
 Gfav31tv2XRYHPlsTuaxeI1+rf9d7mlNZUxi/ERS238837Nlh+si5VcydA1o9zoi
 W2xy66qeZKRDIYrpmZxK
 =iiWX
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/qmp-unstable/tags/for-upstream' into staging

QMP patches

# gpg: Signature made Thu 23 Oct 2014 16:05:52 BST using RSA key ID E24ED5A7
# gpg: Good signature from "Luiz Capitulino <lcapitulino@gmail.com>"

* remotes/qmp-unstable/tags/for-upstream:
  monitor: delete device_del_bus_completion
  monitor: add del completion for peripheral device
  qdev: add qdev_build_hotpluggable_device_list helper
  MAINTAINERS: add entry for qobject files
  dump: Turn some functions to void to make code cleaner
  dump: Propagate errors into qmp_dump_guest_memory()
  virtio-balloon: Tweak recent fix for integer overflow

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2014-10-23 17:05:15 +01:00
parent e40830afa1 e799157c76
commit 1430500bb8
6 changed files with 216 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MAINTAINERS
View File

@ -829,6 +829,12 @@ S: Supported
F: qapi-schema.json F: qapi-schema.json
T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
QObject
M: Luiz Capitulino <lcapitulino@redhat.com>
S: Maintained
F: qobject/
T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
QOM QOM
M: Anthony Liguori <aliguori@amazon.com> M: Anthony Liguori <aliguori@amazon.com>
M: Andreas Färber <afaerber@suse.de> M: Andreas Färber <afaerber@suse.de>

375
dump.c
View File

@ -81,9 +81,10 @@ static int dump_cleanup(DumpState *s)
return 0; return 0;
} }
static void dump_error(DumpState *s, const char *reason) static void dump_error(DumpState *s, const char *reason, Error **errp)
{ {
dump_cleanup(s); dump_cleanup(s);
error_setg(errp, "%s", reason);
} }
static int fd_write_vmcore(const void *buf, size_t size, void *opaque) static int fd_write_vmcore(const void *buf, size_t size, void *opaque)
@ -99,7 +100,7 @@ static int fd_write_vmcore(const void *buf, size_t size, void *opaque)
return 0; return 0;
} }
static int write_elf64_header(DumpState *s) static void write_elf64_header(DumpState *s, Error **errp)
{ {
Elf64_Ehdr elf_header; Elf64_Ehdr elf_header;
int ret; int ret;
@ -126,14 +127,11 @@ static int write_elf64_header(DumpState *s)
ret = fd_write_vmcore(&elf_header, sizeof(elf_header), s); ret = fd_write_vmcore(&elf_header, sizeof(elf_header), s);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write elf header.\n"); dump_error(s, "dump: failed to write elf header", errp);
return -1;
} }
return 0;
} }
static int write_elf32_header(DumpState *s) static void write_elf32_header(DumpState *s, Error **errp)
{ {
Elf32_Ehdr elf_header; Elf32_Ehdr elf_header;
int ret; int ret;
@ -160,16 +158,13 @@ static int write_elf32_header(DumpState *s)
ret = fd_write_vmcore(&elf_header, sizeof(elf_header), s); ret = fd_write_vmcore(&elf_header, sizeof(elf_header), s);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write elf header.\n"); dump_error(s, "dump: failed to write elf header", errp);
return -1;
} }
return 0;
} }
static int write_elf64_load(DumpState *s, MemoryMapping *memory_mapping, static void write_elf64_load(DumpState *s, MemoryMapping *memory_mapping,
int phdr_index, hwaddr offset, int phdr_index, hwaddr offset,
hwaddr filesz) hwaddr filesz, Error **errp)
{ {
Elf64_Phdr phdr; Elf64_Phdr phdr;
int ret; int ret;
@ -186,16 +181,13 @@ static int write_elf64_load(DumpState *s, MemoryMapping *memory_mapping,
ret = fd_write_vmcore(&phdr, sizeof(Elf64_Phdr), s); ret = fd_write_vmcore(&phdr, sizeof(Elf64_Phdr), s);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write program header table.\n"); dump_error(s, "dump: failed to write program header table", errp);
return -1;
} }
return 0;
} }
static int write_elf32_load(DumpState *s, MemoryMapping *memory_mapping, static void write_elf32_load(DumpState *s, MemoryMapping *memory_mapping,
int phdr_index, hwaddr offset, int phdr_index, hwaddr offset,
hwaddr filesz) hwaddr filesz, Error **errp)
{ {
Elf32_Phdr phdr; Elf32_Phdr phdr;
int ret; int ret;
@ -212,14 +204,11 @@ static int write_elf32_load(DumpState *s, MemoryMapping *memory_mapping,
ret = fd_write_vmcore(&phdr, sizeof(Elf32_Phdr), s); ret = fd_write_vmcore(&phdr, sizeof(Elf32_Phdr), s);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write program header table.\n"); dump_error(s, "dump: failed to write program header table", errp);
return -1;
} }
return 0;
} }
static int write_elf64_note(DumpState *s) static void write_elf64_note(DumpState *s, Error **errp)
{ {
Elf64_Phdr phdr; Elf64_Phdr phdr;
hwaddr begin = s->memory_offset - s->note_size; hwaddr begin = s->memory_offset - s->note_size;
@ -235,11 +224,8 @@ static int write_elf64_note(DumpState *s)
ret = fd_write_vmcore(&phdr, sizeof(Elf64_Phdr), s); ret = fd_write_vmcore(&phdr, sizeof(Elf64_Phdr), s);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write program header table.\n"); dump_error(s, "dump: failed to write program header table", errp);
return -1;
} }
return 0;
} }
static inline int cpu_index(CPUState *cpu) static inline int cpu_index(CPUState *cpu)
@ -247,7 +233,8 @@ static inline int cpu_index(CPUState *cpu)
return cpu->cpu_index + 1; return cpu->cpu_index + 1;
} }
static int write_elf64_notes(WriteCoreDumpFunction f, DumpState *s) static void write_elf64_notes(WriteCoreDumpFunction f, DumpState *s,
Error **errp)
{ {
CPUState *cpu; CPUState *cpu;
int ret; int ret;
@ -257,23 +244,21 @@ static int write_elf64_notes(WriteCoreDumpFunction f, DumpState *s)
id = cpu_index(cpu); id = cpu_index(cpu);
ret = cpu_write_elf64_note(f, cpu, id, s); ret = cpu_write_elf64_note(f, cpu, id, s);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write elf notes.\n"); dump_error(s, "dump: failed to write elf notes", errp);
return -1; return;
} }
} }
CPU_FOREACH(cpu) { CPU_FOREACH(cpu) {
ret = cpu_write_elf64_qemunote(f, cpu, s); ret = cpu_write_elf64_qemunote(f, cpu, s);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write CPU status.\n"); dump_error(s, "dump: failed to write CPU status", errp);
return -1; return;
} }
} }
return 0;
} }
static int write_elf32_note(DumpState *s) static void write_elf32_note(DumpState *s, Error **errp)
{ {
hwaddr begin = s->memory_offset - s->note_size; hwaddr begin = s->memory_offset - s->note_size;
Elf32_Phdr phdr; Elf32_Phdr phdr;
@ -289,14 +274,12 @@ static int write_elf32_note(DumpState *s)
ret = fd_write_vmcore(&phdr, sizeof(Elf32_Phdr), s); ret = fd_write_vmcore(&phdr, sizeof(Elf32_Phdr), s);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write program header table.\n"); dump_error(s, "dump: failed to write program header table", errp);
return -1;
} }
return 0;
} }
static int write_elf32_notes(WriteCoreDumpFunction f, DumpState *s) static void write_elf32_notes(WriteCoreDumpFunction f, DumpState *s,
Error **errp)
{ {
CPUState *cpu; CPUState *cpu;
int ret; int ret;
@ -306,23 +289,21 @@ static int write_elf32_notes(WriteCoreDumpFunction f, DumpState *s)
id = cpu_index(cpu); id = cpu_index(cpu);
ret = cpu_write_elf32_note(f, cpu, id, s); ret = cpu_write_elf32_note(f, cpu, id, s);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write elf notes.\n"); dump_error(s, "dump: failed to write elf notes", errp);
return -1; return;
} }
} }
CPU_FOREACH(cpu) { CPU_FOREACH(cpu) {
ret = cpu_write_elf32_qemunote(f, cpu, s); ret = cpu_write_elf32_qemunote(f, cpu, s);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write CPU status.\n"); dump_error(s, "dump: failed to write CPU status", errp);
return -1; return;
} }
} }
return 0;
} }
static int write_elf_section(DumpState *s, int type) static void write_elf_section(DumpState *s, int type, Error **errp)
{ {
Elf32_Shdr shdr32; Elf32_Shdr shdr32;
Elf64_Shdr shdr64; Elf64_Shdr shdr64;
@ -344,50 +325,44 @@ static int write_elf_section(DumpState *s, int type)
ret = fd_write_vmcore(&shdr, shdr_size, s); ret = fd_write_vmcore(&shdr, shdr_size, s);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write section header table.\n"); dump_error(s, "dump: failed to write section header table", errp);
return -1;
} }
return 0;
} }
static int write_data(DumpState *s, void *buf, int length) static void write_data(DumpState *s, void *buf, int length, Error **errp)
{ {
int ret; int ret;
ret = fd_write_vmcore(buf, length, s); ret = fd_write_vmcore(buf, length, s);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to save memory.\n"); dump_error(s, "dump: failed to save memory", errp);
return -1;
} }
return 0;
} }
/* write the memroy to vmcore. 1 page per I/O. */ /* write the memory to vmcore. 1 page per I/O. */
static int write_memory(DumpState *s, GuestPhysBlock *block, ram_addr_t start, static void write_memory(DumpState *s, GuestPhysBlock *block, ram_addr_t start,
int64_t size) int64_t size, Error **errp)
{ {
int64_t i; int64_t i;
int ret; Error *local_err = NULL;
for (i = 0; i < size / TARGET_PAGE_SIZE; i++) { for (i = 0; i < size / TARGET_PAGE_SIZE; i++) {
ret = write_data(s, block->host_addr + start + i * TARGET_PAGE_SIZE, write_data(s, block->host_addr + start + i * TARGET_PAGE_SIZE,
TARGET_PAGE_SIZE); TARGET_PAGE_SIZE, &local_err);
if (ret < 0) { if (local_err) {
return ret; error_propagate(errp, local_err);
return;
} }
} }
if ((size % TARGET_PAGE_SIZE) != 0) { if ((size % TARGET_PAGE_SIZE) != 0) {
ret = write_data(s, block->host_addr + start + i * TARGET_PAGE_SIZE, write_data(s, block->host_addr + start + i * TARGET_PAGE_SIZE,
size % TARGET_PAGE_SIZE); size % TARGET_PAGE_SIZE, &local_err);
if (ret < 0) { if (local_err) {
return ret; error_propagate(errp, local_err);
return;
} }
} }
return 0;
} }
/* get the memory's offset and size in the vmcore */ /* get the memory's offset and size in the vmcore */
@ -452,13 +427,13 @@ static void get_offset_range(hwaddr phys_addr,
} }
} }
static int write_elf_loads(DumpState *s) static void write_elf_loads(DumpState *s, Error **errp)
{ {
hwaddr offset, filesz; hwaddr offset, filesz;
MemoryMapping *memory_mapping; MemoryMapping *memory_mapping;
uint32_t phdr_index = 1; uint32_t phdr_index = 1;
int ret;
uint32_t max_index; uint32_t max_index;
Error *local_err = NULL;
if (s->have_section) { if (s->have_section) {
max_index = s->sh_info; max_index = s->sh_info;
@ -471,29 +446,28 @@ static int write_elf_loads(DumpState *s)
memory_mapping->length, memory_mapping->length,
s, &offset, &filesz); s, &offset, &filesz);
if (s->dump_info.d_class == ELFCLASS64) { if (s->dump_info.d_class == ELFCLASS64) {
ret = write_elf64_load(s, memory_mapping, phdr_index++, offset, write_elf64_load(s, memory_mapping, phdr_index++, offset,
filesz); filesz, &local_err);
} else { } else {
ret = write_elf32_load(s, memory_mapping, phdr_index++, offset, write_elf32_load(s, memory_mapping, phdr_index++, offset,
filesz); filesz, &local_err);
} }
if (ret < 0) { if (local_err) {
return -1; error_propagate(errp, local_err);
return;
} }
if (phdr_index >= max_index) { if (phdr_index >= max_index) {
break; break;
} }
} }
return 0;
} }
/* write elf header, PT_NOTE and elf note to vmcore. */ /* write elf header, PT_NOTE and elf note to vmcore. */
static int dump_begin(DumpState *s) static void dump_begin(DumpState *s, Error **errp)
{ {
int ret; Error *local_err = NULL;
/* /*
* the vmcore's format is: * the vmcore's format is:
@ -521,69 +495,81 @@ static int dump_begin(DumpState *s)
/* write elf header to vmcore */ /* write elf header to vmcore */
if (s->dump_info.d_class == ELFCLASS64) { if (s->dump_info.d_class == ELFCLASS64) {
ret = write_elf64_header(s); write_elf64_header(s, &local_err);
} else { } else {
ret = write_elf32_header(s); write_elf32_header(s, &local_err);
} }
if (ret < 0) { if (local_err) {
return -1; error_propagate(errp, local_err);
return;
} }
if (s->dump_info.d_class == ELFCLASS64) { if (s->dump_info.d_class == ELFCLASS64) {
/* write PT_NOTE to vmcore */ /* write PT_NOTE to vmcore */
if (write_elf64_note(s) < 0) { write_elf64_note(s, &local_err);
return -1; if (local_err) {
error_propagate(errp, local_err);
return;
} }
/* write all PT_LOAD to vmcore */ /* write all PT_LOAD to vmcore */
if (write_elf_loads(s) < 0) { write_elf_loads(s, &local_err);
return -1; if (local_err) {
error_propagate(errp, local_err);
return;
} }
/* write section to vmcore */ /* write section to vmcore */
if (s->have_section) { if (s->have_section) {
if (write_elf_section(s, 1) < 0) { write_elf_section(s, 1, &local_err);
return -1; if (local_err) {
error_propagate(errp, local_err);
return;
} }
} }
/* write notes to vmcore */ /* write notes to vmcore */
if (write_elf64_notes(fd_write_vmcore, s) < 0) { write_elf64_notes(fd_write_vmcore, s, &local_err);
return -1; if (local_err) {
error_propagate(errp, local_err);
return;
} }
} else { } else {
/* write PT_NOTE to vmcore */ /* write PT_NOTE to vmcore */
if (write_elf32_note(s) < 0) { write_elf32_note(s, &local_err);
return -1; if (local_err) {
error_propagate(errp, local_err);
return;
} }
/* write all PT_LOAD to vmcore */ /* write all PT_LOAD to vmcore */
if (write_elf_loads(s) < 0) { write_elf_loads(s, &local_err);
return -1; if (local_err) {
error_propagate(errp, local_err);
return;
} }
/* write section to vmcore */ /* write section to vmcore */
if (s->have_section) { if (s->have_section) {
if (write_elf_section(s, 0) < 0) { write_elf_section(s, 0, &local_err);
return -1; if (local_err) {
error_propagate(errp, local_err);
return;
} }
} }
/* write notes to vmcore */ /* write notes to vmcore */
if (write_elf32_notes(fd_write_vmcore, s) < 0) { write_elf32_notes(fd_write_vmcore, s, &local_err);
return -1; if (local_err) {
error_propagate(errp, local_err);
return;
} }
} }
return 0;
} }
/* write PT_LOAD to vmcore */ static void dump_completed(DumpState *s)
static int dump_completed(DumpState *s)
{ {
dump_cleanup(s); dump_cleanup(s);
return 0;
} }
static int get_next_block(DumpState *s, GuestPhysBlock *block) static int get_next_block(DumpState *s, GuestPhysBlock *block)
@ -614,11 +600,12 @@ static int get_next_block(DumpState *s, GuestPhysBlock *block)
} }
/* write all memory to vmcore */ /* write all memory to vmcore */
static int dump_iterate(DumpState *s) static void dump_iterate(DumpState *s, Error **errp)
{ {
GuestPhysBlock *block; GuestPhysBlock *block;
int64_t size; int64_t size;
int ret; int ret;
Error *local_err = NULL;
while (1) { while (1) {
block = s->next_block; block = s->next_block;
@ -630,34 +617,30 @@ static int dump_iterate(DumpState *s)
size -= block->target_end - (s->begin + s->length); size -= block->target_end - (s->begin + s->length);
} }
} }
ret = write_memory(s, block, s->start, size); write_memory(s, block, s->start, size, &local_err);
if (ret == -1) { if (local_err) {
return ret; error_propagate(errp, local_err);
return;
} }
ret = get_next_block(s, block); ret = get_next_block(s, block);
if (ret == 1) { if (ret == 1) {
dump_completed(s); dump_completed(s);
return 0;
} }
} }
} }
static int create_vmcore(DumpState *s) static void create_vmcore(DumpState *s, Error **errp)
{ {
int ret; Error *local_err = NULL;
ret = dump_begin(s); dump_begin(s, &local_err);
if (ret < 0) { if (local_err) {
return -1; error_propagate(errp, local_err);
return;
} }
ret = dump_iterate(s); dump_iterate(s, errp);
if (ret < 0) {
return -1;
}
return 0;
} }
static int write_start_flat_header(int fd) static int write_start_flat_header(int fd)
@ -738,9 +721,8 @@ static int buf_write_note(const void *buf, size_t size, void *opaque)
} }
/* write common header, sub header and elf note to vmcore */ /* write common header, sub header and elf note to vmcore */
static int create_header32(DumpState *s) static void create_header32(DumpState *s, Error **errp)
{ {
int ret = 0;
DiskDumpHeader32 *dh = NULL; DiskDumpHeader32 *dh = NULL;
KdumpSubHeader32 *kh = NULL; KdumpSubHeader32 *kh = NULL;
size_t size; size_t size;
@ -749,6 +731,7 @@ static int create_header32(DumpState *s)
uint32_t bitmap_blocks; uint32_t bitmap_blocks;
uint32_t status = 0; uint32_t status = 0;
uint64_t offset_note; uint64_t offset_note;
Error *local_err = NULL;
/* write common header, the version of kdump-compressed format is 6th */ /* write common header, the version of kdump-compressed format is 6th */
size = sizeof(DiskDumpHeader32); size = sizeof(DiskDumpHeader32);
@ -784,8 +767,7 @@ static int create_header32(DumpState *s)
dh->status = cpu_to_dump32(s, status); dh->status = cpu_to_dump32(s, status);
if (write_buffer(s->fd, 0, dh, size) < 0) { if (write_buffer(s->fd, 0, dh, size) < 0) {
dump_error(s, "dump: failed to write disk dump header.\n"); dump_error(s, "dump: failed to write disk dump header", errp);
ret = -1;
goto out; goto out;
} }
@ -804,8 +786,7 @@ static int create_header32(DumpState *s)
if (write_buffer(s->fd, DISKDUMP_HEADER_BLOCKS * if (write_buffer(s->fd, DISKDUMP_HEADER_BLOCKS *
block_size, kh, size) < 0) { block_size, kh, size) < 0) {
dump_error(s, "dump: failed to write kdump sub header.\n"); dump_error(s, "dump: failed to write kdump sub header", errp);
ret = -1;
goto out; goto out;
} }
@ -814,15 +795,14 @@ static int create_header32(DumpState *s)
s->note_buf_offset = 0; s->note_buf_offset = 0;
/* use s->note_buf to store notes temporarily */ /* use s->note_buf to store notes temporarily */
if (write_elf32_notes(buf_write_note, s) < 0) { write_elf32_notes(buf_write_note, s, &local_err);
ret = -1; if (local_err) {
error_propagate(errp, local_err);
goto out; goto out;
} }
if (write_buffer(s->fd, offset_note, s->note_buf, if (write_buffer(s->fd, offset_note, s->note_buf,
s->note_size) < 0) { s->note_size) < 0) {
dump_error(s, "dump: failed to write notes"); dump_error(s, "dump: failed to write notes", errp);
ret = -1;
goto out; goto out;
} }
@ -838,14 +818,11 @@ out:
g_free(dh); g_free(dh);
g_free(kh); g_free(kh);
g_free(s->note_buf); g_free(s->note_buf);
return ret;
} }
/* write common header, sub header and elf note to vmcore */ /* write common header, sub header and elf note to vmcore */
static int create_header64(DumpState *s) static void create_header64(DumpState *s, Error **errp)
{ {
int ret = 0;
DiskDumpHeader64 *dh = NULL; DiskDumpHeader64 *dh = NULL;
KdumpSubHeader64 *kh = NULL; KdumpSubHeader64 *kh = NULL;
size_t size; size_t size;
@ -854,6 +831,7 @@ static int create_header64(DumpState *s)
uint32_t bitmap_blocks; uint32_t bitmap_blocks;
uint32_t status = 0; uint32_t status = 0;
uint64_t offset_note; uint64_t offset_note;
Error *local_err = NULL;
/* write common header, the version of kdump-compressed format is 6th */ /* write common header, the version of kdump-compressed format is 6th */
size = sizeof(DiskDumpHeader64); size = sizeof(DiskDumpHeader64);
@ -889,8 +867,7 @@ static int create_header64(DumpState *s)
dh->status = cpu_to_dump32(s, status); dh->status = cpu_to_dump32(s, status);
if (write_buffer(s->fd, 0, dh, size) < 0) { if (write_buffer(s->fd, 0, dh, size) < 0) {
dump_error(s, "dump: failed to write disk dump header.\n"); dump_error(s, "dump: failed to write disk dump header", errp);
ret = -1;
goto out; goto out;
} }
@ -909,8 +886,7 @@ static int create_header64(DumpState *s)
if (write_buffer(s->fd, DISKDUMP_HEADER_BLOCKS * if (write_buffer(s->fd, DISKDUMP_HEADER_BLOCKS *
block_size, kh, size) < 0) { block_size, kh, size) < 0) {
dump_error(s, "dump: failed to write kdump sub header.\n"); dump_error(s, "dump: failed to write kdump sub header", errp);
ret = -1;
goto out; goto out;
} }
@ -919,15 +895,15 @@ static int create_header64(DumpState *s)
s->note_buf_offset = 0; s->note_buf_offset = 0;
/* use s->note_buf to store notes temporarily */ /* use s->note_buf to store notes temporarily */
if (write_elf64_notes(buf_write_note, s) < 0) { write_elf64_notes(buf_write_note, s, &local_err);
ret = -1; if (local_err) {
error_propagate(errp, local_err);
goto out; goto out;
} }
if (write_buffer(s->fd, offset_note, s->note_buf, if (write_buffer(s->fd, offset_note, s->note_buf,
s->note_size) < 0) { s->note_size) < 0) {
dump_error(s, "dump: failed to write notes"); dump_error(s, "dump: failed to write notes", errp);
ret = -1;
goto out; goto out;
} }
@ -943,16 +919,19 @@ out:
g_free(dh); g_free(dh);
g_free(kh); g_free(kh);
g_free(s->note_buf); g_free(s->note_buf);
return ret;
} }
static int write_dump_header(DumpState *s) static void write_dump_header(DumpState *s, Error **errp)
{ {
Error *local_err = NULL;
if (s->dump_info.d_class == ELFCLASS32) { if (s->dump_info.d_class == ELFCLASS32) {
return create_header32(s); create_header32(s, &local_err);
} else { } else {
return create_header64(s); create_header64(s, &local_err);
}
if (local_err) {
error_propagate(errp, local_err);
} }
} }
@ -1066,7 +1045,7 @@ static bool get_next_page(GuestPhysBlock **blockptr, uint64_t *pfnptr,
return true; return true;
} }
static int write_dump_bitmap(DumpState *s) static void write_dump_bitmap(DumpState *s, Error **errp)
{ {
int ret = 0; int ret = 0;
uint64_t last_pfn, pfn; uint64_t last_pfn, pfn;
@ -1087,8 +1066,7 @@ static int write_dump_bitmap(DumpState *s)
while (get_next_page(&block_iter, &pfn, NULL, s)) { while (get_next_page(&block_iter, &pfn, NULL, s)) {
ret = set_dump_bitmap(last_pfn, pfn, true, dump_bitmap_buf, s); ret = set_dump_bitmap(last_pfn, pfn, true, dump_bitmap_buf, s);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to set dump_bitmap.\n"); dump_error(s, "dump: failed to set dump_bitmap", errp);
ret = -1;
goto out; goto out;
} }
@ -1105,8 +1083,7 @@ static int write_dump_bitmap(DumpState *s)
ret = set_dump_bitmap(last_pfn, last_pfn + PFN_BUFBITMAP, false, ret = set_dump_bitmap(last_pfn, last_pfn + PFN_BUFBITMAP, false,
dump_bitmap_buf, s); dump_bitmap_buf, s);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to sync dump_bitmap.\n"); dump_error(s, "dump: failed to sync dump_bitmap", errp);
ret = -1;
goto out; goto out;
} }
} }
@ -1116,8 +1093,6 @@ static int write_dump_bitmap(DumpState *s)
out: out:
g_free(dump_bitmap_buf); g_free(dump_bitmap_buf);
return ret;
} }
static void prepare_data_cache(DataCache *data_cache, DumpState *s, static void prepare_data_cache(DataCache *data_cache, DumpState *s,
@ -1197,7 +1172,7 @@ static inline bool is_zero_page(const uint8_t *buf, size_t page_size)
return buffer_is_zero(buf, page_size); return buffer_is_zero(buf, page_size);
} }
static int write_dump_pages(DumpState *s) static void write_dump_pages(DumpState *s, Error **errp)
{ {
int ret = 0; int ret = 0;
DataCache page_desc, page_data; DataCache page_desc, page_data;
@ -1241,7 +1216,7 @@ static int write_dump_pages(DumpState *s)
ret = write_cache(&page_data, buf, TARGET_PAGE_SIZE, false); ret = write_cache(&page_data, buf, TARGET_PAGE_SIZE, false);
g_free(buf); g_free(buf);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write page data(zero page).\n"); dump_error(s, "dump: failed to write page data (zero page)", errp);
goto out; goto out;
} }
@ -1257,7 +1232,7 @@ static int write_dump_pages(DumpState *s)
ret = write_cache(&page_desc, &pd_zero, sizeof(PageDescriptor), ret = write_cache(&page_desc, &pd_zero, sizeof(PageDescriptor),
false); false);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write page desc.\n"); dump_error(s, "dump: failed to write page desc", errp);
goto out; goto out;
} }
} else { } else {
@ -1282,7 +1257,7 @@ static int write_dump_pages(DumpState *s)
ret = write_cache(&page_data, buf_out, size_out, false); ret = write_cache(&page_data, buf_out, size_out, false);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write page data.\n"); dump_error(s, "dump: failed to write page data", errp);
goto out; goto out;
} }
#ifdef CONFIG_LZO #ifdef CONFIG_LZO
@ -1295,7 +1270,7 @@ static int write_dump_pages(DumpState *s)
ret = write_cache(&page_data, buf_out, size_out, false); ret = write_cache(&page_data, buf_out, size_out, false);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write page data.\n"); dump_error(s, "dump: failed to write page data", errp);
goto out; goto out;
} }
#endif #endif
@ -1309,7 +1284,7 @@ static int write_dump_pages(DumpState *s)
ret = write_cache(&page_data, buf_out, size_out, false); ret = write_cache(&page_data, buf_out, size_out, false);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write page data.\n"); dump_error(s, "dump: failed to write page data", errp);
goto out; goto out;
} }
#endif #endif
@ -1324,7 +1299,7 @@ static int write_dump_pages(DumpState *s)
ret = write_cache(&page_data, buf, TARGET_PAGE_SIZE, false); ret = write_cache(&page_data, buf, TARGET_PAGE_SIZE, false);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write page data.\n"); dump_error(s, "dump: failed to write page data", errp);
goto out; goto out;
} }
} }
@ -1336,7 +1311,7 @@ static int write_dump_pages(DumpState *s)
ret = write_cache(&page_desc, &pd, sizeof(PageDescriptor), false); ret = write_cache(&page_desc, &pd, sizeof(PageDescriptor), false);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write page desc.\n"); dump_error(s, "dump: failed to write page desc", errp);
goto out; goto out;
} }
} }
@ -1344,12 +1319,12 @@ static int write_dump_pages(DumpState *s)
ret = write_cache(&page_desc, NULL, 0, true); ret = write_cache(&page_desc, NULL, 0, true);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to sync cache for page_desc.\n"); dump_error(s, "dump: failed to sync cache for page_desc", errp);
goto out; goto out;
} }
ret = write_cache(&page_data, NULL, 0, true); ret = write_cache(&page_data, NULL, 0, true);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to sync cache for page_data.\n"); dump_error(s, "dump: failed to sync cache for page_data", errp);
goto out; goto out;
} }
@ -1362,13 +1337,12 @@ out:
#endif #endif
g_free(buf_out); g_free(buf_out);
return ret;
} }
static int create_kdump_vmcore(DumpState *s) static void create_kdump_vmcore(DumpState *s, Error **errp)
{ {
int ret; int ret;
Error *local_err = NULL;
/* /*
* the kdump-compressed format is: * the kdump-compressed format is:
@ -1394,34 +1368,35 @@ static int create_kdump_vmcore(DumpState *s)
ret = write_start_flat_header(s->fd); ret = write_start_flat_header(s->fd);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write start flat header.\n"); dump_error(s, "dump: failed to write start flat header", errp);
return -1; return;
} }
ret = write_dump_header(s); write_dump_header(s, &local_err);
if (ret < 0) { if (local_err) {
return -1; error_propagate(errp, local_err);
return;
} }
ret = write_dump_bitmap(s); write_dump_bitmap(s, &local_err);
if (ret < 0) { if (local_err) {
return -1; error_propagate(errp, local_err);
return;
} }
ret = write_dump_pages(s); write_dump_pages(s, &local_err);
if (ret < 0) { if (local_err) {
return -1; error_propagate(errp, local_err);
return;
} }
ret = write_end_flat_header(s->fd); ret = write_end_flat_header(s->fd);
if (ret < 0) { if (ret < 0) {
dump_error(s, "dump: failed to write end flat header.\n"); dump_error(s, "dump: failed to write end flat header", errp);
return -1; return;
} }
dump_completed(s); dump_completed(s);
return 0;
} }
static ram_addr_t get_start_block(DumpState *s) static ram_addr_t get_start_block(DumpState *s)
@ -1460,7 +1435,7 @@ static void get_max_mapnr(DumpState *s)
s->max_mapnr = paddr_to_pfn(last_block->target_end); s->max_mapnr = paddr_to_pfn(last_block->target_end);
} }
static int dump_init(DumpState *s, int fd, bool has_format, static void dump_init(DumpState *s, int fd, bool has_format,
DumpGuestMemoryFormat format, bool paging, bool has_filter, DumpGuestMemoryFormat format, bool paging, bool has_filter,
int64_t begin, int64_t length, Error **errp) int64_t begin, int64_t length, Error **errp)
{ {
@ -1567,7 +1542,7 @@ static int dump_init(DumpState *s, int fd, bool has_format,
s->flag_compress = 0; s->flag_compress = 0;
} }
return 0; return;
} }
if (s->has_filter) { if (s->has_filter) {
@ -1616,11 +1591,10 @@ static int dump_init(DumpState *s, int fd, bool has_format,
} }
} }
return 0; return;
cleanup: cleanup:
dump_cleanup(s); dump_cleanup(s);
return -1;
} }
void qmp_dump_guest_memory(bool paging, const char *file, bool has_begin, void qmp_dump_guest_memory(bool paging, const char *file, bool has_begin,
@ -1631,7 +1605,7 @@ void qmp_dump_guest_memory(bool paging, const char *file, bool has_begin,
const char *p; const char *p;
int fd = -1; int fd = -1;
DumpState *s; DumpState *s;
int ret; Error *local_err = NULL;
/* /*
* kdump-compressed format need the whole memory dumped, so paging or * kdump-compressed format need the whole memory dumped, so paging or
@ -1691,21 +1665,18 @@ void qmp_dump_guest_memory(bool paging, const char *file, bool has_begin,
s = g_malloc0(sizeof(DumpState)); s = g_malloc0(sizeof(DumpState));
ret = dump_init(s, fd, has_format, format, paging, has_begin, dump_init(s, fd, has_format, format, paging, has_begin,
begin, length, errp); begin, length, &local_err);
if (ret < 0) { if (local_err) {
g_free(s); g_free(s);
error_propagate(errp, local_err);
return; return;
} }
if (has_format && format != DUMP_GUEST_MEMORY_FORMAT_ELF) { if (has_format && format != DUMP_GUEST_MEMORY_FORMAT_ELF) {
if (create_kdump_vmcore(s) < 0) { create_kdump_vmcore(s, errp);
error_set(errp, QERR_IO_ERROR);
}
} else { } else {
if (create_vmcore(s) < 0) { create_vmcore(s, errp);
error_set(errp, QERR_IO_ERROR);
}
} }
g_free(s); g_free(s);

13
hw/core/qdev.c
View File

@ -866,6 +866,19 @@ void qdev_alias_all_properties(DeviceState *target, Object *source)
} while (class != object_class_by_name(TYPE_DEVICE)); } while (class != object_class_by_name(TYPE_DEVICE));
} }
int qdev_build_hotpluggable_device_list(Object *obj, void *opaque)
{
GSList **list = opaque;
DeviceState *dev = DEVICE(obj);
if (dev->realized && object_property_get_bool(obj, "hotpluggable", NULL)) {
*list = g_slist_append(*list, dev);
}
object_child_foreach(obj, qdev_build_hotpluggable_device_list, opaque);
return 0;
}
static bool device_get_realized(Object *obj, Error **errp) static bool device_get_realized(Object *obj, Error **errp)
{ {
DeviceState *dev = DEVICE(obj); DeviceState *dev = DEVICE(obj);

2
hw/virtio/virtio-balloon.c
View File

@ -170,7 +170,7 @@ static void balloon_stats_set_poll_interval(Object *obj, struct Visitor *v,
return; return;
} }
if (value > UINT_MAX) { if (value > UINT32_MAX) {
error_setg(errp, "timer value is too big"); error_setg(errp, "timer value is too big");
return; return;
} }

2
include/hw/qdev-core.h
View File

@ -360,6 +360,8 @@ extern int qdev_hotplug;
char *qdev_get_dev_path(DeviceState *dev); char *qdev_get_dev_path(DeviceState *dev);
int qdev_build_hotpluggable_device_list(Object *obj, void *opaque);
void qbus_set_hotplug_handler(BusState *bus, DeviceState *handler, void qbus_set_hotplug_handler(BusState *bus, DeviceState *handler,
Error **errp); Error **errp);

26
monitor.c
View File

@ -4322,23 +4322,29 @@ void object_add_completion(ReadLineState *rs, int nb_args, const char *str)
g_slist_free(list); g_slist_free(list);
} }
static void device_del_bus_completion(ReadLineState *rs, BusState *bus, static void peripheral_device_del_completion(ReadLineState *rs,
const char *str, size_t len) const char *str, size_t len)
{ {
BusChild *kid; Object *peripheral;
GSList *list = NULL, *item;
QTAILQ_FOREACH(kid, &bus->children, sibling) { peripheral = object_resolve_path("/machine/peripheral/", NULL);
DeviceState *dev = kid->child; if (peripheral == NULL) {
BusState *dev_child; return;
}
object_child_foreach(peripheral, qdev_build_hotpluggable_device_list,
&list);
for (item = list; item; item = g_slist_next(item)) {
DeviceState *dev = item->data;
if (dev->id && !strncmp(str, dev->id, len)) { if (dev->id && !strncmp(str, dev->id, len)) {
readline_add_completion(rs, dev->id); readline_add_completion(rs, dev->id);
} }
}
QLIST_FOREACH(dev_child, &dev->child_bus, sibling) { g_slist_free(list);
device_del_bus_completion(rs, dev_child, str, len);
}
}
} }
void chardev_remove_completion(ReadLineState *rs, int nb_args, const char *str) void chardev_remove_completion(ReadLineState *rs, int nb_args, const char *str)
@ -4413,7 +4419,7 @@ void device_del_completion(ReadLineState *rs, int nb_args, const char *str)
len = strlen(str); len = strlen(str);
readline_set_completion_index(rs, len); readline_set_completion_index(rs, len);
device_del_bus_completion(rs, sysbus_get_default(), str, len); peripheral_device_del_completion(rs, str, len);
} }
void object_del_completion(ReadLineState *rs, int nb_args, const char *str) void object_del_completion(ReadLineState *rs, int nb_args, const char *str)