diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-06 11:58:10 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-06 11:58:10 +0000 |
| commit | 9b748c5e061b1202fba59afd857e16a693743d90 (patch) | |
| tree | 98d795211d01e15820961febb70af5c87576306d /hw/acpi/core.c | |
| parent | b5b6b2b912bbcd3953407da938a8f969577ad3a1 (diff) | |
| parent | 0e081fde8a3d80383adf2e802fc0c03af44c5436 (diff) | |
| download | focaccia-qemu-9b748c5e061b1202fba59afd857e16a693743d90.tar.gz focaccia-qemu-9b748c5e061b1202fba59afd857e16a693743d90.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging
trivial patches pull request (20190206) - acpi: remove unused functions/variables - tests: remove useless architecture checks - some typo fixes and documentation update - flash_cfi02: fix memory leak # gpg: Signature made Wed 06 Mar 2019 11:05:12 GMT # gpg: using RSA key F30C38BD3F2FBE3C # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full] # gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full] # gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier2/tags/trivial-branch-pull-request: thunk: fix of malloc to g_new hostmem-file: simplify ifdef-s in file_backend_memory_alloc() build: Correct explanation of unnest-vars example bswap: Fix accessors syntax in comment doc: fix typos for documents in tree block/pflash_cfi02: Fix memory leak and potential use-after-free hw/acpi: remove unnecessary variable acpi_table_builtin hw/acpi: remove unused function acpi_table_add_builtin() hw/i386/pc.c: remove unused function pc_acpi_init() tests: Remove (mostly) useless architecture checks Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/acpi/core.c')
| -rw-r--r-- | hw/acpi/core.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 47877c0ec1..9ed1629f36 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -307,14 +307,6 @@ out: error_propagate(errp, err); } -static bool acpi_table_builtin = false; - -void acpi_table_add_builtin(const QemuOpts *opts, Error **errp) -{ - acpi_table_builtin = true; - acpi_table_add(opts, errp); -} - unsigned acpi_table_len(void *current) { struct acpi_table_header *hdr = current - sizeof(hdr->_length); @@ -330,7 +322,7 @@ void *acpi_table_hdr(void *h) uint8_t *acpi_table_first(void) { - if (acpi_table_builtin || !acpi_tables) { + if (!acpi_tables) { return NULL; } return acpi_table_hdr(acpi_tables + ACPI_TABLE_PFX_SIZE); |