All of lore.kernel.org
 help / color / mirror / Atom feed
* [PULL 00/10] Trivial branch for 6.2 patches
@ 2021-09-16 14:10 Laurent Vivier
  2021-09-16 14:10 ` [PULL 01/10] util: Remove redundant checks in the openpty() Laurent Vivier
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: Laurent Vivier @ 2021-09-16 14:10 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev, Laurent Vivier

The following changes since commit 831aaf24967a49d7750090b9dcfd6bf356f16529:

  Merge remote-tracking branch 'remotes/marcandre/tags/misc-pull-request' into staging (2021-09-14 18:14:56 +0100)

are available in the Git repository at:

  git://github.com/vivier/qemu.git tags/trivial-branch-for-6.2-pull-request

for you to fetch changes up to 9ac200acce8c27ef44da31246f337a2454e54e0d:

  target/sparc: Make sparc_cpu_dump_state() static (2021-09-16 14:52:46 +0200)

----------------------------------------------------------------
Trivial patches pull request 20210916

----------------------------------------------------------------

AlexChen (1):
  util: Remove redundant checks in the openpty()

Cai Huoqing (2):
  intel_iommu: Fix typo in comments
  hw/vfio: Fix typo in comments

John Arbuckle (1):
  configure: add missing pc-bios/qemu_vga.ndrv symlink in build tree

Michael Tokarev (2):
  spelling: sytem => system
  target/i386: spelling: occured=>occurred, mininum=>minimum

Philippe Mathieu-Daudé (3):
  hw/i386/acpi-build: Fix a typo
  qdev: Complete qdev_init_gpio_out() documentation
  target/sparc: Make sparc_cpu_dump_state() static

Stefan Weil (1):
  target/avr: Fix compiler errors (-Werror=enum-conversion)

 accel/kvm/kvm-all.c             | 2 +-
 block/file-posix.c              | 2 +-
 configure                       | 4 +++-
 hw/i386/acpi-build.c            | 6 +++---
 hw/i386/intel_iommu.c           | 8 ++++----
 hw/vfio/igd.c                   | 2 +-
 hw/vfio/pci-quirks.c            | 2 +-
 hw/vfio/pci.c                   | 6 +++---
 hw/vfio/platform.c              | 2 +-
 include/hw/qdev-core.h          | 4 ++++
 target/avr/translate.c          | 8 +++-----
 target/i386/cpu-sysemu.c        | 2 +-
 target/sparc/cpu.c              | 2 +-
 target/sparc/cpu.h              | 1 -
 tools/virtiofsd/fuse_lowlevel.h | 4 ++--
 util/qemu-openpty.c             | 7 +++----
 16 files changed, 32 insertions(+), 30 deletions(-)

-- 
2.31.1



^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PULL 01/10] util: Remove redundant checks in the openpty()
  2021-09-16 14:10 [PULL 00/10] Trivial branch for 6.2 patches Laurent Vivier
@ 2021-09-16 14:10 ` Laurent Vivier
  2021-09-16 14:10 ` [PULL 02/10] hw/i386/acpi-build: Fix a typo Laurent Vivier
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Laurent Vivier @ 2021-09-16 14:10 UTC (permalink / raw)
  To: qemu-devel
  Cc: Peter Maydell, qemu-trivial, Michael Tokarev, Laurent Vivier,
	AlexChen, Euler Robot

From: AlexChen <alex.chen@huawei.com>

As we can see from the following function call stack, amaster and aslave
can not be NULL: char_pty_open() -> qemu_openpty_raw() -> openpty().
In addition, according to the API specification for openpty():
https://www.gnu.org/software/libc/manual/html_node/Pseudo_002dTerminal-Pairs.html,
the arguments name, termp and winp can all be NULL, but arguments amaster or aslave
can not be NULL.
Finally, amaster and aslave has been dereferenced at the beginning of the openpty().
So the checks on amaster and aslave in the openpty() are redundant. Remove them.

Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Alex Chen <alex.chen@huawei.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <5F9FE5B8.1030803@huawei.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 util/qemu-openpty.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/util/qemu-openpty.c b/util/qemu-openpty.c
index eb17f5b0bcec..427f43a76973 100644
--- a/util/qemu-openpty.c
+++ b/util/qemu-openpty.c
@@ -80,10 +80,9 @@ static int openpty(int *amaster, int *aslave, char *name,
             (termp != NULL && tcgetattr(sfd, termp) < 0))
                 goto err;
 
-        if (amaster)
-                *amaster = mfd;
-        if (aslave)
-                *aslave = sfd;
+        *amaster = mfd;
+        *aslave = sfd;
+
         if (winp)
                 ioctl(sfd, TIOCSWINSZ, winp);
 
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PULL 02/10] hw/i386/acpi-build: Fix a typo
  2021-09-16 14:10 [PULL 00/10] Trivial branch for 6.2 patches Laurent Vivier
  2021-09-16 14:10 ` [PULL 01/10] util: Remove redundant checks in the openpty() Laurent Vivier
