| Message ID | 1425828153-30617-1-git-send-email-mst@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Sun, 8 Mar 2015 16:22:38 +0100 "Michael S. Tsirkin" <mst@redhat.com> wrote: > Opcodes are raw bytes, they shouldn't be added > using build_append_int. This only happens to work > with 0 and 1 opcodes. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/acpi/aml-build.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c > index ff12b28..e01b8c2 100644 > --- a/hw/acpi/aml-build.c > +++ b/hw/acpi/aml-build.c > @@ -112,7 +112,7 @@ build_append_namestringv(GArray *array, const char *format, va_list ap) > switch (seg_count) { > case 1: > if (!*s) { > - build_append_byte(array, 0x0); /* NullName */ > + build_append_byte(array, 0x00); /* NullName */ > } else { > build_append_nameseg(array, s); > } > @@ -448,7 +448,7 @@ Aml *aml_and(Aml *arg1, Aml *arg2) > Aml *var = aml_opcode(0x7B /* AndOp */); > aml_append(var, arg1); > aml_append(var, arg2); > - build_append_int(var->buf, 0x00 /* NullNameOp */); > + build_append_byte(var->buf, 0x00 /* NullNameOp */); > return var; > } > > @@ -546,7 +546,7 @@ Aml *aml_equal(Aml *arg1, Aml *arg2) > Aml *var = aml_opcode(0x93 /* LequalOp */); > aml_append(var, arg1); > aml_append(var, arg2); > - build_append_int(var->buf, 0x00); /* NullNameOp */ > + build_append_byte(var->buf, 0x00); /* NullNameOp */ > return var; > } >
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index ff12b28..e01b8c2 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -112,7 +112,7 @@ build_append_namestringv(GArray *array, const char *format, va_list ap) switch (seg_count) { case 1: if (!*s) { - build_append_byte(array, 0x0); /* NullName */ + build_append_byte(array, 0x00); /* NullName */ } else { build_append_nameseg(array, s); } @@ -448,7 +448,7 @@ Aml *aml_and(Aml *arg1, Aml *arg2) Aml *var = aml_opcode(0x7B /* AndOp */); aml_append(var, arg1); aml_append(var, arg2); - build_append_int(var->buf, 0x00 /* NullNameOp */); + build_append_byte(var->buf, 0x00 /* NullNameOp */); return var; } @@ -546,7 +546,7 @@ Aml *aml_equal(Aml *arg1, Aml *arg2) Aml *var = aml_opcode(0x93 /* LequalOp */); aml_append(var, arg1); aml_append(var, arg2); - build_append_int(var->buf, 0x00); /* NullNameOp */ + build_append_byte(var->buf, 0x00); /* NullNameOp */ return var; }
Opcodes are raw bytes, they shouldn't be added using build_append_int. This only happens to work with 0 and 1 opcodes. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- hw/acpi/aml-build.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)