diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 60245e7ded0e67aa53650ec92d352d40b967eaa6..3e5949be10c4325befb475e3470c435118d4e24f 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -27,27 +27,27 @@ #include "hw/acpi/aml-build.h" #include "qemu/bswap.h" -GArray *build_alloc_array(void) +static GArray *build_alloc_array(void) { 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); } -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); } -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); } -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); } @@ -141,7 +141,7 @@ build_append_namestringv(GArray *array, const char *format, va_list ap) 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; @@ -158,7 +158,7 @@ enum { PACKAGE_LENGTH_4BYTE_SHIFT = 20, }; -void +static void build_prepend_package_length(GArray *package, unsigned length, bool incl_self) { uint8_t byte; @@ -226,13 +226,13 @@ build_append_pkg_length(GArray *array, unsigned length, bool incl_self) 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_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_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) { build_append_byte(table, 0x00); /* ZeroOp */ diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index 11871970cad06884436c0246018c4f3189285e4f..f6735eaac208dc3d515a92d7c17ab21cbe3729a4 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -188,20 +188,4 @@ Aml *aml_resource_template(void); Aml *aml_field(const char *name, AmlFieldFlags flags); 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