ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

acpi: make build_*() routines static to aml-build.c 

build_*() routines were used for composing AML
structures manually in acpi-build.c but after
conversion to AML API they are not used outside
of aml-build.c anymore, so hide them from external
users.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Igor Mammedov 2015-02-20 18:22:20 +00:00 committed by Michael S. Tsirkin
parent 72f15d6e53
commit af59b35ce1
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/acpi/aml-build.c
View File

@ -27,27 +27,27 @@
#include "hw/acpi/aml-build.h" #include "hw/acpi/aml-build.h"
#include "qemu/bswap.h" #include "qemu/bswap.h"
GArray *build_alloc_array(void) static GArray *build_alloc_array(void)
{ {
return g_array_new(false, true /* clear */, 1); return g_array_new(false, true /* clear */, 1);
} }
void build_free_array(GArray *array) static void build_free_array(GArray *array)
{ {
g_array_free(array, true); g_array_free(array, true);
} }
void build_prepend_byte(GArray *array, uint8_t val) static void build_prepend_byte(GArray *array, uint8_t val)
{ {
g_array_prepend_val(array, val); g_array_prepend_val(array, val);
} }
void build_append_byte(GArray *array, uint8_t val) static void build_append_byte(GArray *array, uint8_t val)
{ {
g_array_append_val(array, val); g_array_append_val(array, val);
} }
void build_append_array(GArray *array, GArray *val) static void build_append_array(GArray *array, GArray *val)
{ {
g_array_append_vals(array, val->data, val->len); g_array_append_vals(array, val->data, val->len);
} }
@ -141,7 +141,7 @@ build_append_namestringv(GArray *array, const char *format, va_list ap)
g_strfreev(segs); g_strfreev(segs);
} }
void build_append_namestring(GArray *array, const char *format, ...) static void build_append_namestring(GArray *array, const char *format, ...)
{ {
va_list ap; va_list ap;
@ -158,7 +158,7 @@ enum {
PACKAGE_LENGTH_4BYTE_SHIFT = 20, PACKAGE_LENGTH_4BYTE_SHIFT = 20,
}; };
void static void
build_prepend_package_length(GArray *package, unsigned length, bool incl_self) build_prepend_package_length(GArray *package, unsigned length, bool incl_self)
{ {
uint8_t byte; uint8_t byte;
@ -226,13 +226,13 @@ build_append_pkg_length(GArray *array, unsigned length, bool incl_self)
build_free_array(tmp); build_free_array(tmp);
} }
void build_package(GArray *package, uint8_t op) static void build_package(GArray *package, uint8_t op)
{ {
build_prepend_package_length(package, package->len, true); build_prepend_package_length(package, package->len, true);
build_prepend_byte(package, op); build_prepend_byte(package, op);
} }
void build_extop_package(GArray *package, uint8_t op) static void build_extop_package(GArray *package, uint8_t op)
{ {
build_package(package, op); build_package(package, op);
build_prepend_byte(package, 0x5B); /* ExtOpPrefix */ build_prepend_byte(package, 0x5B); /* ExtOpPrefix */
@ -248,7 +248,7 @@ static void build_append_int_noprefix(GArray *table, uint64_t value, int size)
} }
} }
void build_append_int(GArray *table, uint64_t value) static void build_append_int(GArray *table, uint64_t value)
{ {
if (value == 0x00) { if (value == 0x00) {
build_append_byte(table, 0x00); /* ZeroOp */ build_append_byte(table, 0x00); /* ZeroOp */

16
include/hw/acpi/aml-build.h
View File

@ -188,20 +188,4 @@ Aml *aml_resource_template(void);
Aml *aml_field(const char *name, AmlFieldFlags flags); Aml *aml_field(const char *name, AmlFieldFlags flags);
Aml *aml_varpackage(uint32_t num_elements); Aml *aml_varpackage(uint32_t num_elements);
/* other helpers */
GArray *build_alloc_array(void);
void build_free_array(GArray *array);
void build_prepend_byte(GArray *array, uint8_t val);
void build_append_byte(GArray *array, uint8_t val);
void build_append_array(GArray *array, GArray *val);
void GCC_FMT_ATTR(2, 3)
build_append_namestring(GArray *array, const char *format, ...);
void
build_prepend_package_length(GArray *package, unsigned length, bool incl_self);
void build_package(GArray *package, uint8_t op);
void build_append_int(GArray *table, uint64_t value);
void build_extop_package(GArray *package, uint8_t op);
#endif #endif