@@ -63,8 +63,14 @@ struct xc_sr_save_ops
int (*setup)(struct xc_sr_context *ctx);
/**
- * Send records which need to be at the start of the stream. This is
- * called once, after the Image and Domain headers are written.
+ * Send static records at the head of the stream. This is called once,
+ * after the Image and Domain headers are written.
+ */
+ int (*static_data)(struct xc_sr_context *ctx);
+
+ /**
+ * Send dynamic records which need to be at the start of the stream. This
+ * is called after the STATIC_DATA_END record is written.
*/
int (*start_of_stream)(struct xc_sr_context *ctx);
@@ -13,7 +13,7 @@ static int write_headers(struct xc_sr_context *ctx, uint16_t guest_type)
struct xc_sr_ihdr ihdr = {
.marker = IHDR_MARKER,
.id = htonl(IHDR_ID),
- .version = htonl(2),
+ .version = htonl(3),
.options = htons(IHDR_OPT_LITTLE_ENDIAN),
};
struct xc_sr_dhdr dhdr = {
@@ -55,6 +55,16 @@ static int write_end_record(struct xc_sr_context *ctx)
}
/*
+ * Writes a STATIC_DATA_END record into the stream.
+ */
+static int write_static_data_end_record(struct xc_sr_context *ctx)
+{
+ struct xc_sr_record end = { .type = REC_TYPE_STATIC_DATA_END };
+
+ return write_record(ctx, &end);
+}
+
+/*
* Writes a CHECKPOINT record into the stream.
*/
static int write_checkpoint_record(struct xc_sr_context *ctx)
@@ -846,6 +856,8 @@ static int save(struct xc_sr_context *ctx, uint16_t guest_type)
xc_report_progress_single(xch, "Start of stream");
rc = (write_headers(ctx, guest_type) ?:
+ ctx->save.ops.static_data(ctx) ?:
+ write_static_data_end_record(ctx) ?:
ctx->save.ops.start_of_stream(ctx));
if ( rc )
goto err;
@@ -170,6 +170,11 @@ static int x86_hvm_setup(struct xc_sr_context *ctx)
return 0;
}
+static int x86_hvm_static_data(struct xc_sr_context *ctx)
+{
+ return 0;
+}
+
static int x86_hvm_start_of_stream(struct xc_sr_context *ctx)
{
return 0;
@@ -213,6 +218,7 @@ struct xc_sr_save_ops save_ops_x86_hvm =
.pfn_to_gfn = x86_hvm_pfn_to_gfn,
.normalise_page = x86_hvm_normalise_page,
.setup = x86_hvm_setup,
+ .static_data = x86_hvm_static_data,
.start_of_stream = x86_hvm_start_of_stream,
.start_of_checkpoint = x86_hvm_start_of_checkpoint,
.end_of_checkpoint = x86_hvm_end_of_checkpoint,
@@ -1028,14 +1028,15 @@ static int x86_pv_setup(struct xc_sr_context *ctx)
map_p2m(ctx));
}
+static int x86_pv_static_data(struct xc_sr_context *ctx)
+{
+ return write_x86_pv_info(ctx);
+}
+
static int x86_pv_start_of_stream(struct xc_sr_context *ctx)
{
int rc;
- rc = write_x86_pv_info(ctx);
- if ( rc )
- return rc;
-
/*
* Ideally should be able to change during migration. Currently
* corruption will occur if the contents or location of the P2M changes
@@ -1090,6 +1091,7 @@ struct xc_sr_save_ops save_ops_x86_pv =
.pfn_to_gfn = x86_pv_pfn_to_gfn,
.normalise_page = x86_pv_normalise_page,
.setup = x86_pv_setup,
+ .static_data = x86_pv_static_data,
.start_of_stream = x86_pv_start_of_stream,
.start_of_checkpoint = x86_pv_start_of_checkpoint,
.end_of_checkpoint = x86_pv_end_of_checkpoint,
@@ -79,7 +79,7 @@ def write_libxc_ihdr():
stream_write(pack(libxc.IHDR_FORMAT,
libxc.IHDR_MARKER, # Marker
libxc.IHDR_IDENT, # Ident
- 2, # Version
+ 3, # Version
libxc.IHDR_OPT_LE, # Options
0, 0)) # Reserved
@@ -166,6 +166,9 @@ def write_libxc_hvm_params(params):
pack(libxc.HVM_PARAMS_FORMAT, len(params) / 2, 0),
pack("Q" * len(params), *params))
+def write_libxc_static_data_end():
+ write_record(libxc.REC_TYPE_static_data_end)
+
def write_libxl_end():
write_record(libxl.REC_TYPE_end)
@@ -590,6 +593,10 @@ def read_legacy_stream(vm):
if pv:
read_pv_extended_info(vm)
+
+ write_libxc_static_data_end()
+
+ if pv:
read_pv_p2m_frames(vm)
read_chunks(vm)
Introduce a new static_data() hook which is responsible for writing out any static data records. The HVM side continues to be a no-op, while the PV side moves write_x86_pv_info() into this earlier hook. The the common code writes out a STATIC_DATA_END record, and the stream version is bumped to 3. Update convert-legacy-stream to write a v3 stream, because this will bypass the compatiblity logic in libxc. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Ian Jackson <Ian.Jackson@citrix.com> CC: Wei Liu <wl@xen.org> CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> --- tools/libxc/xc_sr_common.h | 10 ++++++++-- tools/libxc/xc_sr_save.c | 14 +++++++++++++- tools/libxc/xc_sr_save_x86_hvm.c | 6 ++++++ tools/libxc/xc_sr_save_x86_pv.c | 10 ++++++---- tools/python/scripts/convert-legacy-stream | 9 ++++++++- 5 files changed, 41 insertions(+), 8 deletions(-)