@ 2021-09-16 14:10 ` Laurent Vivier
  2021-09-16 14:10 ` [PULL 03/10] qdev: Complete qdev_init_gpio_out() documentation Laurent Vivier
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Laurent Vivier @ 2021-09-16 14:10 UTC (permalink / raw)
  To: qemu-devel
  Cc: qemu-trivial, Philippe Mathieu-Daudé,
	Ani Sinha, Michael Tokarev, Laurent Vivier

From: Philippe Mathieu-Daudé <philmd@redhat.com>

Fix 'hotplugabble' -> 'hotpluggable' typo.

Reviewed-by: Ani Sinha <ani@anisinha.ca>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210911082036.436139-1-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hw/i386/acpi-build.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index d1f5fa3b5a51..dfaa47cdc20b 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1916,7 +1916,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
     PCMachineState *pcms = PC_MACHINE(machine);
     int nb_numa_nodes = machine->numa_state->num_nodes;
     NodeInfo *numa_info = machine->numa_state->nodes;
-    ram_addr_t hotplugabble_address_space_size =
+    ram_addr_t hotpluggable_address_space_size =
         object_property_get_int(OBJECT(pcms), PC_MACHINE_DEVMEM_REGION_SIZE,
                                 NULL);
 
@@ -2022,10 +2022,10 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
      * Memory devices may override proximity set by this entry,
      * providing _PXM method if necessary.
      */
-    if (hotplugabble_address_space_size) {
+    if (hotpluggable_address_space_size) {
         numamem = acpi_data_push(table_data, sizeof *numamem);
         build_srat_memory(numamem, machine->device_memory->base,
-                          hotplugabble_address_space_size, nb_numa_nodes - 1,
+                          hotpluggable_address_space_size, nb_numa_nodes - 1,
                           MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED);
     }
 
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PULL 03/10] qdev: Complete qdev_init_gpio_out() documentation
  2021-09-16 14:10 [PULL 00/10] Trivial branch for 6.2 patches Laurent Vivier
  2021-09-16 14:10 ` [PULL 01/10] util: Remove redundant checks in the openpty() Laurent Vivier
  2021-09-16 14:10 ` [PULL 02/10] hw/i386/acpi-build: Fix a typo Laurent Vivier
@ 2021-09-16 14:10 ` Laurent Vivier
  2021-09-16 14:10 ` [PULL 04/10] spelling: sytem => system Laurent Vivier
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Laurent Vivier @ 2021-09-16 14:10 UTC (permalink / raw)
  To: qemu-devel
  Cc: qemu-trivial, Philippe Mathieu-Daudé,
	Michael Tokarev, Laurent Vivier, Peter Maydell

From: Philippe Mathieu-Daudé <philmd@redhat.com>

qdev_init_gpio_out() states it "creates an array of anonymous
output GPIO lines" but doesn't document how this array is
released. Add a note that it is automatically free'd in qdev
instance_finalize().

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20210819142731.2827912-1-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 include/hw/qdev-core.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 762f9584dde1..34c8a7506a1b 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -598,6 +598,10 @@ void qdev_init_gpio_in(DeviceState *dev, qemu_irq_handler handler, int n);
  *
  * See qdev_connect_gpio_out() for how code that uses such a device
  * can connect to one of its output GPIO lines.
