diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2015-01-30 13:29:38 +0000 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-02-26 12:42:15 +0100 |
| commit | 661875e948ece4723ebe4e7628060c27cad06df1 (patch) | |
| tree | 826764e73c01b8e960442c8f39f3a124ac662469 /hw/acpi | |
| parent | eae8bded9a1a19561054654f5113aeb978d7b4c1 (diff) | |
| download | qemu-661875e948ece4723ebe4e7628060c27cad06df1.tar.gz | |
acpi: drop min-bytes in build_package()
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/acpi')
| -rw-r--r-- | hw/acpi/aml-build.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 6a02474e17..bcb288eab4 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -157,7 +157,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; @@ -173,11 +173,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; @@ -210,15 +205,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 */ } @@ -262,4 +257,3 @@ void build_append_int(GArray *table, uint32_t value) build_append_value(table, value, 4); } } - |