|
 |
9ae3a8 |
From 251ac1dcd456c524eb7b79507c4a8a1bf4a4fa32 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
Date: Fri, 7 Nov 2014 17:17:54 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 07/41] dump: add API to write elf notes to buffer
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1415380693-16593-8-git-send-email-lersek@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 62193
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.1 qemu-kvm PATCH 07/26] dump: add API to write elf notes to buffer
|
|
|
9ae3a8 |
Bugzilla: 1157798
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: dgibson <dgibson@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: qiaonuohan <qiaonuohan@cn.fujitsu.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
the function can be used by write_elf32_notes/write_elf64_notes to write notes
|
|
|
9ae3a8 |
to a buffer. If fd_write_vmcore is used, write_elf32_notes/write_elf64_notes
|
|
|
9ae3a8 |
will write elf notes to vmcore directly. Instead, if buf_write_note is used,
|
|
|
9ae3a8 |
elf notes will be written to opaque->note_buf at first.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Qiao Nuohan <qiaonuohan@cn.fujitsu.com>
|
|
|
9ae3a8 |
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 4835ef7784502c231f243c3133054850d23dd837)
|
|
|
9ae3a8 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
dump.c | 19 +++++++++++++++++++
|
|
|
9ae3a8 |
1 file changed, 19 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/dump.c b/dump.c
|
|
|
9ae3a8 |
index 710893f..3c6d526 100644
|
|
|
9ae3a8 |
--- a/dump.c
|
|
|
9ae3a8 |
+++ b/dump.c
|
|
|
9ae3a8 |
@@ -76,6 +76,9 @@ typedef struct DumpState {
|
|
|
9ae3a8 |
int64_t begin;
|
|
|
9ae3a8 |
int64_t length;
|
|
|
9ae3a8 |
Error **errp;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ uint8_t *note_buf; /* buffer for notes */
|
|
|
9ae3a8 |
+ size_t note_buf_offset; /* the writing place in note_buf */
|
|
|
9ae3a8 |
} DumpState;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static int dump_cleanup(DumpState *s)
|
|
|
9ae3a8 |
@@ -755,6 +758,22 @@ static int write_buffer(int fd, off_t offset, const void *buf, size_t size)
|
|
|
9ae3a8 |
return 0;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+static int buf_write_note(const void *buf, size_t size, void *opaque)
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ DumpState *s = opaque;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ /* note_buf is not enough */
|
|
|
9ae3a8 |
+ if (s->note_buf_offset + size > s->note_size) {
|
|
|
9ae3a8 |
+ return -1;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ memcpy(s->note_buf + s->note_buf_offset, buf, size);
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ s->note_buf_offset += size;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ return 0;
|
|
|
9ae3a8 |
+}
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
static ram_addr_t get_start_block(DumpState *s)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
GuestPhysBlock *block;
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|