From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0pqK-0000js-Gu for qemu-devel@nongnu.org; Tue, 16 Dec 2014 05:59:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0pqE-0006vg-BO for qemu-devel@nongnu.org; Tue, 16 Dec 2014 05:59:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50726) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0pqE-0006vb-4I for qemu-devel@nongnu.org; Tue, 16 Dec 2014 05:58:58 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sBGAwvCd009443 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 16 Dec 2014 05:58:57 -0500 From: Igor Mammedov Date: Tue, 16 Dec 2014 10:58:43 +0000 Message-Id: <1418727524-6790-8-git-send-email-imammedo@redhat.com> In-Reply-To: <1418727524-6790-1-git-send-email-imammedo@redhat.com> References: <1418727524-6790-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH V2 7/8] acpi: drop min-bytes in build_package() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: marcel.a@redhat.com, mst@redhat.com Signed-off-by: Igor Mammedov --- hw/acpi/acpi_gen_utils.c | 14 ++++---------- hw/i386/acpi-build.c | 13 ++++++------- include/hw/acpi/acpi_gen_utils.h | 4 ++-- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/hw/acpi/acpi_gen_utils.c b/hw/acpi/acpi_gen_utils.c index 2e52690..291b938 100644 --- a/hw/acpi/acpi_gen_utils.c +++ b/hw/acpi/acpi_gen_utils.c @@ -142,7 +142,7 @@ enum { PACKAGE_LENGTH_4BYTE_SHIFT = 20, }; -void build_prepend_package_length(GArray *package, unsigned min_bytes) +void build_prepend_package_length(GArray *package) { uint8_t byte; unsigned length = package->len; @@ -158,11 +158,6 @@ void build_prepend_package_length(GArray *package, unsigned min_bytes) length_bytes = 4; } - /* Force length to at least min_bytes. - * This wastes memory but that's how bios did it. - */ - length_bytes = MAX(length_bytes, min_bytes); - /* PkgLength is the length of the inclusive length of the data. */ length += length_bytes; @@ -195,15 +190,15 @@ void build_prepend_package_length(GArray *package, unsigned min_bytes) build_prepend_byte(package, byte); } -void build_package(GArray *package, uint8_t op, unsigned min_bytes) +void build_package(GArray *package, uint8_t op) { - build_prepend_package_length(package, min_bytes); + build_prepend_package_length(package); build_prepend_byte(package, op); } void build_extop_package(GArray *package, uint8_t op) { - build_package(package, op, 1); + build_package(package, op); build_prepend_byte(package, 0x5B); /* ExtOpPrefix */ } @@ -247,4 +242,3 @@ void build_append_int(GArray *table, uint32_t value) build_append_value(table, value, 4); } } - diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 0f6202d..707ac7e 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -283,7 +283,7 @@ static void build_append_and_cleanup_method(GArray *device, GArray *method) { uint8_t op = 0x14; /* MethodOp */ - build_package(method, op, 0); + build_package(method, op); build_append_array(device, method); build_free_array(method); @@ -304,7 +304,7 @@ static void build_append_notify_target_ifequal(GArray *method, build_append_byte(notify, 0x69); /* Arg1Op */ /* Pack it up */ - build_package(notify, op, 1); + build_package(notify, op); build_append_array(method, notify); @@ -817,7 +817,7 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state) build_append_byte(notify, 0x69); /* Arg1Op */ /* Pack it up */ - build_package(notify, op, 0); + build_package(notify, op); build_append_array(method, notify); @@ -858,7 +858,7 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state) if (bus->parent_dev) { build_extop_package(bus_table, op); } else { - build_package(bus_table, op, 0); + build_package(bus_table, op); } /* Append our bus description to parent table */ @@ -981,7 +981,7 @@ build_ssdt(GArray *table_data, GArray *linker, build_append_byte(package, b); } - build_package(package, op, 2); + build_package(package, op); build_append_array(sb_scope, package); build_free_array(package); } @@ -1029,8 +1029,7 @@ build_ssdt(GArray *table_data, GArray *linker, build_append_array(sb_scope, hotplug_state.device_table); build_pci_bus_state_cleanup(&hotplug_state); } - - build_package(sb_scope, op, 3); + build_package(sb_scope, op); build_append_array(table_data, sb_scope); build_free_array(sb_scope); } diff --git a/include/hw/acpi/acpi_gen_utils.h b/include/hw/acpi/acpi_gen_utils.h index fd50625..199f003 100644 --- a/include/hw/acpi/acpi_gen_utils.h +++ b/include/hw/acpi/acpi_gen_utils.h @@ -14,8 +14,8 @@ 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 min_bytes); -void build_package(GArray *package, uint8_t op, unsigned min_bytes); +void build_prepend_package_length(GArray *package); +void build_package(GArray *package, uint8_t op); void build_append_value(GArray *table, uint32_t value, int size); void build_append_int(GArray *table, uint32_t value); void build_extop_package(GArray *package, uint8_t op); -- 1.8.3.1