Skip to content

Commit 9f7c4f6

Browse files
committed
Merge tag 'misc-fixes-20231113' of https://github.com/philmd/qemu into staging
Misc fixes for 8.2 - Missing Kconfig dependency in hw/mips (Marc-André) - Typo in VMWare model (Alexandra) - New avocado test for x86 processors addressing (Ani) - Fix SyntaxWarnings in avocado (Thomas) - Update virtio-fs mailing list address in MAINTAINERS (Stefan) # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmVSaAwACgkQ4+MsLN6t # wN7L9RAAvlX5MKJe6d3+gYV8NciEYFQGWzgSjtc0IzRenYf1wvxXubFnmeTJ3kfF # VOugAmeQUx5xvD0iPNrYCFn5fb1ZIFDuES25TsUSN38GCfo1/1+pG+wBWPJRwnQg # LhRHLSzwJOiUSzOEWrVW/4f2TUM1svUM7WKAWB1AbO2Dd3BKzb25/AEdgYWCeQKV # xrBFUH/owNCnWHxIFfLEO8Gt2WGkCLgblvLpeu5Mzds/5JcAi1Fb9lgpvvYxB1Jk # Jgb2ic4Lp6+aTxYxS/+EbQcZciM1M7XXVN57xsQZEcave5CQ9fN8dMbTy3GJxEfJ # OqWzLbwxybQCDA2f2Kd0HEv+U828ZD6/8HDfFk1JmZjE8UJ9vsvdnhQDDJOn5VJu # INyupPsgaG86jaQavzAQJ7Cehe4SdEX0B11mdPfujooy4FvO79O8AzlMM2YG8ARn # YydUzc1RnzE9l67RuEPvqiw1htpjJwV32v7nNZzsoBpqHG5OXAAD732OYnu/30a0 # U73tApRwPDUX3kiS8kUvXLq4/2NxFbX5VDx1bcJPTsweGplr59tPzMRpRxKQGhwa # WEsjjqnDNEjYVzTMVfFRQlvDUkcr5Rrgd51Q3MDbm6inCf2JofT4m7UmvFVmOW3p # w7IAbiguwyxC+Us9AkPTh03FYlzT2B+3XhKbAxcYJZ5/oH1O3x8= # =SFhl # -----END PGP SIGNATURE----- # gpg: Signature made Mon 13 Nov 2023 13:16:44 EST # gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full] # Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE * tag 'misc-fixes-20231113' of https://github.com/philmd/qemu: MAINTAINERS: update virtio-fs mailing list address tests/avocado/machine_s390_ccw_virtio.py: Fix SyntaxWarnings from python 3.12 tests/avocado: add test to exercise processor address space memory bound checks hw/display/vmware_vga: fix probably typo hw/mips: LOONGSON3V depends on UNIMP device Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2 parents 3b06e40 + 04c0a00 commit 9f7c4f6

File tree

4 files changed

+368
-11
lines changed

4 files changed

+368
-11
lines changed

hw/display/vmware_vga.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,8 @@ static inline bool vmsvga_verify_rect(DisplaySurface *surface,
336336
return false;
337337
}
338338
if (h > SVGA_MAX_HEIGHT) {
339-
trace_vmware_verify_rect_greater_than_bound(name, "y", SVGA_MAX_HEIGHT,
340-
y);
339+
trace_vmware_verify_rect_greater_than_bound(name, "h", SVGA_MAX_HEIGHT,
340+
h);
341341
return false;
342342
}
343343
if (y + h > surface_height(surface)) {

hw/mips/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ config LOONGSON3V
4646
select PCI_EXPRESS_GENERIC_BRIDGE
4747
select MSI_NONBROKEN
4848
select FW_CFG_MIPS
49+
select UNIMP
4950

5051
config MIPS_CPS
5152
bool

tests/avocado/machine_s390_ccw_virtio.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ def wait_for_crw_reports(self):
3636
dmesg_clear_count = 1
3737
def clear_guest_dmesg(self):
3838
exec_command_and_wait_for_pattern(self, 'dmesg -c > /dev/null; '
39-
'echo dm_clear\ ' + str(self.dmesg_clear_count),
40-
'dm_clear ' + str(self.dmesg_clear_count))
39+
r'echo dm_clear\ ' + str(self.dmesg_clear_count),
40+
r'dm_clear ' + str(self.dmesg_clear_count))
4141
self.dmesg_clear_count += 1
4242

4343
def test_s390x_devices(self):
@@ -121,15 +121,15 @@ def test_s390x_devices(self):
121121
'cat /sys/bus/ccw/devices/0.1.1111/cutype',
122122
'3832/01')
123123
exec_command_and_wait_for_pattern(self,
124-
'cat /sys/bus/pci/devices/0005\:00\:00.0/subsystem_vendor',
125-
'0x1af4')
124+
r'cat /sys/bus/pci/devices/0005\:00\:00.0/subsystem_vendor',
125+
r'0x1af4')
126126
exec_command_and_wait_for_pattern(self,
127-
'cat /sys/bus/pci/devices/0005\:00\:00.0/subsystem_device',
128-
'0x0001')
127+
r'cat /sys/bus/pci/devices/0005\:00\:00.0/subsystem_device',
128+
r'0x0001')
129129
# check fid propagation
130130
exec_command_and_wait_for_pattern(self,
131-
'cat /sys/bus/pci/devices/000a\:00\:00.0/function_id',
132-
'0x0000000c')
131+
r'cat /sys/bus/pci/devices/000a\:00\:00.0/function_id',
132+
r'0x0000000c')
133133
# add another device
134134
self.clear_guest_dmesg()
135135
self.vm.cmd('device_add', driver='virtio-net-ccw',
@@ -235,7 +235,7 @@ def test_s390x_fedora(self):
235235
'while ! (dmesg | grep gpudrmfb) ; do sleep 1 ; done',
236236
'virtio_gpudrmfb frame buffer device')
237237
exec_command_and_wait_for_pattern(self,
238-
'echo -e "\e[?25l" > /dev/tty0', ':/#')
238+
r'echo -e "\e[?25l" > /dev/tty0', ':/#')
239239
exec_command_and_wait_for_pattern(self, 'for ((i=0;i<250;i++)); do '
240240
'echo " The qu ick fo x j ump s o ver a laz y d og" >> fox.txt;'
241241
'done',

0 commit comments

Comments
 (0)