+ *
+ * There is no need to release the @pins allocated array because it
+ * will be automatically released when @dev calls its instance_finalize()
+ * handler.
  */
 void qdev_init_gpio_out(DeviceState *dev, qemu_irq *pins, int n);
 /**
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PULL 04/10] spelling: sytem => system
  2021-09-16 14:10 [PULL 00/10] Trivial branch for 6.2 patches Laurent Vivier
                   ` (2 preceding siblings ...)
  2021-09-16 14:10 ` [PULL 03/10] qdev: Complete qdev_init_gpio_out() documentation Laurent Vivier
@ 2021-09-16 14:10 ` Laurent Vivier
  2021-09-16 14:10 ` [PULL 05/10] configure: add missing pc-bios/qemu_vga.ndrv symlink in build tree Laurent Vivier
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Laurent Vivier @ 2021-09-16 14:10 UTC (permalink / raw)
  To: qemu-devel
  Cc: qemu-trivial, Philippe Mathieu-Daudé,
	Michael Tokarev, Laurent Vivier

From: Michael Tokarev <mjt@tls.msk.ru>

Signed-off-By: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <fefb5f5c-82bc-05e2-b4c1-665e9d6896ff@msgid.tls.msk.ru>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 block/file-posix.c              | 2 +-
 tools/virtiofsd/fuse_lowlevel.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/block/file-posix.c b/block/file-posix.c
index cb9bffe0471c..1854bfa397b6 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -1705,7 +1705,7 @@ static int handle_aiocb_write_zeroes(void *opaque)
              */
             warn_report_once("Your file system is misbehaving: "
                              "fallocate(FALLOC_FL_PUNCH_HOLE) returned EINVAL. "
-                             "Please report this bug to your file sytem "
+                             "Please report this bug to your file system "
                              "vendor.");
         } else if (ret != -ENOTSUP) {
             return ret;
diff --git a/tools/virtiofsd/fuse_lowlevel.h b/tools/virtiofsd/fuse_lowlevel.h
index 4b4e8c9724fe..c55c0ca2fc1c 100644
--- a/tools/virtiofsd/fuse_lowlevel.h
+++ b/tools/virtiofsd/fuse_lowlevel.h
@@ -1603,7 +1603,7 @@ int fuse_lowlevel_notify_inval_inode(struct fuse_session *se, fuse_ino_t ino,
  * parent/name
  *
  * To avoid a deadlock this function must not be called in the
- * execution path of a related filesytem operation or within any code
+ * execution path of a related filesystem operation or within any code
  * that could hold a lock that could be needed to execute such an
  * operation. As of kernel 4.18, a "related operation" is a lookup(),
  * symlink(), mknod(), mkdir(), unlink(), rename(), link() or create()
@@ -1636,7 +1636,7 @@ int fuse_lowlevel_notify_inval_entry(struct fuse_session *se, fuse_ino_t parent,
  * that the dentry has been deleted.
  *
  * To avoid a deadlock this function must not be called while
- * executing a related filesytem operation or while holding a lock
+ * executing a related filesystem operation or while holding a lock
  * that could be needed to execute such an operation (see the
  * description of fuse_lowlevel_notify_inval_entry() for more
  * details).
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PULL 05/10] configure: add missing pc-bios/qemu_vga.ndrv symlink in build tree
  2021-09-16 14:10 [PULL 00/10] Trivial branch for 6.2 patches Laurent Vivier
                   ` (3 preceding siblings ...)
  2021-09-16 14:10 ` [PULL 04/10] spelling: sytem => system Laurent Vivier
@ 2021-09-16 14:10 ` Laurent Vivier
  2021-09-16 14:10 ` [PULL 06/10] target/i386: spelling: occured=>occurred, mininum=>minimum Laurent Vivier
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Laurent Vivier @ 2021-09-16 14:10 UTC (permalink / raw)
  To: qemu-devel
  Cc: qemu-trivial, John Arbuckle, Michael Tokarev, Laurent Vivier,
	Peter Maydell

From: John Arbuckle <programmingkidx@gmail.com>

Ensure that a link to pc-bios/qemu_vga.ndrv is added to the build tree,
otherwise the optional MacOS client driver will not be loaded by OpenBIOS
when launching QEMU directly from the build directory.

Signed-off-by: John Arbuckle <programmingkidx@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20210831165020.84855-1-programmingkidx@gmail.com>
[lv: commit message rewording as suggested by Mark]
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 configure | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index da2501489f34..1043ccce4f99 100755
--- a/configure
+++ b/configure
@@ -5052,7 +5052,9 @@ for bios_file in \
     $source_path/pc-bios/openbios-* \
     $source_path/pc-bios/u-boot.* \
     $source_path/pc-bios/edk2-*.fd.bz2 \
-    $source_path/pc-bios/palcode-*
+    $source_path/pc-bios/palcode-* \
+    $source_path/pc-bios/qemu_vga.ndrv
+
 do
     LINKS="$LINKS pc-bios/$(basename $bios_file)"
 done
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PULL 06/10] target/i386: spelling: occured=>occurred, mininum=>minimum
  2021-09-16 14:10 [PULL 00/10] Trivial branch for 6.2 patches Laurent Vivier
                   ` (4 preceding siblings ...)
  2021-09-16 14:10 ` [PULL 05/10] configure: add missing pc-bios/qemu_vga.ndrv symlink in build tree Laurent Vivier
@ 2021-09-16 14:10 ` Laurent Vivier
  2021-09-16 14:10 ` [PULL 07/10] intel_iommu: Fix typo in comments Laurent Vivier
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Laurent Vivier @ 2021-09-16 14:10 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev, Laurent Vivier

From: Michael Tokarev <mjt@tls.msk.ru>

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Message-Id: <20210818141352.417716-1-mjt@msgid.tls.msk.ru>
[lv: add mininum=>minimum in subject]
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 accel/kvm/kvm-all.c      | 2 +-
 target/i386/cpu-sysemu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 0125c17edb8d..cace5ffe6442 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -2469,7 +2469,7 @@ static int kvm_init(MachineState *ms)
             ret = kvm_vm_enable_cap(s, KVM_CAP_DIRTY_LOG_RING, 0, ring_bytes);
             if (ret) {
                 error_report("Enabling of KVM dirty ring failed: %s. "
-                             "Suggested mininum value is 1024.", strerror(-ret));
+                             "Suggested minimum value is 1024.", strerror(-ret));
                 goto err;
             }
 
