Re: [PULL v2 00/61] Misc HW & UI patches for 2024-09-12

["Philippe Mathieu-Daudé" <philmd@linaro.org>]

On 13/9/24 16:30, Peter Maydell wrote:
> On Thu, 12 Sept 2024 at 07:53, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>>
>> v2:
>> - Fill Pierrick's commit description suggested by Eric Blake
>> - Include TMP105 fixes from Guenter
>>
>> The following changes since commit a4eb31c678400472de0b4915b9154a7c20d8332f:
>>
>>    Merge tag 'pull-testing-gdbstub-oct-100924-1' of https://gitlab.com/stsquad/qemu into staging (2024-09-11 13:17:29 +0100)
>>
>> are available in the Git repository at:
>>
>>    https://github.com/philmd/qemu.git tags/hw-misc-20240912
>>
>> for you to fetch changes up to bd480a2baab659abe90da878bc955670691f53a8:
>>
>>    ui: remove break after g_assert_not_reached() (2024-09-12 08:44:48 +0200)
>>
>> ----------------------------------------------------------------
>> Misc HW & UI patches
>>
>> - Remove deprecated SH4 SHIX machine TC58128 NAND EEPROM (Phil)
>> - Remove deprecated CRIS target (Phil)
>> - Remove deprecated RISC-V 'any' CPU type (Phil)
>> - Add fifo8_peek_buf() to correctly handle FIFO wraparound (Mark)
>> - Minor cleanups in Designware PCIe, PL011 and loongson IPI models (Phil)
>> - Fixes in TI TMP105 temperature (Guenter)
>> - Convert Sun ESCC and ADB mouses to QemuInputHandler (Mark)
>> - Prevent heap overflow in VIRTIO sound device (Volker)
>> - Cleanups around g_assert_not_reached() call (Pierrick)
>> - Add Clément as VT-d reviewer (Clément)
>> - Prevent stuck modifier keys and unexpected text input on Windows (Volker)
>> - Explicitly set SDL2 swap interval when OpenGL is enabled (Gert)
> 
> Fails tests on some CI configs:
> 
> https://gitlab.com/qemu-project/qemu/-/jobs/7820098438
> 
> ERROR:../tests/qtest/tmp105-test.c:103:send_and_receive: assertion
> failed (i2c_get16(i2cdev, TMP105_REG_T_LOW) == 0x1234): (0x00001230 ==
> 0x00001234)
> (test program exited with status code -6)
> 
> https://gitlab.com/qemu-project/qemu/-/jobs/7820098228
> 
> ERROR:../tests/qtest/bcm2835-i2c-test.c:84:test_i2c_read_write:
> assertion failed (i2cdata == 0xad): (160 == 173)
> (test program exited with status code -6)

Sorry, I neglected to test the tmp105 patches on CI before posting v2.

Guenter I'll squash on patch #48 (lower 4 bits):

-- >8 --
diff --git a/tests/qtest/bcm2835-i2c-test.c b/tests/qtest/bcm2835-i2c-test.c
index 513ecce61d..1599194926 100644
--- a/tests/qtest/bcm2835-i2c-test.c
+++ b/tests/qtest/bcm2835-i2c-test.c
@@ -81,7 +81,7 @@ static void test_i2c_read_write(gconstpointer data)
      g_assert_cmpint(i2cdata, ==, 0xde);

      i2cdata = readl(base_addr + BCM2835_I2C_FIFO);
-    g_assert_cmpint(i2cdata, ==, 0xad);
+    g_assert_cmpint(i2cdata, ==, 0xa0);

      /* Clear flags */
      writel(base_addr + BCM2835_I2C_S, BCM2835_I2C_S_DONE | 
BCM2835_I2C_S_ERR |
diff --git a/tests/qtest/tmp105-test.c b/tests/qtest/tmp105-test.c
index 3678646df5..85ad4eed85 100644
--- a/tests/qtest/tmp105-test.c
+++ b/tests/qtest/tmp105-test.c
@@ -100,9 +100,9 @@ static void send_and_receive(void *obj, void *data, 
QGuestAllocator *alloc)
      g_assert_cmphex(value, ==, 0x14f0);

      i2c_set16(i2cdev, TMP105_REG_T_LOW, 0x1234);
-    g_assert_cmphex(i2c_get16(i2cdev, TMP105_REG_T_LOW), ==, 0x1234);
+    g_assert_cmphex(i2c_get16(i2cdev, TMP105_REG_T_LOW), ==, 0x1230);
      i2c_set16(i2cdev, TMP105_REG_T_HIGH, 0x4231);
-    g_assert_cmphex(i2c_get16(i2cdev, TMP105_REG_T_HIGH), ==, 0x4231);
+    g_assert_cmphex(i2c_get16(i2cdev, TMP105_REG_T_HIGH), ==, 0x4230);
  }

---

Regards,

Phil.