Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: qemu/qemu
base: e0e5dca517a5
Choose a base ref
...
head repository: qemu/qemu
compare: 0450cf08976f
Choose a head ref
  • 11 commits
  • 12 files changed
  • 8 contributors

Commits on Aug 7, 2023

  1. hw/i2c: Fix bitbang_i2c_data trace event

    The clock and data values were logged swapped. Correct the trace event
    text to match what is logged. Also fix a typo in a comment nearby.
    
    Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
    Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
    zbalaton authored and Michael Tokarev committed Aug 7, 2023
    Copy the full SHA
    8ada214 View commit details
    Browse the repository at this point in the history
  2. stubs/colo.c: spelling

    Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
    Michael Tokarev committed Aug 7, 2023
    Copy the full SHA
    beb1a91 View commit details
    Browse the repository at this point in the history
  3. Fixed incorrect LLONG alignment for openrisc and cris

    OpenRISC (or1k) has long long alignment to 4 bytes, but currently not
    defined in abitypes.h. This lead to incorrect packing of /epoll_event/
    structure and eventually infinite loop while waiting for file
    descriptor[s] event[s].
    
    Fixed also CRIS alignments (1 byte for all types).
    
    Signed-off-by: Luca Bonissi <qemu@bonslack.org>
    Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1770
    Reviewed-by: Thomas Huth <thuth@redhat.com>
    Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
    Luca Bonissi authored and Michael Tokarev committed Aug 7, 2023
    Copy the full SHA
    6ee9608 View commit details
    Browse the repository at this point in the history
  4. chardev: report the handshake error

    This can help to debug connection issues.
    
    Related to:
    https://bugzilla.redhat.com/show_bug.cgi?id=2196182
    
    Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
    Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
    Message-Id: <20230510072531.3937189-1-marcandre.lureau@redhat.com>
    elmarco committed Aug 7, 2023
    Copy the full SHA
    81cd34a View commit details
    Browse the repository at this point in the history
  5. virtio-gpu: free BHs, by implementing unrealize

    Acked-by: Dongwon Kim <dongwon.kim@intel.com>
    Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
    Message-Id: <20230726173929.690601-2-marcandre.lureau@redhat.com>
    elmarco committed Aug 7, 2023
    Copy the full SHA
    957d778 View commit details
    Browse the repository at this point in the history
  6. virtio-gpu: reset gfx resources in main thread

    Calling OpenGL from different threads can have bad consequences if not
    carefully reviewed. It's not generally supported. In my case, I was
    debugging a crash in glDeleteTextures from OPENGL32.DLL, where I asked
    qemu for gl=es, and thus ANGLE implementation was expected. libepoxy did
    resolution of the global pointer for glGenTexture to the GLES version
    from the main thread. But it resolved glDeleteTextures to the GL
    version, because it was done from a different thread without correct
    context. Oops.
    
    Let's stick to the main thread for GL calls by using a BH.
    
    Note: I didn't use atomics for reset_finished check, assuming the BQL
    will provide enough of sync, but I might be wrong.
    
    Acked-by: Dongwon Kim <dongwon.kim@intel.com>
    Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
    Message-Id: <20230726173929.690601-3-marcandre.lureau@redhat.com>
    elmarco committed Aug 7, 2023
    Copy the full SHA
    a41e2d9 View commit details
    Browse the repository at this point in the history
  7. dump: kdump-zlib data pages not dumped with pvtime/aarch64

    The kdump-zlib data pages are not dumped from aarch64 host when the
    'pvtime' is involved, that is, when the block->target_end is not aligned to
    page_size. In the below example, it is expected to dump two blocks.
    
    (qemu) info mtree -f
    ... ...
      00000000090a0000-00000000090a0fff (prio 0, ram): pvtime KVM
    ... ...
      0000000040000000-00000001bfffffff (prio 0, ram): mach-virt.ram KVM
    ... ...
    
    However, there is an issue with get_next_page() so that the pages for
    "mach-virt.ram" will not be dumped.
    
    At line 1296, although we have reached at the end of the 'pvtime' block,
    since it is not aligned to the page_size (e.g., 0x10000), it will not break
    at line 1298.
    
    1255 static bool get_next_page(GuestPhysBlock **blockptr, uint64_t *pfnptr,
    1256                           uint8_t **bufptr, DumpState *s)
    ... ...
    1294             memcpy(buf + addr % page_size, hbuf, n);
    1295             addr += n;
    1296             if (addr % page_size == 0) {
    1297                 /* we filled up the page */
    1298                 break;
    1299             }
    
    As a result, get_next_page() will continue to the next
    block ("mach-virt.ram"). Finally, when get_next_page() returns to the
    caller:
    
    - 'pfnptr' is referring to the 'pvtime'
    - but 'blockptr' is referring to the "mach-virt.ram"
    
    When get_next_page() is called the next time, "*pfnptr += 1" still refers
    to the prior 'pvtime'. It will exit immediately because it is out of the
    range of the current "mach-virt.ram".
    
    The fix is to break when it is time to come to the next block, so that both
    'pfnptr' and 'blockptr' refer to the same block.
    
    Fixes: 94d7884 ("dump: fix kdump to work over non-aligned blocks")
    Cc: Joe Jin <joe.jin@oracle.com>
    Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com>
    Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
    Message-ID: <20230713055819.30497-1-dongli.zhang@oracle.com>
    Dongli Zhang authored and elmarco committed Aug 7, 2023
    Copy the full SHA
    8a64609 View commit details
    Browse the repository at this point in the history
  8. hw/i386/vmmouse:add relative packet flag for button status

    The buttons value use macros instead of direct numbers.
    
    If request relative mode, have to add this for
    guest vmmouse driver to judge this is a relative packet.
    otherwise,vmmouse driver will not match
    the condition 'status & VMMOUSE_RELATIVE_PACKET',
    and can't report events on the correct(relative) input device,
    result to relative mode unuseful.
    
    Signed-off-by: Zongmin Zhou<zhouzongmin@kylinos.cn>
    Message-ID: <20230413081526.2229916-1-zhouzongmin@kylinos.cn>
    Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
    Zongmin Zhou authored and elmarco committed Aug 7, 2023
    Copy the full SHA
    fdd6495 View commit details
    Browse the repository at this point in the history
  9. ui/gtk: set scanout mode in gd_egl/gd_gl_area_scanout_texture

    Fixing a regression (black screen) caused by a commit 92b5815
    ("ui/gtk: set scanout-mode right before scheduling draw").
    
    The commit 92b5815 was made with an assumption that the scanout
    mode needs to be set only if the guest scanout is a dmabuf but there
    are cases (e.g. virtio-gpu-virgl) where the scanout is still processed
    in a form of a texture but is not backed by dmabuf. So it is needed
    to put back the line that sets scanout mode in gd_egl_scanout_texture
    and gd_gl_area_scanout_texture.
    
    Fixes: 92b5815 ("ui/gtk: set scanout-mode right before scheduling draw)
    Reported-by: Volker Rümelin <vr_qemu@t-online.de>
    Cc: Gerd Hoffmann <kraxel@redhat.com>
    Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
    Cc: Vivek Kasireddy <vivek.kasireddy@intel.com>
    Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
    Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
    Message-ID: <20230725001131.24017-1-dongwon.kim@intel.com>
    downor authored and elmarco committed Aug 7, 2023
    Copy the full SHA
    58ea90f View commit details
    Browse the repository at this point in the history
  10. Merge tag 'trivial-patches-pull' of https://gitlab.com/mjt0k/qemu int…

    …o staging
    
    trivial-patches for 2023-08-07
    
    there are 3 trivial bugfixes in there, for 8.1
    
    # -----BEGIN PGP SIGNATURE-----
    #
    # iQFDBAABCAAtFiEEe3O61ovnosKJMUsicBtPaxppPlkFAmTQzUsPHG1qdEB0bHMu
    # bXNrLnJ1AAoJEHAbT2saaT5Z438H/3MEc7pR3UllQ/9OFHR9JU8V14sCANgkEWMo
    # fYNoVPDli24Y5oxFnmC249YdbaO2PtLwxnarxRAXESi9r2PYjVfTMyJvkMYv0fMm
    # VNK2LE6Cs4pGivBhAFHvdceWlpLXVaea6jTGfoctSqXa0lMKy6ae44SbsJ8vOnPs
    # 9XXn+rrAtxRoaN10AKE8hRFDHaS4LIxVNhU3Y2aRijlzFRIf9kr8PGRtes56aZS1
    # IOZ5YlmibgCh3ZLofj+/4NcT/l4ViKIKmUXv0mSY55VsfmVaANM98biQ55f+4lt7
    # BlgI749QMuB7q+5eELOaZsDt7YTXp3Y0LLvGi7kBZIGIzUkSnXI=
    # =7luP
    # -----END PGP SIGNATURE-----
    # gpg: Signature made Mon 07 Aug 2023 03:54:03 AM PDT
    # gpg:                using RSA key 7B73BAD68BE7A2C289314B22701B4F6B1A693E59
    # gpg:                issuer "mjt@tls.msk.ru"
    # gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" [undefined]
    # gpg:                 aka "Michael Tokarev <mjt@debian.org>" [undefined]
    # gpg:                 aka "Michael Tokarev <mjt@corpit.ru>" [undefined]
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
    #      Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931  4B22 701B 4F6B 1A69 3E59
    
    * tag 'trivial-patches-pull' of https://gitlab.com/mjt0k/qemu:
      Fixed incorrect LLONG alignment for openrisc and cris
      stubs/colo.c: spelling
      hw/i2c: Fix bitbang_i2c_data trace event
    
    Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
    rth7680 committed Aug 7, 2023
    Copy the full SHA
    474892a View commit details
    Browse the repository at this point in the history
  11. Merge tag 'fixes-pull-request' of https://gitlab.com/marcandre.lureau…

    …/qemu into staging
    
    Fixes for 8.1
    
    Hi,
    
    Here is a collection of ui, dump and chardev fixes that are worth for 8.1.
    
    thanks
    
    # -----BEGIN PGP SIGNATURE-----
    #
    # iQJQBAABCAA6FiEEh6m9kz+HxgbSdvYt2ujhCXWWnOUFAmTRWDscHG1hcmNhbmRy
    # ZS5sdXJlYXVAcmVkaGF0LmNvbQAKCRDa6OEJdZac5eUrD/9BvqJ87XSKchV01jji
    # PmA+yFyI0JSG68oYbNPYJXxkLWdRCKp6GGcT8h1yiVtGH/SVey9spxDqbV+sK0uW
    # FmqIcmSBbjI4A6+Mne07Iyd0QtgL9H6YNenRXDFLIXLh84HP47Dg9vfgx4AsRY7O
    # efcCdi43/PoJOelVfn9wIkP/8DU4pZV6IsdtdUxZ3rtu/zwjW61rLzuxtLcAoCIE
    # rAYiTp699NH5fKBbMzm3puK4hpaPLj4GuGPrSaWVSCcgARqi7LWpgZC5i+a6FUfS
    # eWzK8WkdvHIPaUPRNl70LTWPKVxJ4PdSxFlIKgiH0bnpXHBvJnO2y1v4jaiGI0y2
    # WSHKJWY513zTF4B+pMdQLjNiLotkiqtAXHw5rrjPTuVHxi1N5w6Z/BvWOSAvs8V6
    # ijYmjksNoqwfpbPRTyu8psLcmj3fo2UIjQ739PgLN2lfC8d+nzdx4PIIq/ybQdZZ
    # 7QBJGhxP33Ou8c3ok43Jz3go6w0WOKM0ucG1K1iTVxQ27leMKTO5Zsm2TShG2pMG
    # CY6d/dumID8+G7sho8TmtTDjC5ZBkY5e27etkS+P4p+Buc60lqDrL+u6UadxWNZ1
    # 3ifsQ1PhVTRuhZUJNMcX1Qo3PuEfAOH1ZuCbvXpubHwcUr4o/ZqlVrMaJtYB3ueo
    # 7SX8YistmktaEeN+Y50qoiEVgg==
    # =ANQg
    # -----END PGP SIGNATURE-----
    # gpg: Signature made Mon 07 Aug 2023 01:46:51 PM PDT
    # gpg:                using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5
    # gpg:                issuer "marcandre.lureau@redhat.com"
    # gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" [full]
    # gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>" [full]
    
    * tag 'fixes-pull-request' of https://gitlab.com/marcandre.lureau/qemu:
      ui/gtk: set scanout mode in gd_egl/gd_gl_area_scanout_texture
      hw/i386/vmmouse:add relative packet flag for button status
      dump: kdump-zlib data pages not dumped with pvtime/aarch64
      virtio-gpu: reset gfx resources in main thread
      virtio-gpu: free BHs, by implementing unrealize
      chardev: report the handshake error
    
    Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
    rth7680 committed Aug 7, 2023
    Copy the full SHA
    0450cf0 View commit details
    Browse the repository at this point in the history