diff --git a/target/i386/cpu-sysemu.c b/target/i386/cpu-sysemu.c
index 1078e3d157f0..37b7c562f53c 100644
--- a/target/i386/cpu-sysemu.c
+++ b/target/i386/cpu-sysemu.c
@@ -335,7 +335,7 @@ void x86_cpu_get_crash_info_qom(Object *obj, Visitor *v,
     GuestPanicInformation *panic_info;
 
     if (!cs->crash_occurred) {
-        error_setg(errp, "No crash occured");
+        error_setg(errp, "No crash occurred");
         return;
     }
 
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PULL 07/10] intel_iommu: Fix typo in comments
  2021-09-16 14:10 [PULL 00/10] Trivial branch for 6.2 patches Laurent Vivier
                   ` (5 preceding siblings ...)
  2021-09-16 14:10 ` [PULL 06/10] target/i386: spelling: occured=>occurred, mininum=>minimum Laurent Vivier
@ 2021-09-16 14:10 ` Laurent Vivier
  2021-09-16 14:10 ` [PULL 08/10] hw/vfio: " Laurent Vivier
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Laurent Vivier @ 2021-09-16 14:10 UTC (permalink / raw)
  To: qemu-devel
  Cc: qemu-trivial, Michael Tokarev, Laurent Vivier, Peter Xu,
	Cai Huoqing, Philippe Mathieu-Daudé

From: Cai Huoqing <caihuoqing@baidu.com>

Fix typo:
*Unknwon  ==> Unknown
*futher  ==> further
*configed  ==> configured

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Peter Xu <peterx@redhat.com>
Message-Id: <20210730014942.2311-1-caihuoqing@baidu.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hw/i386/intel_iommu.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 209b3f55530e..75f075547f65 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -679,7 +679,7 @@ static inline bool vtd_pe_type_check(X86IOMMUState *x86_iommu,
         }
         break;
     default:
-        /* Unknwon type */
+        /* Unknown type */
         return false;
     }
     return true;
