From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSO5N-0005ed-Kz for qemu-devel@nongnu.org; Mon, 02 Mar 2015 06:00:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YSO5G-0006t8-4h for qemu-devel@nongnu.org; Mon, 02 Mar 2015 06:00:29 -0500 Received: from mail.kernel.org ([198.145.29.136]:33447) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSO5F-0006sz-QU for qemu-devel@nongnu.org; Mon, 02 Mar 2015 06:00:22 -0500 Date: Mon, 2 Mar 2015 12:00:11 +0100 From: "Michael S. Tsirkin" Message-ID: <1425293287-4426-23-git-send-email-mst@redhat.com> References: <1425293287-4426-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1425293287-4426-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v3 22/26] acpi: make build_*() routines static to aml-build.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Anthony Liguori , Igor Mammedov From: Igor Mammedov 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 Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/acpi/aml-build.h | 16 ---------------- hw/acpi/aml-build.c | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 26 deletions(-) diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index 1187197..f6735ea 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 diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 60245e7..3e5949b 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 */ -- MST