From nobody Wed May 1 05:57:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502752662177774.0835007582392; Mon, 14 Aug 2017 16:17:42 -0700 (PDT) Received: from localhost ([::1]:37030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhOc8-0005NY-Gb for importer@patchew.org; Mon, 14 Aug 2017 19:17:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57838) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhOaa-0004Xa-Sg for qemu-devel@nongnu.org; Mon, 14 Aug 2017 19:16:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dhOaV-0002NW-GE for qemu-devel@nongnu.org; Mon, 14 Aug 2017 19:16:02 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:35621) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dhOaV-0002Mh-AF for qemu-devel@nongnu.org; Mon, 14 Aug 2017 19:15:59 -0400 Received: by mail-wr0-x241.google.com with SMTP id u89so2079562wrc.2 for ; Mon, 14 Aug 2017 16:15:57 -0700 (PDT) Received: from donizetti.lan (94-39-192-75.adsl-ull.clienti.tiscali.it. [94.39.192.75]) by smtp.gmail.com with ESMTPSA id s8sm497719wmf.1.2017.08.14.16.15.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Aug 2017 16:15:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=i+0j4j/L2LE+no3S6T1en6xoNwkEkeNVnb0dcDhIxF0=; b=r4Qvf6vyxH9HYujKHMpjFJYknICSfe/F06ltKzOCcZU/kZI5O8vvVd50K5kAo0Z2R0 wV8O6A/9c9Ogfes7ARuK7Iqt0apoMaFtBj0YIpcDMH/hY00mppkHigeyLcEgQD/VNdp3 zKM7FRV8OvrM8CpbYSQh1BL0gmp5owROZsmj5eIYTuS1f7yJRkHoNcG3r/BOOFr/c8z/ gZ5wzzTsY1wCGdK5/vDgiKn3ScGiC2dVuU4wMfDu2kESgLDphy8qBnwpWVA6L8CDRRWM auYqj1lBzByp/MCPDlAKUDjITfcy5cECCYxJ7USWiOmMPIk8beLcew4YZM+6VDoeeGdr /GPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=i+0j4j/L2LE+no3S6T1en6xoNwkEkeNVnb0dcDhIxF0=; b=XJHvsrAEsVz8oNqjt84/iQEiqlQ+4FZ8in3bzYu1hvVBUZapKkTxLmRViUilqYfpp/ WvGSi7sYgXOtszOxcSFnR+X/F9/tP/SUbVC7zNwsL+NQQM7wdQ9XIm8y9sQScGQ6DvNZ KtyPECZJ+Ce7pJQP7+lJtYnnfAsvUhbrQn3IIZWIjNzH8DWfVyaktNIg8+IU3qBzIiM2 54c1Md45vT42U6c3uwcLf2FsNotYM4lPbndpjih8+sTZc6zYL/P+XehA0W0le8pBzmZ8 q1AC7hBkzBIsB5uRJUtb7uRmbpcTNyV5vDei+2EIqA6pZ1vfdicwytV9lS36E3GIIE0u JmZw== X-Gm-Message-State: AHYfb5hqENUyFh1/Kzt65NgK48RC8r1aZu52qjJsY6+jO2C1EYo9hTLz PDjmhp4S86Pc6uc6L7Y= X-Received: by 10.223.145.163 with SMTP id 32mr19771029wri.224.1502752556328; Mon, 14 Aug 2017 16:15:56 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 15 Aug 2017 01:15:52 +0200 Message-Id: <20170814231552.24593-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.13.5 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PATCH for 2.10?] qxl: call qemu_spice_display_init_common for secondary devices X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, ademaria@redhat.com, kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Fixes this 2.10 regression: $ qemu-system-x86_64 -cpu host -m 6144 -vga qxl -device qxl qemu-system-x86_64: util/qemu-thread-posix.c:64: qemu_mutex_lock: Asserti= on `mutex->initialized' failed. Reported-by: ademaria@redhat.com Cc: kraxel@redhat.com Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrange Reviewed-by: Stefan Hajnoczi --- hw/display/qxl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 7f8c73b56d..ae3677fd1e 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -2054,6 +2054,7 @@ static void qxl_realize_common(PCIQXLDevice *qxl, Err= or **errp) uint32_t pci_device_rev; uint32_t io_size; =20 + qemu_spice_display_init_common(&qxl->ssd); qxl->mode =3D QXL_MODE_UNDEFINED; qxl->generation =3D 1; qxl->num_memslots =3D NUM_MEMSLOTS; @@ -2176,7 +2177,6 @@ static void qxl_realize_primary(PCIDevice *dev, Error= **errp) portio_list_add(&qxl->vga_port_list, pci_address_space_io(dev), 0x3b0); =20 vga->con =3D graphic_console_init(DEVICE(dev), 0, &qxl_ops, qxl); - qemu_spice_display_init_common(&qxl->ssd); =20 qxl_realize_common(qxl, &local_err); if (local_err) { --=20 2.13.5