@@ -692,7 +692,7 @@ static inline bool vtd_pdire_present(VTDPASIDDirEntry *pdire)
 
 /**
  * Caller of this function should check present bit if wants
- * to use pdir entry for futher usage except for fpd bit check.
+ * to use pdir entry for further usage except for fpd bit check.
  */
 static int vtd_get_pdire_from_pdir_table(dma_addr_t pasid_dir_base,
                                          uint32_t pasid,
@@ -746,7 +746,7 @@ static int vtd_get_pe_in_pasid_leaf_table(IntelIOMMUState *s,
 
 /**
  * Caller of this function should check present bit if wants
- * to use pasid entry for futher usage except for fpd bit check.
+ * to use pasid entry for further usage except for fpd bit check.
  */
 static int vtd_get_pe_from_pdire(IntelIOMMUState *s,
                                  uint32_t pasid,
@@ -1507,7 +1507,7 @@ static int vtd_sync_shadow_page_table(VTDAddressSpace *vtd_as)
 }
 
 /*
- * Check if specific device is configed to bypass address
+ * Check if specific device is configured to bypass address
  * translation for DMA requests. In Scalable Mode, bypass
  * 1st-level translation or 2nd-level translation, it depends
  * on PGTT setting.
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PULL 08/10] hw/vfio: Fix typo in comments
  2021-09-16 14:10 [PULL 00/10] Trivial branch for 6.2 patches Laurent Vivier
                   ` (6 preceding siblings ...)
  2021-09-16 14:10 ` [PULL 07/10] intel_iommu: Fix typo in comments Laurent Vivier
@ 2021-09-16 14:10 ` Laurent Vivier
  2021-09-16 14:10 ` [PULL 09/10] target/avr: Fix compiler errors (-Werror=enum-conversion) Laurent Vivier
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Laurent Vivier @ 2021-09-16 14:10 UTC (permalink / raw)
  To: qemu-devel
  Cc: qemu-trivial, Cai Huoqing, Michael Tokarev, Laurent Vivier,
	Philippe Mathieu-Daudé

From: Cai Huoqing <caihuoqing@baidu.com>

Fix typo in comments:
*programatically  ==> programmatically
*disconecting  ==> disconnecting
*mulitple  ==> multiple
*timout  ==> timeout
*regsiter  ==> register
*forumula  ==> formula

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210730012613.2198-1-caihuoqing@baidu.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hw/vfio/igd.c        | 2 +-
 hw/vfio/pci-quirks.c | 2 +-
 hw/vfio/pci.c        | 6 +++---
 hw/vfio/platform.c   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hw/vfio/igd.c b/hw/vfio/igd.c
index 470205f487eb..d4685709a3b0 100644
--- a/hw/vfio/igd.c
+++ b/hw/vfio/igd.c
@@ -557,7 +557,7 @@ void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr)
      * must allocate a 1MB aligned reserved memory region below 4GB with
      * the requested size (in bytes) for use by the Intel PCI class VGA
      * device at VM address 00:02.0.  The base address of this reserved
-     * memory region must be written to the device BDSM regsiter at PCI
+     * memory region must be written to the device BDSM register at PCI
      * config offset 0x5C.
      */
     bdsm_size = g_malloc(sizeof(*bdsm_size));
diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
index e21a6ede1140..0cf69a8c6d6f 100644
--- a/hw/vfio/pci-quirks.c
+++ b/hw/vfio/pci-quirks.c
@@ -1356,7 +1356,7 @@ static bool vfio_radeon_smc_is_running(VFIOPCIDevice *vdev)
 /*
  * The scope of a config reset is controlled by a mode bit in the misc register
  * and a fuse, exposed as a bit in another register.  The fuse is the default
- * (0 = GFX, 1 = whole GPU), the misc bit is a toggle, with the forumula
+ * (0 = GFX, 1 = whole GPU), the misc bit is a toggle, with the formula
  * scope = !(misc ^ fuse), where the resulting scope is defined the same as
  * the fuse.  A truth table therefore tells us that if misc == fuse, we need
  * to flip the value of the bit in the misc register.
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index e1ea1d8a23b5..4feaa1cb6888 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -1364,7 +1364,7 @@ static void vfio_pci_relocate_msix(VFIOPCIDevice *vdev, Error **errp)
          * TODO: Lookup table for known devices.
          *
          * Logically we might use an algorithm here to select the BAR adding
-         * the least additional MMIO space, but we cannot programatically
+         * the least additional MMIO space, but we cannot programmatically
          * predict the driver dependency on BAR ordering or sizing, therefore
          * 'auto' becomes a lookup for combinations reported to work.
          */
@@ -2158,7 +2158,7 @@ static void vfio_pci_pre_reset(VFIOPCIDevice *vdev)
     }
 
     /*
-     * Stop any ongoing DMA by disconecting I/O, MMIO, and bus master.
+     * Stop any ongoing DMA by disconnecting I/O, MMIO, and bus master.
      * Also put INTx Disable in known state.
      */
     cmd = vfio_pci_read_config(pdev, PCI_COMMAND, 2);
@@ -2384,7 +2384,7 @@ out_single:
 }
 
 /*
- * We want to differentiate hot reset of mulitple in-use devices vs hot reset
+ * We want to differentiate hot reset of multiple in-use devices vs hot reset
  * of a single in-use device.  VFIO_DEVICE_RESET will already handle the case
  * of doing hot resets when there is only a single device per bus.  The in-use
  * here refers to how many VFIODevices are affected.  A hot reset that affects
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index cc3f66f7e44c..f8f08a0f362d 100644
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -156,7 +156,7 @@ static void vfio_mmap_set_enabled(VFIOPlatformDevice *vdev, bool enabled)
  * if there is no more active IRQ
  * @opaque: actually points to the VFIO platform device
  *
- * Called on mmap timer timout, this function checks whether the
+ * Called on mmap timer timeout, this function checks whether the
  * IRQ is still active and if not, restores the fast path.
  * by construction a single eventfd is handled at a time.
  * if the IRQ is still active, the timer is re-programmed.
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PULL 09/10] target/avr: Fix compiler errors (-Werror=enum-conversion)
  2021-09-16 14:10 [PULL 00/10] Trivial branch for 6.2 patches Laurent Vivier
                   ` (7 preceding siblings ...)
  2021-09-16 14:10 ` [PULL 08/10] hw/vfio: " Laurent Vivier
@ 2021-09-16 14:10 ` Laurent Vivier
  2021-09-16 14:10 ` [PULL 10/10] target/sparc: Make sparc_cpu_dump_state() static Laurent Vivier
  2021-09-16 20:08 ` [PULL 00/10] Trivial branch for 6.2 patches Peter Maydell
  10 siblings, 0 replies; 12+ messages in thread
From: Laurent Vivier @ 2021-09-16 14:10 UTC (permalink / raw)
  To: qemu-devel
  Cc: qemu-trivial, Stefan Weil, Michael Tokarev, Laurent Vivier,
	Michael Rolnik

From: Stefan Weil <sw@weilnetz.de>

../target/avr/translate.c: In function ‘gen_jmp_ez’:
../target/avr/translate.c:1012:22: error: implicit conversion from ‘enum <anonymous>’ to ‘DisasJumpType’ [-Werror=enum-conversion]
 1012 |     ctx->base.is_jmp = DISAS_LOOKUP;
      |                      ^

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Michael Rolnik <mrolnik@gmail.com>
Message-Id: <20210706180936.249912-1-sw@weilnetz.de>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 target/avr/translate.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/target/avr/translate.c b/target/avr/translate.c
index 1111e08b83f3..438e7b13c18d 100644
--- a/target/avr/translate.c
+++ b/target/avr/translate.c
@@ -70,11 +70,9 @@ static const char reg_names[NUMBER_OF_CPU_REGISTERS][8] = {
 };
 #define REG(x) (cpu_r[x])
 
-enum {
-    DISAS_EXIT   = DISAS_TARGET_0,  /* We want return to the cpu main loop.  */
-    DISAS_LOOKUP = DISAS_TARGET_1,  /* We have a variable condition exit.  */
-    DISAS_CHAIN  = DISAS_TARGET_2,  /* We have a single condition exit.  */
-};
+#define DISAS_EXIT   DISAS_TARGET_0  /* We want return to the cpu main loop.  */
+#define DISAS_LOOKUP DISAS_TARGET_1  /* We have a variable condition exit.  */
+#define DISAS_CHAIN  DISAS_TARGET_2  /* We have a single condition exit.  */
 
 typedef struct DisasContext DisasContext;
 
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PULL 10/10] target/sparc: Make sparc_cpu_dump_state() static
  2021-09-16 14:10 [PULL 00/10] Trivial branch for 6.2 patches Laurent Vivier
                   ` (8 preceding siblings ...)
  2021-09-16 14:10 ` [PULL 09/10] target/avr: Fix compiler errors (-Werror=enum-conversion) Laurent Vivier
