On Wed, 13 Jan 2016 02:50:03 +0800 Xiao Guangrong <guangrong.xiao@xxxxxxxxxxxxxxx> wrote: > It will be used by nvdimm acpi > > Signed-off-by: Xiao Guangrong <guangrong.xiao@xxxxxxxxxxxxxxx> > --- > hw/acpi/aml-build.c | 14 ++++++++++++++ > include/hw/acpi/aml-build.h | 1 + > 2 files changed, 15 insertions(+) > > diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c > index 97c9efb..421dd84 100644 > --- a/hw/acpi/aml-build.c > +++ b/hw/acpi/aml-build.c > @@ -1440,6 +1440,20 @@ Aml *aml_alias(const char *source_object, const char *alias_object) > return var; > } > > +/* ACPI 1.0b: 16.2.5.4 Type 2 Opcodes Encoding: DefConcat */ > +Aml *aml_concatenate(Aml *source1, Aml *source2, Aml *target) > +{ > + Aml *var = aml_opcode(0x73 /* ConcatOp */); > + aml_append(var, source1); > + aml_append(var, source2); > + > + if (target) { > + aml_append(var, target); > + } target is not an optional, pls looks at aml_add and use helper to make patch correct and smaller > + > + return var; > +} > + > void > build_header(GArray *linker, GArray *table_data, > AcpiTableHeader *h, const char *sig, int len, uint8_t rev, > diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h > index e1ba534..4a5168a 100644 > --- a/include/hw/acpi/aml-build.h > +++ b/include/hw/acpi/aml-build.h > @@ -354,6 +354,7 @@ Aml *aml_touuid(const char *uuid); > Aml *aml_unicode(const char *str); > Aml *aml_derefof(Aml *arg); > Aml *aml_sizeof(Aml *arg); > +Aml *aml_concatenate(Aml *source1, Aml *source2, Aml *target); > > void > build_header(GArray *linker, GArray *table_data, -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html