From a64627edcc063ccb51a56258d3605fffaee0157e Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 29 Sep 2020 09:58:23 +0200 Subject: [PATCH 01/14] qemu-img-cmds.hx: Update comment that mentions Texinfo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Missed in 3c95fdef94 "Update comments in .hx files that mention Texinfo". Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200929075824.1517969-2-armbru@redhat.com> Signed-off-by: Laurent Vivier --- qemu-img-cmds.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx index b89c019b76..cab8234235 100644 --- a/qemu-img-cmds.hx +++ b/qemu-img-cmds.hx @@ -1,5 +1,5 @@ HXCOMM Keep the list of subcommands sorted by name. -HXCOMM Use DEFHEADING() to define headings in both help text and texi +HXCOMM Use DEFHEADING() to define headings in both help text and rST HXCOMM Text between SRST and ERST are copied to rST version and HXCOMM discarded from C version HXCOMM DEF(command, callback, arg_string) is used to construct From 32048d724d85c986dbd1883bc30c39befb8d7767 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 29 Sep 2020 09:58:24 +0200 Subject: [PATCH 02/14] target/i386/cpu: Update comment that mentions Texinfo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Missed in commit 41fba1618b "docs/system: convert the documentation of deprecated features to rST." Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200929075824.1517969-3-armbru@redhat.com> Signed-off-by: Laurent Vivier --- target/i386/cpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index f37eb7b675..9eafbe3690 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4127,7 +4127,8 @@ static PropValue tcg_default_props[] = { * We resolve CPU model aliases using -v1 when using "-machine * none", but this is just for compatibility while libvirt isn't * adapted to resolve CPU model versions before creating VMs. - * See "Runnability guarantee of CPU models" at * qemu-deprecated.texi. + * See "Runnability guarantee of CPU models" at + * docs/system/deprecated.rst. */ X86CPUVersion default_cpu_version = 1; From 009f51df0e697bab4578037092057ac398fd15f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Fri, 2 Oct 2020 09:57:16 +0200 Subject: [PATCH 03/14] hw/block/nvme: Simplify timestamp sum MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As the 'timestamp' variable is declared as a 48-bit bitfield, we do not need to wrap the sum result. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Klaus Jensen Message-Id: <20201002075716.1657849-1-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/block/nvme.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 63078f6009..44fa5b9076 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1280,12 +1280,7 @@ static inline uint64_t nvme_get_timestamp(const NvmeCtrl *n) union nvme_timestamp ts; ts.all = 0; - - /* - * If the sum of the Timestamp value set by the host and the elapsed - * time exceeds 2^48, the value returned should be reduced modulo 2^48. - */ - ts.timestamp = (n->host_timestamp + elapsed_time) & 0xffffffffffff; + ts.timestamp = n->host_timestamp + elapsed_time; /* If the host timestamp is non-zero, set the timestamp origin */ ts.origin = n->host_timestamp ? 0x01 : 0x00; From ff82a54bc4ce76ee407c7c42aa64eeec86285bb7 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Fri, 2 Oct 2020 19:13:43 +0200 Subject: [PATCH 04/14] tests/test-char: Use a proper fallthrough comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For being able to compile with -Werror=implicit-fallthrough we need to use comments that the compiler recognizes. Use "fallthrough" instead of "no break" here. Signed-off-by: Thomas Huth Reviewed-by: Marc-André Lureau Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20201002171343.283426-1-thuth@redhat.com> Signed-off-by: Laurent Vivier --- tests/test-char.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-char.c b/tests/test-char.c index d35cc839bc..9196e566e9 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -70,7 +70,7 @@ static void fe_event(void *opaque, QEMUChrEvent event) h->openclose_mismatch = true; } h->is_open = new_open_state; - /* no break */ + /* fallthrough */ default: quit = true; break; From cd466702f042f435cf8661e2cdcafeb0482e6b3d Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Wed, 30 Sep 2020 17:58:56 +0200 Subject: [PATCH 05/14] vmdk: fix maybe uninitialized warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fedora 32 gcc 10 seems to give false positives: Compiling C object libblock.fa.p/block_vmdk.c.o ../block/vmdk.c: In function ‘vmdk_parse_extents’: ../block/vmdk.c:587:5: error: ‘extent’ may be used uninitialized in this function [-Werror=maybe-uninitialized] 587 | g_free(extent->l1_table); | ^~~~~~~~~~~~~~~~~~~~~~~~ ../block/vmdk.c:754:17: note: ‘extent’ was declared here 754 | VmdkExtent *extent; | ^~~~~~ ../block/vmdk.c:620:11: error: ‘extent’ may be used uninitialized in this function [-Werror=maybe-uninitialized] 620 | ret = vmdk_init_tables(bs, extent, errp); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../block/vmdk.c:598:17: note: ‘extent’ was declared here 598 | VmdkExtent *extent; | ^~~~~~ ../block/vmdk.c:1178:39: error: ‘extent’ may be used uninitialized in this function [-Werror=maybe-uninitialized] 1178 | extent->flat_start_offset = flat_offset << 9; | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~ ../block/vmdk.c: In function ‘vmdk_open_vmdk4’: ../block/vmdk.c:581:22: error: ‘extent’ may be used uninitialized in this function [-Werror=maybe-uninitialized] 581 | extent->l2_cache = | ~~~~~~~~~~~~~~~~~^ 582 | g_malloc(extent->entry_size * extent->l2_size * L2_CACHE_SIZE); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../block/vmdk.c:872:17: note: ‘extent’ was declared here 872 | VmdkExtent *extent; | ^~~~~~ ../block/vmdk.c: In function ‘vmdk_open’: ../block/vmdk.c:620:11: error: ‘extent’ may be used uninitialized in this function [-Werror=maybe-uninitialized] 620 | ret = vmdk_init_tables(bs, extent, errp); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../block/vmdk.c:598:17: note: ‘extent’ was declared here 598 | VmdkExtent *extent; | ^~~~~~ cc1: all warnings being treated as errors make: *** [Makefile.ninja:884: libblock.fa.p/block_vmdk.c.o] Error 1 fix them by assigning a default value. Signed-off-by: Christian Borntraeger Reviewed-by: Fam Zheng Message-Id: <20200930155859.303148-2-borntraeger@de.ibm.com> Signed-off-by: Laurent Vivier --- block/vmdk.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 8ec62c7ab7..a00dc00eb4 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -595,7 +595,7 @@ static int vmdk_open_vmfs_sparse(BlockDriverState *bs, int ret; uint32_t magic; VMDK3Header header; - VmdkExtent *extent; + VmdkExtent *extent = NULL; ret = bdrv_pread(file, sizeof(magic), &header, sizeof(header)); if (ret < 0) { @@ -751,7 +751,7 @@ static int vmdk_open_se_sparse(BlockDriverState *bs, int ret; VMDKSESparseConstHeader const_header; VMDKSESparseVolatileHeader volatile_header; - VmdkExtent *extent; + VmdkExtent *extent = NULL; ret = bdrv_apply_auto_read_only(bs, "No write support for seSparse images available", errp); @@ -869,7 +869,7 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, uint32_t magic; uint32_t l1_size, l1_entry_sectors; VMDK4Header header; - VmdkExtent *extent; + VmdkExtent *extent = NULL; BDRVVmdkState *s = bs->opaque; int64_t l1_backup_offset = 0; bool compressed; @@ -1088,7 +1088,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, BdrvChild *extent_file; BdrvChildRole extent_role; BDRVVmdkState *s = bs->opaque; - VmdkExtent *extent; + VmdkExtent *extent = NULL; char extent_opt_prefix[32]; Error *local_err = NULL; From 5ad1037cad3572e382043a2a525b7967ddc9357f Mon Sep 17 00:00:00 2001 From: Greg Kurz Date: Fri, 2 Oct 2020 18:06:07 +0200 Subject: [PATCH 06/14] hw/acpi/piix4: Rename piix4_pm_add_propeties() to piix4_pm_add_properties() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Greg Kurz Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Li Qiang Message-Id: <160165476743.57452.2128307974125615413.stgit@bahia.lan> Signed-off-by: Laurent Vivier --- hw/acpi/piix4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 894d357f8c..67a1ea4191 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -437,7 +437,7 @@ static void piix4_pm_machine_ready(Notifier *n, void *opaque) (memory_region_present(io_as, 0x2f8) ? 0x90 : 0); } -static void piix4_pm_add_propeties(PIIX4PMState *s) +static void piix4_pm_add_properties(PIIX4PMState *s) { static const uint8_t acpi_enable_cmd = ACPI_ENABLE; static const uint8_t acpi_disable_cmd = ACPI_DISABLE; @@ -509,7 +509,7 @@ static void piix4_pm_realize(PCIDevice *dev, Error **errp) pci_get_bus(dev), s); qbus_set_hotplug_handler(BUS(pci_get_bus(dev)), OBJECT(s)); - piix4_pm_add_propeties(s); + piix4_pm_add_properties(s); } I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, From 21786c7e59847b1612406ff394958f22e5b323f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Mon, 5 Oct 2020 17:27:25 +0200 Subject: [PATCH 07/14] softmmu/memory: Log invalid memory accesses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Log invalid memory accesses with as GUEST_ERROR. This is particularly useful since commit 5d971f9e67 which reverted ("memory: accept mismatching sizes in memory_region_access_valid"). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Michael S. Tsirkin Message-Id: <20201005152725.2143444-1-philmd@redhat.com> Signed-off-by: Laurent Vivier --- softmmu/memory.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/softmmu/memory.c b/softmmu/memory.c index fa280a19f7..403ff3abc9 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -14,6 +14,7 @@ */ #include "qemu/osdep.h" +#include "qemu/log.h" #include "qapi/error.h" #include "cpu.h" #include "exec/memory.h" @@ -1353,10 +1354,18 @@ bool memory_region_access_valid(MemoryRegion *mr, { if (mr->ops->valid.accepts && !mr->ops->valid.accepts(mr->opaque, addr, size, is_write, attrs)) { + qemu_log_mask(LOG_GUEST_ERROR, "Invalid access at addr " + "0x%" HWADDR_PRIX ", size %u, " + "region '%s', reason: rejected\n", + addr, size, memory_region_name(mr)); return false; } if (!mr->ops->valid.unaligned && (addr & (size - 1))) { + qemu_log_mask(LOG_GUEST_ERROR, "Invalid access at addr " + "0x%" HWADDR_PRIX ", size %u, " + "region '%s', reason: unaligned\n", + addr, size, memory_region_name(mr)); return false; } @@ -1367,6 +1376,13 @@ bool memory_region_access_valid(MemoryRegion *mr, if (size > mr->ops->valid.max_access_size || size < mr->ops->valid.min_access_size) { + qemu_log_mask(LOG_GUEST_ERROR, "Invalid access at addr " + "0x%" HWADDR_PRIX ", size %u, " + "region '%s', reason: invalid size " + "(min:%u max:%u)\n", + addr, size, memory_region_name(mr), + mr->ops->valid.min_access_size, + mr->ops->valid.max_access_size); return false; } return true; From 3298bbce1b0e560b88103ddbbbb6548e4b9576cd Mon Sep 17 00:00:00 2001 From: Julia Suvorova Date: Tue, 6 Oct 2020 15:39:58 +0200 Subject: [PATCH 08/14] hw/pci: Fix typo in PCI hot-plug error message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 'occupied' is spelled like 'ocuppied' in the message. Signed-off-by: Julia Suvorova Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20201006133958.600932-1-jusual@redhat.com> Signed-off-by: Laurent Vivier --- hw/pci/pci.c | 2 +- hw/ppc/spapr_pci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 3c8f10b461..100c9381c2 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1036,7 +1036,7 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, return NULL; } else if (dev->hotplugged && pci_get_function_0(pci_dev)) { - error_setg(errp, "PCI: slot %d function 0 already ocuppied by %s," + error_setg(errp, "PCI: slot %d function 0 already occupied by %s," " new func %s cannot be exposed to guest.", PCI_SLOT(pci_get_function_0(pci_dev)->devfn), pci_get_function_0(pci_dev)->name, diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 3999392b32..88ce87f130 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -1571,7 +1571,7 @@ static void spapr_pci_plug(HotplugHandler *plug_handler, */ if (plugged_dev->hotplugged && bus->devices[PCI_DEVFN(slotnr, 0)] && PCI_FUNC(pdev->devfn) != 0) { - error_setg(errp, "PCI: slot %d function 0 already ocuppied by %s," + error_setg(errp, "PCI: slot %d function 0 already occupied by %s," " additional functions can no longer be exposed to guest.", slotnr, bus->devices[PCI_DEVFN(slotnr, 0)]->name); return; From 5b4c95d0a377fe4d898572d35ec5d82b6f89338d Mon Sep 17 00:00:00 2001 From: Elena Afanasova Date: Fri, 9 Oct 2020 12:09:59 -0700 Subject: [PATCH 09/14] block/blkdebug: fix memory leak Spotted by PVS-Studio Signed-off-by: Elena Afanasova Reviewed-by: Eric Blake Message-Id: <1e903f928eb3da332cc95e2a6f87243bd9fe66e4.camel@gmail.com> Signed-off-by: Laurent Vivier --- block/blkdebug.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/blkdebug.c b/block/blkdebug.c index eecbf3e5c4..54da719dd1 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -215,6 +215,7 @@ static int add_rule(void *opaque, QemuOpts *opts, Error **errp) BLKDEBUG_IO_TYPE__MAX, &local_error); if (local_error) { error_propagate(errp, local_error); + g_free(rule); return -1; } if (iotype != BLKDEBUG_IO_TYPE__MAX) { From 9aa2c49eb76838618f1eabd04a688ad2a44c24e5 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Fri, 9 Oct 2020 13:38:42 +0200 Subject: [PATCH 10/14] hw/char/serial: remove duplicate .class_init in serial_mm_info MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit .class_init is already set to serial_mm_class_init. Remove the duplicate entry. Fixes: 17fd1a6490b1 ("serial-mm: add "regshift" property") Cc: marcandre.lureau@redhat.com Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Li Qiang Reviewed-by: Alistair Francis Message-Id: <20201009113843.60995-1-lvivier@redhat.com> Signed-off-by: Laurent Vivier --- hw/char/serial.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 4386adabd4..97f71879ff 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -1120,7 +1120,6 @@ static const TypeInfo serial_mm_info = { .class_init = serial_mm_class_init, .instance_init = serial_mm_instance_init, .instance_size = sizeof(SerialMM), - .class_init = serial_mm_class_init, }; static void serial_register_types(void) From 16b66c5626c27b660692f3e60827f58f167e001f Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Fri, 9 Oct 2020 13:38:43 +0200 Subject: [PATCH 11/14] goldfish_rtc: change MemoryRegionOps endianness to DEVICE_NATIVE_ENDIAN The doc [1] doesn't define the endianness, but the kernel driver uses readl() to access the registers, so we can guess it depends on the architecture endianness. As riscv architecture endianness is little it might not change anything for it. Moreover, android implementation uses DEVICE_NATIVE_ENDIAN [2] [1] https://android.googlesource.com/platform/external/qemu/+/master/docs/GOLDFISH-VIRTUAL-HARDWARE.TXT [2] https://android.googlesource.com/platform/external/qemu/+/refs/heads/emu-master-dev/hw/timer/goldfish_timer.c#177 Fixes: 9a5b40b84279 ("hw: rtc: Add Goldfish RTC device") Cc: Anup.Patel@wdc.com Signed-off-by: Laurent Vivier Reviewed-by: Alistair Francis Message-Id: <20201009113843.60995-2-lvivier@redhat.com> Signed-off-by: Laurent Vivier --- hw/rtc/goldfish_rtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/rtc/goldfish_rtc.c b/hw/rtc/goldfish_rtc.c index 6ddd45cce0..0f4e8185a7 100644 --- a/hw/rtc/goldfish_rtc.c +++ b/hw/rtc/goldfish_rtc.c @@ -217,7 +217,7 @@ static int goldfish_rtc_post_load(void *opaque, int version_id) static const MemoryRegionOps goldfish_rtc_ops = { .read = goldfish_rtc_read, .write = goldfish_rtc_write, - .endianness = DEVICE_LITTLE_ENDIAN, + .endianness = DEVICE_NATIVE_ENDIAN, .valid = { .min_access_size = 4, .max_access_size = 4 From b5c6b870efe1c279b363d08c78ab76365ca7156e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Sun, 11 Oct 2020 22:01:12 +0200 Subject: [PATCH 12/14] target/sparc/int32_helper: Remove duplicated 'Tag Overflow' entry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 0b09be2b2f ("Nicer debug output for exceptions") added twice the same "Tag Overflow" entry, remove the extra one. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Message-Id: <20201011200112.3222822-1-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- target/sparc/int32_helper.c | 1 - 1 file changed, 1 deletion(-) diff --git a/target/sparc/int32_helper.c b/target/sparc/int32_helper.c index 9a71e1abd8..ba63c739c1 100644 --- a/target/sparc/int32_helper.c +++ b/target/sparc/int32_helper.c @@ -50,7 +50,6 @@ static const char * const excp_names[0x80] = { [TT_EXTINT | 0xd] = "External Interrupt 13", [TT_EXTINT | 0xe] = "External Interrupt 14", [TT_EXTINT | 0xf] = "External Interrupt 15", - [TT_TOVF] = "Tag Overflow", [TT_CODE_ACCESS] = "Instruction Access Error", [TT_DATA_ACCESS] = "Data Access Error", [TT_DIV_ZERO] = "Division By Zero", From 662770af7c6e8cf02aebdbf53cae6828ea1e49aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Thu, 8 Oct 2020 20:59:53 +0400 Subject: [PATCH 13/14] mingw: fix error __USE_MINGW_ANSI_STDIO redefined MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Always put osdep.h first, and remove redundant stdlib.h include. Signed-off-by: Marc-André Lureau Reviewed-by: Peter Maydell Reviewed-by: Stefan Weil Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20201008165953.884599-1-marcandre.lureau@redhat.com> Signed-off-by: Laurent Vivier --- migration/dirtyrate.c | 3 ++- tests/test-bitmap.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 68577ef250..47f761e67a 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -10,8 +10,9 @@ * See the COPYING file in the top-level directory. */ -#include #include "qemu/osdep.h" + +#include #include "qapi/error.h" #include "cpu.h" #include "qemu/config-file.h" diff --git a/tests/test-bitmap.c b/tests/test-bitmap.c index 2f5b71458a..8db4f67883 100644 --- a/tests/test-bitmap.c +++ b/tests/test-bitmap.c @@ -8,7 +8,6 @@ * Author: Peter Xu */ -#include #include "qemu/osdep.h" #include "qemu/bitmap.h" From 6125673eaf711247405e796604204bb7d74090f4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 12 Oct 2020 18:57:19 +0100 Subject: [PATCH 14/14] meson.build: drop duplicate 'sparc64' entry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CC: Laurent Vivier CC: qemu-trivial@nongnu.org Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Sergei Trofimovich Message-Id: <20201012175719.2573367-1-slyfox@gentoo.org> Signed-off-by: Laurent Vivier --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 17c89c87c6..392d326f45 100644 --- a/meson.build +++ b/meson.build @@ -41,7 +41,7 @@ have_block = have_system or have_tools python = import('python').find_installation() supported_oses = ['windows', 'freebsd', 'netbsd', 'openbsd', 'darwin', 'sunos', 'linux'] -supported_cpus = ['ppc', 'ppc64', 's390x', 'sparc64', 'riscv32', 'riscv64', 'x86', 'x86_64', +supported_cpus = ['ppc', 'ppc64', 's390x', 'riscv32', 'riscv64', 'x86', 'x86_64', 'arm', 'aarch64', 'mips', 'mips64', 'sparc', 'sparc64'] cpu = host_machine.cpu_family()