@ 2021-09-16 14:10 ` Laurent Vivier
  2021-09-16 20:08 ` [PULL 00/10] Trivial branch for 6.2 patches Peter Maydell
  10 siblings, 0 replies; 12+ messages in thread
From: Laurent Vivier @ 2021-09-16 14:10 UTC (permalink / raw)
  To: qemu-devel
  Cc: qemu-trivial, Mark Cave-Ayland, Michael Tokarev, Laurent Vivier,
	Philippe Mathieu-Daudé

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

The sparc_cpu_dump_state() function is only called within
the same file. Make it static.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20210916084002.1918445-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 target/sparc/cpu.c | 2 +-
 target/sparc/cpu.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
index da6b30ec747a..2bf67fb99d60 100644
--- a/target/sparc/cpu.c
+++ b/target/sparc/cpu.c
@@ -610,7 +610,7 @@ static void cpu_print_cc(FILE *f, uint32_t cc)
 #define REGS_PER_LINE 8
 #endif
 
-void sparc_cpu_dump_state(CPUState *cs, FILE *f, int flags)
+static void sparc_cpu_dump_state(CPUState *cs, FILE *f, int flags)
 {
     SPARCCPU *cpu = SPARC_CPU(cs);
     CPUSPARCState *env = &cpu->env;
diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h
index ff8ae73002a3..1f40d768d8b5 100644
--- a/target/sparc/cpu.h
+++ b/target/sparc/cpu.h
@@ -571,7 +571,6 @@ extern const VMStateDescription vmstate_sparc_cpu;
 #endif
 
 void sparc_cpu_do_interrupt(CPUState *cpu);
-void sparc_cpu_dump_state(CPUState *cpu, FILE *f, int flags);
 hwaddr sparc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
 int sparc_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg);
 int sparc_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: [PULL 00/10] Trivial branch for 6.2 patches
  2021-09-16 14:10 [PULL 00/10] Trivial branch for 6.2 patches Laurent Vivier
                   ` (9 preceding siblings ...)
  2021-09-16 14:10 ` [PULL 10/10] target/sparc: Make sparc_cpu_dump_state() static Laurent Vivier
@ 2021-09-16 20:08 ` Peter Maydell
  10 siblings, 0 replies; 12+ messages in thread
From: Peter Maydell @ 2021-09-16 20:08 UTC (permalink / raw)
  To: Laurent Vivier; +Cc: QEMU Trivial, Michael Tokarev, QEMU Developers

On Thu, 16 Sept 2021 at 15:19, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 831aaf24967a49d7750090b9dcfd6bf356f16529:
>
>   Merge remote-tracking branch 'remotes/marcandre/tags/misc-pull-request' into staging (2021-09-14 18:14:56 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/vivier/qemu.git tags/trivial-branch-for-6.2-pull-request
>
> for you to fetch changes up to 9ac200acce8c27ef44da31246f337a2454e54e0d:
>
>   target/sparc: Make sparc_cpu_dump_state() static (2021-09-16 14:52:46 +0200)
>
> ----------------------------------------------------------------
> Trivial patches pull request 20210916
>
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/6.2
for any user-visible changes.

-- PMM


^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2021-09-16 20:10 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-16 14:10 [PULL 00/10] Trivial branch for 6.2 patches Laurent Vivier
2021-09-16 14:10 ` [PULL 01/10] util: Remove redundant checks in the openpty() Laurent Vivier
2021-09-16 14:10 ` [PULL 02/10] hw/i386/acpi-build: Fix a typo Laurent Vivier
2021-09-16 14:10 ` [PULL 03/10] qdev: Complete qdev_init_gpio_out() documentation Laurent Vivier
2021-09-16 14:10 ` [PULL 04/10] spelling: sytem => system Laurent Vivier
2021-09-16 14:10 ` [PULL 05/10] configure: add missing pc-bios/qemu_vga.ndrv symlink in build tree Laurent Vivier
2021-09-16 14:10 ` [PULL 06/10] target/i386: spelling: occured=>occurred, mininum=>minimum Laurent Vivier
2021-09-16 14:10 ` [PULL 07/10] intel_iommu: Fix typo in comments Laurent Vivier
2021-09-16 14:10 ` [PULL 08/10] hw/vfio: " Laurent Vivier
2021-09-16 14:10 ` [PULL 09/10] target/avr: Fix compiler errors (-Werror=enum-conversion) Laurent Vivier
2021-09-16 14:10 ` [PULL 10/10] target/sparc: Make sparc_cpu_dump_state() static Laurent Vivier
2021-09-16 20:08 ` [PULL 00/10] Trivial branch for 6.2 patches Peter Maydell

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.