From nobody Sat May 18 00:03:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712063870; cv=none; d=zohomail.com; s=zohoarc; b=DImR3i3py9mkEWlyRNQ9nUFERdSG1iFkyP7k2h7p0TirY6rrPMefqsZNIx92bxvBqZjtCjoqVV2d7yIAZ6ingNnbZP7DvQc7iqrYreIU8Qfmbh19sKITQ3GfUW4PRham+brqCR4YTrYbTGUuqEN90TtyS/O9novCWrT3TjZRTvE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712063870; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=roYxGpFR04h/jwKow/xP9fciI3L1ZyNKVolEJHZVFKA=; b=mPeiYnXehUqTJl//mSAwPehrwuopPEBpW56UZB9oEdGcXtE2laPYNTW3Ddweaig7s1yYKDdsRRsD7aHE6g3Ogx1dRPomFUVZOqKn0K+6B1YGc4zzIQDRA1sP5JrXTqUimv03UJ416m+SDRE+J6TNlSTlW1BKpUWVeYt4XRGPJUw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 171206387011677.54754997070779; Tue, 2 Apr 2024 06:17:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rre15-0006so-3v; Tue, 02 Apr 2024 09:17:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rre0s-00061N-9r for qemu-devel@nongnu.org; Tue, 02 Apr 2024 09:17:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rre0a-0006RA-Gk for qemu-devel@nongnu.org; Tue, 02 Apr 2024 09:17:05 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-492-c0OmjeMrNOSAII1RQ8UKjQ-1; Tue, 02 Apr 2024 09:16:57 -0400 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-343400a3afcso2381508f8f.0 for ; Tue, 02 Apr 2024 06:16:57 -0700 (PDT) Received: from avogadro.local ([151.95.49.219]) by smtp.gmail.com with ESMTPSA id m19-20020a056000025300b0033e7de97214sm14073414wrz.40.2024.04.02.06.16.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 06:16:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712063818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=roYxGpFR04h/jwKow/xP9fciI3L1ZyNKVolEJHZVFKA=; b=KK9MQpBzcxEKMxapH2ElcAub+QeKD/mUorMz3qXYWZIFgY/PXwZwTKWqKwCYvJ1lWLea+q BO+0bNummVp02dMynx1y5cVLgR0E1o76s/NvrkG+Q68aReLJbgXRq7WvsCnsn9d1rKN44s yeuOd152GVjqyJ77AZ+0TZm9F0Hy6rE= X-MC-Unique: c0OmjeMrNOSAII1RQ8UKjQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712063815; x=1712668615; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=roYxGpFR04h/jwKow/xP9fciI3L1ZyNKVolEJHZVFKA=; b=SsXErJGNN3rwbcMaYKaY4XXgOtqeLS0M5mLqxQLNQhuc7U1v4ByM1rA5MogyivuCjG GikaLTttc85jFvYrFiJTztpFeRAw7pF9XZqGz6Ex/TiCHIquIPaQrn/gJWpQrhK9ZB13 WqVgZmWS5mB4gmrsOzFocUFMc7EAPSQ+s3bACozTZw+k+QfcJ5iNtx+4eJaAA84LyXCs Ps3xXRFaL1vOhVglnXefHkARAx+b9MntysVBiG5GiF4S3FaaqWalnTgUiOg3tWoxeKXG VwMDoX5Ynlj5C2j0C24MdVqIT3w/BIAFrpvdvUT4+He4n7xmeE93Edi4UGibdPC7f9ON wT4g== X-Gm-Message-State: AOJu0YynRIlL0rrgy4NfOGX8a+cKrz73W0s9L0uUxJLIq3kmvAjB65AH usApb28IYilERaT/99h4og+MomekkD+BMaAekoOVWiFDQYWxofg1B+hv4Zt1J1gkr17Qo43nAxG ZfSSTpbQ02FFa0W8vKJwCFmzLvielMSNxyqV+QRMN7m0aWX/LHxidFE9dbijD1fw4QFyW2e1I3N +y1UGrlarQV/tNwA4eaqauioaeCKSrfO7wy4Ml X-Received: by 2002:a5d:6c63:0:b0:343:3e5b:e8af with SMTP id r3-20020a5d6c63000000b003433e5be8afmr8299692wrz.52.1712063814950; Tue, 02 Apr 2024 06:16:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGv9rfS994LOeFSg9rWMBVOh/d4CewI5kVkEQRRqiaNbuyjgTWsRss50ukeMi/VFu+3mLoecw== X-Received: by 2002:a5d:6c63:0:b0:343:3e5b:e8af with SMTP id r3-20020a5d6c63000000b003433e5be8afmr8299679wrz.52.1712063814639; Tue, 02 Apr 2024 06:16:54 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 1/7] vga: merge conditionals on shift control register Date: Tue, 2 Apr 2024 15:16:43 +0200 Message-ID: <20240402131649.23225-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240402131649.23225-1-pbonzini@redhat.com> References: <20240402131649.23225-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712063870704100003 There are two sets of conditionals using the shift control bits: one to verify the palette and adjust disp_width, one to compute the "v" and "bits" variables. Merge them into one, with the extra benefit that we now have the "bits" value available early and can use it to compute region_end. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- hw/display/vga.c | 89 +++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 47 deletions(-) diff --git a/hw/display/vga.c b/hw/display/vga.c index bc5b83421bf..4795a0012e2 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -1546,12 +1546,54 @@ static void vga_draw_graphic(VGACommonState *s, int= full_update) } =20 if (shift_control =3D=3D 0) { + full_update |=3D update_palette16(s); if (sr(s, VGA_SEQ_CLOCK_MODE) & 8) { disp_width <<=3D 1; + v =3D VGA_DRAW_LINE4D2; + } else { + v =3D VGA_DRAW_LINE4; } + bits =3D 4; + } else if (shift_control =3D=3D 1) { + full_update |=3D update_palette16(s); if (sr(s, VGA_SEQ_CLOCK_MODE) & 8) { disp_width <<=3D 1; + v =3D VGA_DRAW_LINE2D2; + } else { + v =3D VGA_DRAW_LINE2; + } + bits =3D 4; + + } else { + switch (depth) { + default: + case 0: + full_update |=3D update_palette256(s); + v =3D VGA_DRAW_LINE8D2; + bits =3D 4; + break; + case 8: + full_update |=3D update_palette256(s); + v =3D VGA_DRAW_LINE8; + bits =3D 8; + break; + case 15: + v =3D s->big_endian_fb ? VGA_DRAW_LINE15_BE : VGA_DRAW_LINE15_= LE; + bits =3D 16; + break; + case 16: + v =3D s->big_endian_fb ? VGA_DRAW_LINE16_BE : VGA_DRAW_LINE16_= LE; + bits =3D 16; + break; + case 24: + v =3D s->big_endian_fb ? VGA_DRAW_LINE24_BE : VGA_DRAW_LINE24_= LE; + bits =3D 24; + break; + case 32: + v =3D s->big_endian_fb ? VGA_DRAW_LINE32_BE : VGA_DRAW_LINE32_= LE; + bits =3D 32; + break; } } =20 @@ -1607,53 +1649,6 @@ static void vga_draw_graphic(VGACommonState *s, int = full_update) } } =20 - if (shift_control =3D=3D 0) { - full_update |=3D update_palette16(s); - if (sr(s, VGA_SEQ_CLOCK_MODE) & 8) { - v =3D VGA_DRAW_LINE4D2; - } else { - v =3D VGA_DRAW_LINE4; - } - bits =3D 4; - } else if (shift_control =3D=3D 1) { - full_update |=3D update_palette16(s); - if (sr(s, VGA_SEQ_CLOCK_MODE) & 8) { - v =3D VGA_DRAW_LINE2D2; - } else { - v =3D VGA_DRAW_LINE2; - } - bits =3D 4; - } else { - switch(s->get_bpp(s)) { - default: - case 0: - full_update |=3D update_palette256(s); - v =3D VGA_DRAW_LINE8D2; - bits =3D 4; - break; - case 8: - full_update |=3D update_palette256(s); - v =3D VGA_DRAW_LINE8; - bits =3D 8; - break; - case 15: - v =3D s->big_endian_fb ? VGA_DRAW_LINE15_BE : VGA_DRAW_LINE15_= LE; - bits =3D 16; - break; - case 16: - v =3D s->big_endian_fb ? VGA_DRAW_LINE16_BE : VGA_DRAW_LINE16_= LE; - bits =3D 16; - break; - case 24: - v =3D s->big_endian_fb ? VGA_DRAW_LINE24_BE : VGA_DRAW_LINE24_= LE; - bits =3D 24; - break; - case 32: - v =3D s->big_endian_fb ? VGA_DRAW_LINE32_BE : VGA_DRAW_LINE32_= LE; - bits =3D 32; - break; - } - } vga_draw_line =3D vga_draw_line_table[v]; =20 if (!is_buffer_shared(surface) && s->cursor_invalidate) { --=20 2.44.0 From nobody Sat May 18 00:03:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712063992; cv=none; d=zohomail.com; s=zohoarc; b=iRxw8jJD3hwdY+fgcxlb5oBeplXfLzPl70U8fRrCLy0nfu4gNxXsS9SyLkobFquSkVmyxh3Vk1CF/uwP+1/ezO9xLUywGYoRrmNOoQtvUH/OdvGLi1H6cW/aDwJ8Q/fM25+jHX6ivSdoSnR/M8iQuu0WOs+ITMFG563I9tMM/B0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712063992; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kdytqU6zaqhwaFowWcTOUPdoULLFbHrB8YBUdpdDPOI=; b=X8cUp4R0x47yb+/rQf+O3STraa3yUqvCF9JR5OQ5KWa9lr3p2FM0qZJhRH0k66ACyTIIoMwrwR8bKgABDMrIXpqkPsTlElcLtxY/N+pKc4CZvQr1WljFunyFC3wJ5aELfhrBOB3yt3/i7VW+Fb5k+PPgRLkF7x+JbZJvNTl3C/Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 171206399269447.285390697897014; Tue, 2 Apr 2024 06:19:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rre1A-0007Ib-S4; Tue, 02 Apr 2024 09:17:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rre0s-00061Z-9U for qemu-devel@nongnu.org; Tue, 02 Apr 2024 09:17:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rre0h-0006Uu-IF for qemu-devel@nongnu.org; Tue, 02 Apr 2024 09:17:10 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-41-ESNTsR6GMjKNJG8AUFyBPQ-1; Tue, 02 Apr 2024 09:17:01 -0400 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-41493ba3fcbso22887095e9.1 for ; Tue, 02 Apr 2024 06:17:00 -0700 (PDT) Received: from avogadro.local ([151.95.49.219]) by smtp.gmail.com with ESMTPSA id z2-20020a05600c0a0200b00415515263b4sm13855462wmp.7.2024.04.02.06.16.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 06:16:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712063824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kdytqU6zaqhwaFowWcTOUPdoULLFbHrB8YBUdpdDPOI=; b=OROfQ2dX3O9YLjW1tYmthHN2kiDFqZHaMZTc3zO9WhEa/IU2U/drFvxKxhL3ml16XNoNiO 5HekLr1MlTV6F9h7ktGcBFW5J1DIJhWG3zRkwFiD9NM2qakKQt5RL4B+8L9PFbIRqnnwyY Eu/gcxIidJi0bxhIdF6d2kLbV6HvrMA= X-MC-Unique: ESNTsR6GMjKNJG8AUFyBPQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712063818; x=1712668618; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kdytqU6zaqhwaFowWcTOUPdoULLFbHrB8YBUdpdDPOI=; b=ka3W8eiDFVny9mZWxiVx9IrligJGI++b7vEIL1b4XbbEwVpiJnXPiM5cMgMsknJMhq ePOONb8VWU7im/8ixEreBGf3bjCaOgBis+YVkGProxRJXJ6C7TSXxouwLdrUKngxp3/U R9+B8d3+/WVOtKdQe6JCKiEzPEBdQHLy+3Kdp52qfrbsz2dNdV2DAWwxdfPhKjzsa+Q6 dBP7/HEyvpzQzGluoqIneXqqG+638KRhnhU+ZtpE32ixbRiBnjXNQNYrz3CelI1ioq51 rFvn1FZV2EdB96FejROfMCrHFynGMIBmtGeCFx7tTl0D3kw+U6Brtq1U3RvPRs3YoPBr 2IjQ== X-Gm-Message-State: AOJu0YxEPfM1sOsBQN8xUzF5RF+UjY1Q7ub6DMBYzqoQXKCduj+tjy+n uoy4H09J7UymY8SMHWw8JA2R0QABHP+5KbqZzqvWaqkq+0TfjaYMKBrI87Dnx6Aa05abGOmd/B1 BXsM5H59tGp7I733reqhV6FXkc80DwFUhEo9lmQHIJYB6FCYhwp+abJmrlAimv+RZm/g5hC4bfZ M8r19Dvld0gDg48hkKquL084X6f0js4eY1wS53 X-Received: by 2002:a05:600c:4f93:b0:414:3713:e9a2 with SMTP id n19-20020a05600c4f9300b004143713e9a2mr10130139wmq.3.1712063818469; Tue, 02 Apr 2024 06:16:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEP572aIIdXD+0gq6K3dUh/Gk6SAXQqkws9txkkJjcN7Zuh6nymBQOlI/M3+ikOoXy6EPt1kA== X-Received: by 2002:a05:600c:4f93:b0:414:3713:e9a2 with SMTP id n19-20020a05600c4f9300b004143713e9a2mr10130123wmq.3.1712063818135; Tue, 02 Apr 2024 06:16:58 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 2/7] vga: move computation of dirty memory region later Date: Tue, 2 Apr 2024 15:16:44 +0200 Message-ID: <20240402131649.23225-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240402131649.23225-1-pbonzini@redhat.com> References: <20240402131649.23225-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712063993289100003 Move the computation of region_start and region_end after the value of "bits" is known. This makes it possible to distinguish modes that support horizontal pel panning from modes that do not. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- hw/display/vga.c | 50 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/hw/display/vga.c b/hw/display/vga.c index 4795a0012e2..b4ceff70eb8 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -1501,31 +1501,6 @@ static void vga_draw_graphic(VGACommonState *s, int = full_update) disp_width =3D width; depth =3D s->get_bpp(s); =20 - region_start =3D (s->params.start_addr * 4); - region_end =3D region_start + (ram_addr_t)s->params.line_offset * heig= ht; - region_end +=3D width * depth / 8; /* scanline length */ - region_end -=3D s->params.line_offset; - if (region_end > s->vbe_size || depth =3D=3D 0 || depth =3D=3D 15) { - /* - * We land here on: - * - wraps around (can happen with cirrus vbe modes) - * - depth =3D=3D 0 (256 color palette video mode) - * - depth =3D=3D 15 - * - * Take the safe and slow route: - * - create a dirty bitmap snapshot for all vga memory. - * - force shadowing (so all vga memory access goes - * through vga_read_*() helpers). - * - * Given this affects only vga features which are pretty much - * unused by modern guests there should be no performance - * impact. - */ - region_start =3D 0; - region_end =3D s->vbe_size; - force_shadow =3D true; - } - /* bits 5-6: 0 =3D 16-color mode, 1 =3D 4-color mode, 2 =3D 256-color = mode. */ shift_control =3D (s->gr[VGA_GFX_MODE] >> 5) & 3; double_scan =3D (s->cr[VGA_CRTC_MAX_SCAN] >> 7); @@ -1597,6 +1572,31 @@ static void vga_draw_graphic(VGACommonState *s, int = full_update) } } =20 + region_start =3D (s->params.start_addr * 4); + region_end =3D region_start + (ram_addr_t)s->params.line_offset * heig= ht; + region_end +=3D width * depth / 8; /* scanline length */ + region_end -=3D s->params.line_offset; + if (region_end > s->vbe_size || depth =3D=3D 0 || depth =3D=3D 15) { + /* + * We land here on: + * - wraps around (can happen with cirrus vbe modes) + * - depth =3D=3D 0 (256 color palette video mode) + * - depth =3D=3D 15 + * + * Take the safe and slow route: + * - create a dirty bitmap snapshot for all vga memory. + * - force shadowing (so all vga memory access goes + * through vga_read_*() helpers). + * + * Given this affects only vga features which are pretty much + * unused by modern guests there should be no performance + * impact. + */ + region_start =3D 0; + region_end =3D s->vbe_size; + force_shadow =3D true; + } + /* * Check whether we can share the surface with the backend * or whether we need a shadow surface. We share native --=20 2.44.0 From nobody Sat May 18 00:03:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712063896; cv=none; d=zohomail.com; s=zohoarc; b=WHF4Jy5/oOSVhEGA7GcfwqWo4S49bmqvWSkxkikXCR/ScElRYAMPIHP+oLx6h7HldSYTQgCBc47AfHoWcDeeROKyvxHOMrjGLSmH5vNiZe1UZ+1er8Ekf4Dr6otD68QwnIvCBobUQrB8rS9y3NHulH7g+twNuWwiw5TlDFUsZKk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712063896; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=sXc6p7CLAD9wC+be/di+J8sDpAR+vHjnFWOEwaQyh7w=; b=JX/2zSE72HJ0wY/n6g9BAgeTnQpiY0UY5pMPpxByD4OHNnZ6LEBEaVitq17HgR+BPkwCWDZtw15J009CmUDUzr1Zzh1CWAjRGjC1kachMhAEH31iTFgN7m1kWs/dtZT9tx9dG+HnlfaEkSdNwVDLvFrE2lTUIKNjYD7lSlL6zpg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712063896407631.3726203403603; Tue, 2 Apr 2024 06:18:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rre17-00073P-IW; Tue, 02 Apr 2024 09:17:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rre0s-00061Y-A8 for qemu-devel@nongnu.org; Tue, 02 Apr 2024 09:17:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rre0i-0006Vc-HR for qemu-devel@nongnu.org; Tue, 02 Apr 2024 09:17:10 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-56-H9jqlAbaNkq-OH6lbvQlhQ-1; Tue, 02 Apr 2024 09:17:04 -0400 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-33ec308655eso1440219f8f.0 for ; Tue, 02 Apr 2024 06:17:04 -0700 (PDT) Received: from avogadro.local ([151.95.49.219]) by smtp.gmail.com with ESMTPSA id dq2-20020a0560000cc200b00341e24a586fsm14081270wrb.93.2024.04.02.06.16.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 06:17:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712063825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sXc6p7CLAD9wC+be/di+J8sDpAR+vHjnFWOEwaQyh7w=; b=PpO7df6p+cg33wwPfQpiuELIc+R1pKoMhG4hA/WHqTfOpDGsaSBZJApLFCibPjPU6+nkZ/ 0bXcVOHZRI2PXcolYtOaPXz8eU4tRUNN3l7PnwDcd2f1ZIjDf/S9Zp3lA3X7NiBATmKmLC cePlqb+Wa58I5AXoc6fb7ez2FBUKZWQ= X-MC-Unique: H9jqlAbaNkq-OH6lbvQlhQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712063822; x=1712668622; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sXc6p7CLAD9wC+be/di+J8sDpAR+vHjnFWOEwaQyh7w=; b=xSyq7PwGtT6VsLFqCSf60jYedrj3+8+GVnSji3Huqn29jmMLQMOwoGL8T1rDsHRbf7 nguDYq7jBmk5rgbsADWeE/TDzb5q07NoyCBuY/2EkmulwIaETUYaOTmVc3NU3sZ4EnsS 9wCiOm0i87reudrOFiJq68N/4cdXTiHGrtrWmkqhDO4a7tcYBQzfLmixhNmA5UIbwEXo whZg2CZYtC0wdUj1yE3OuS9C29TE9QTWhOzVTUA2mM+WxewFNH/bS+VrjGRWcPAETHhD U8jjyehANT7Lby4RFys4D1PhSLdj39yCF2t7h86fBiHMYAePxaOhIuXL9eEdWSgId3ts QVJg== X-Gm-Message-State: AOJu0Yz9aYmfFmmR5W+m2ycgFnd+tsQh2Z9cwoSgc4yz6AHEaTYY+Pld j8Opof+iKC3vadb4lIwKJItiVAhQWrC/7KxyJlm6wLexkX+3kJp+T584LlooVWySFdxrXok1NKl qB0Ndicr3z7WK8hKeOEYKuGNnqAnevyGlkoyf61ousMB8ao9ijVCt1AR6oMazEnY33BNGw9JCqM Rgoj64oSTQkNP5tnerF+qDfVfgjp0tLBNFFbr1 X-Received: by 2002:adf:ee85:0:b0:343:6a91:5080 with SMTP id b5-20020adfee85000000b003436a915080mr1200186wro.29.1712063822147; Tue, 02 Apr 2024 06:17:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEdSYup3aOvDZ/oAcWikjhBFeRtMHdRh4jZ3+KlRysp7x4TCHP3BMHL9CGarEXyf5b1NnpeXA== X-Received: by 2002:adf:ee85:0:b0:343:6a91:5080 with SMTP id b5-20020adfee85000000b003436a915080mr1200175wro.29.1712063821779; Tue, 02 Apr 2024 06:17:01 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Helge Konetzka , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 3/7] vga: adjust dirty memory region if pel panning is active Date: Tue, 2 Apr 2024 15:16:45 +0200 Message-ID: <20240402131649.23225-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240402131649.23225-1-pbonzini@redhat.com> References: <20240402131649.23225-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712063896769100001 When pel panning is active, one more byte is read from each of the VGA memory planes. This has to be accounted in the computation of region_end, otherwise vga_draw_graphic() fails an assertion: qemu-system-i386: ../system/physmem.c:946: cpu_physical_memory_snapshot_get= _dirty: Assertion `start + length <=3D snap->end' failed. Reported-by: Helge Konetzka Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2244 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- hw/display/vga.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/display/vga.c b/hw/display/vga.c index b4ceff70eb8..40acd19e72a 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -1571,11 +1571,15 @@ static void vga_draw_graphic(VGACommonState *s, int= full_update) break; } } + hpel =3D bits <=3D 8 ? s->params.hpel : 0; =20 region_start =3D (s->params.start_addr * 4); region_end =3D region_start + (ram_addr_t)s->params.line_offset * heig= ht; region_end +=3D width * depth / 8; /* scanline length */ region_end -=3D s->params.line_offset; + if (hpel) { + region_end +=3D 4; + } if (region_end > s->vbe_size || depth =3D=3D 0 || depth =3D=3D 15) { /* * We land here on: @@ -1660,7 +1664,6 @@ static void vga_draw_graphic(VGACommonState *s, int f= ull_update) width, height, v, line_offset, s->cr[9], s->cr[VGA_CRTC_MODE], s->params.line_compare, sr(s, VGA_SEQ_CLOCK_MODE)); #endif - hpel =3D bits <=3D 8 ? s->params.hpel : 0; addr1 =3D (s->params.start_addr * 4); bwidth =3D DIV_ROUND_UP(width * bits, 8); if (hpel) { --=20 2.44.0 From nobody Sat May 18 00:03:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712063871; cv=none; d=zohomail.com; s=zohoarc; b=OJGthQe8ovZnyjMTWRDvuFOWmhlqo8Rh5hqL4jy2zxrxiRa6pdhIXCuqlvrBJ35U3Zh322yWGqgLgwBJ0uSNJwPMFgqdHgc4ubaE4yeGDjb8hEWI8lQdXrU7uPNZbOi7OLjbw4eZTT0WVrxHHpbykv9oQxYhfi+X0lfQbh/Lyr0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712063871; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=2PZavkeH6OTmLymO5kneMvG0lPUU9tg04m/0+lSsdoU=; b=csSVVdEpt/Yxaxjmb9TwWkqiij7mFKovHdJ+My6n8D9VDQljRvi7jAkF99wk+e92Ot/+lGflRdnXs1K3qgv9rQwjMfF8KmvKoL1UePenQeWHaVWyqUS+5OgDOEPqMZQBQqoBsyitke/Dhv4oJLsGpB75WBCX1cOmY4qzYM0NXrY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712063871724543.4209573646758; Tue, 2 Apr 2024 06:17:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rre0w-0006Pj-V4; Tue, 02 Apr 2024 09:17:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rre0s-00061a-9z for qemu-devel@nongnu.org; Tue, 02 Apr 2024 09:17:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rre0k-0006XW-If for qemu-devel@nongnu.org; Tue, 02 Apr 2024 09:17:11 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-373-Gn5paO8iP_e0v7TS19unmA-1; Tue, 02 Apr 2024 09:17:07 -0400 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3437574111dso169112f8f.2 for ; Tue, 02 Apr 2024 06:17:06 -0700 (PDT) Received: from avogadro.local ([151.95.49.219]) by smtp.gmail.com with ESMTPSA id bu7-20020a056000078700b00343587cfa7dsm2195919wrb.77.2024.04.02.06.17.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 06:17:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712063828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2PZavkeH6OTmLymO5kneMvG0lPUU9tg04m/0+lSsdoU=; b=HZHcIkDzgBt6hXeFJeYyKW2OmBRnFd2wx0JJlLuaPdf6t1MjC4u7igUA6Lw783c05Xbgq7 frsPi4pjx16z2sAIwipErAgwc1NGzUH+Yupfz/bwA/SCiXGi9mBaWpIGrDJYLfDi4MaL9R zJb5j1AWvkRI6jo2ek8qkBDJodum7Dw= X-MC-Unique: Gn5paO8iP_e0v7TS19unmA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712063825; x=1712668625; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2PZavkeH6OTmLymO5kneMvG0lPUU9tg04m/0+lSsdoU=; b=HNmVmQbnfIibkVPGtlN0xjKduu1ppq7pafnG3uGt01/06u8M9hlw+gXOfdx5zzYHWE VpeVNYYuuittKCmnuj0Ccj3JnS7pRziYMd4KCVpXnLqR2aSIJXf/sSSi6Hon93nHU+gB sVgp/MZeMXtZwvzkZ1Jn8Aq4wEMqXblbOkza/aixz0yHMBZrL2hz7wKzsP5RDU0L2ygx 7cQ1qMbdWdj/apq0mCPTVq7TmjmD16h8GUbUs7/Oe0r0ZBrfIMMepiiViYNr8cfUzaH1 KYGO/rMrzKmwGk8HiA1ftMNyz7HtFJwTSjSNEd+eciZCffaKo69kIvyASFpw1l/d7NVv 2JKw== X-Gm-Message-State: AOJu0YyiZ6WaSYWzKW4/+u0CvSmJkAZKqT8TJfKmLde7roZVk9Vr1D8/ lvLxCKKrQLdv7WBXOIysXYX6d3fwyjvXVudpkSEfEAtaYYmfyEeHyD5FhU651Ec6cHyJlGPvGfR /SUI7qIHMagcuvMjEgBvCvtqgQuj+DcwMeVL1vUN1aj90ZVNM4xk9kQBtWR01sQsnQ+fkfOUbIB g+6Y/M5ox9N/hW9n8SKhxvmHVxzxopk2A3qSqt X-Received: by 2002:a05:6000:1818:b0:341:c15c:64d2 with SMTP id m24-20020a056000181800b00341c15c64d2mr10010311wrh.32.1712063825645; Tue, 02 Apr 2024 06:17:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFwUneul8xSSGJTt4tbfpTnwek8i1FElNjG7EJwZ8q2qG58D7mLDB8XIO0Yv8cR9QLh3yiLpA== X-Received: by 2002:a05:6000:1818:b0:341:c15c:64d2 with SMTP id m24-20020a056000181800b00341c15c64d2mr10010293wrh.32.1712063825214; Tue, 02 Apr 2024 06:17:05 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 4/7] vga: do not treat horiz pel panning value of 8 as "enabled" Date: Tue, 2 Apr 2024 15:16:46 +0200 Message-ID: <20240402131649.23225-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240402131649.23225-1-pbonzini@redhat.com> References: <20240402131649.23225-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712063872908100018 Content-Type: text/plain; charset="utf-8" Horizontal pel panning bit 3 is only used in text mode. In graphics mode, it can be treated as if it was zero, thus not extending the dirty memory region. Signed-off-by: Paolo Bonzini --- hw/display/vga.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/display/vga.c b/hw/display/vga.c index 40acd19e72a..77f59e8c113 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -1571,7 +1571,9 @@ static void vga_draw_graphic(VGACommonState *s, int f= ull_update) break; } } - hpel =3D bits <=3D 8 ? s->params.hpel : 0; + + /* Horizontal pel panning bit 3 is only used in text mode. */ + hpel =3D bits <=3D 8 ? s->params.hpel & 7 : 0; =20 region_start =3D (s->params.start_addr * 4); region_end =3D region_start + (ram_addr_t)s->params.line_offset * heig= ht; --=20 2.44.0 From nobody Sat May 18 00:03:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712064031; cv=none; d=zohomail.com; s=zohoarc; b=WlnB9MyfrrivShCYQ7vwIMvqAraKKst49j1ATY+8icVUcSlne8mkLzE989yeJwM1ay9qYBh4YMIY8kUR/pwIkkHRKd9GPl2DcGBHL7ZteIFpb3LXlI76zI/RU3AvKBUouyVE09c/w5M/jEGYLFRX0tUwR5EalSADVnfLU4nc5AI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712064031; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CocnoBVJpn99epD+80lqAYY0uYOL6LyKI4I2LjGgdmg=; b=eWSXjv0QYNU+0BGsvjljDJJAj7sJKRefF8rN3PiIODZo6b9UU/TgWOwAEJhj/pYDEE763uK7odu6/kVdazl4BQyASeNTBIO1bxOZk+boqLszOD2KxPctBySrINGNn2TeFh4M3V9+k6nFDddgQXlYzMMlGbwTpPpGvuZll5uZ4CE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712064031205974.4304427949825; Tue, 2 Apr 2024 06:20:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rre0z-0006dg-MU; Tue, 02 Apr 2024 09:17:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rre0s-00061e-9n for qemu-devel@nongnu.org; Tue, 02 Apr 2024 09:17:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rre0o-0006ZM-0i for qemu-devel@nongnu.org; Tue, 02 Apr 2024 09:17:16 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-31-vBdr4LvBPvSB3LuLCSeW7g-1; Tue, 02 Apr 2024 09:17:10 -0400 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-41481f2d826so24754905e9.1 for ; Tue, 02 Apr 2024 06:17:10 -0700 (PDT) Received: from avogadro.local ([151.95.49.219]) by smtp.gmail.com with ESMTPSA id p2-20020a05600c1d8200b004156daeee90sm3712330wms.4.2024.04.02.06.17.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 06:17:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712063831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CocnoBVJpn99epD+80lqAYY0uYOL6LyKI4I2LjGgdmg=; b=YnOYL1RIXseivo4PsVe8deVsjaI+ZhG9pxWKyrUvEpY0txf3Zw54M+6P2KCXHryYdCMFCA iqN6U3CPrr0w3DfTtnMm3mtRZ3eLooyVnbOY8kV9+eN+Aiqu4aC2p/gbGj9J7gINBajrHz W3FuWcq+kGkjrn7iGCk3agLdotlOK+M= X-MC-Unique: vBdr4LvBPvSB3LuLCSeW7g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712063828; x=1712668628; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CocnoBVJpn99epD+80lqAYY0uYOL6LyKI4I2LjGgdmg=; b=dDb6fPp8Kyl8VMJ1S5/tvEy1xoRzU2NKMHYEMhMTbWtsjlkAmZfMMIDBMCOV+tP5Uz 3k1CmBJHgAQZeOYYe49ASQSN95Gx70qbA+vnyvUWMDeFoJW8re1xwgeTwEBwypocPx86 VFz3b0lwwKSzY/EhrON+4sp7FzsOVDv4Mf7u7uqtv4ZQTAjd6sZMS9rZbJNcZ3NTm+a8 wOP2GDZ4V4H4Gu26OT0OnrudLHBpAQRO4DKcNs+I1TEJY8HJqcavczIrh8VC8kUbtc8U B8fyOnijzC3YTni8w/hIHZ9f81CmtMjGHkfQy+l2WmySoxf5GmssOVr1sPKsipTtRtXK gBHw== X-Gm-Message-State: AOJu0YzkyRRLA4l2fM0j4mXSSLZT7KZHDklyLpbDxVjFIPFTe+mwjohf HFLW3o+PLqfNJ+3r/5ipsFJyM9VU/YQ59+q7YswXmb0IX5wPaFm74h2uiFz+J4IoS7utBNbvySk 8tvCYFaLpSot6YK27HFcrl5gYGpGOmKJ/0lz9bLKMCdPslAonUozsQ7T6+aQWdidSq5L9RYD9ek IBglyIMN2dkFtViYmlKYp7O8hTmSliif4OUs32 X-Received: by 2002:a05:600c:450a:b0:413:2852:2835 with SMTP id t10-20020a05600c450a00b0041328522835mr8691595wmo.17.1712063828109; Tue, 02 Apr 2024 06:17:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE2tDd7NHWqiKtqOmtQidZta/7X3h5gH8gRGgR0tMWpUgCkfJRycGvUD5WS7euJ1fjvwqtEGQ== X-Received: by 2002:a05:600c:450a:b0:413:2852:2835 with SMTP id t10-20020a05600c450a00b0041328522835mr8691573wmo.17.1712063827736; Tue, 02 Apr 2024 06:17:07 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Chuhong Yuan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 5/7] lsi53c895a: avoid out of bounds access to s->msg[] Date: Tue, 2 Apr 2024 15:16:47 +0200 Message-ID: <20240402131649.23225-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240402131649.23225-1-pbonzini@redhat.com> References: <20240402131649.23225-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712064033441100003 If no bytes are there to process in the message in phase, the input data latch (s->sidl) is set to s->msg[-1]. Just do nothing since no DMA is performed. Reported-by: Chuhong Yuan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- hw/scsi/lsi53c895a.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index 71f759a59dd..eb9828dd5ef 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -927,13 +927,18 @@ static void lsi_do_msgin(LSIState *s) assert(len > 0 && len <=3D LSI_MAX_MSGIN_LEN); if (len > s->dbc) len =3D s->dbc; - pci_dma_write(PCI_DEVICE(s), s->dnad, s->msg, len); - /* Linux drivers rely on the last byte being in the SIDL. */ - s->sidl =3D s->msg[len - 1]; - s->msg_len -=3D len; - if (s->msg_len) { - memmove(s->msg, s->msg + len, s->msg_len); - } else { + + if (len) { + pci_dma_write(PCI_DEVICE(s), s->dnad, s->msg, len); + /* Linux drivers rely on the last byte being in the SIDL. */ + s->sidl =3D s->msg[len - 1]; + s->msg_len -=3D len; + if (s->msg_len) { + memmove(s->msg, s->msg + len, s->msg_len); + } + } + + if (!s->msg_len) { /* ??? Check if ATN (not yet implemented) is asserted and maybe switch to PHASE_MO. */ switch (s->msg_action) { --=20 2.44.0 From nobody Sat May 18 00:03:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712063871; cv=none; d=zohomail.com; s=zohoarc; b=LJ1zG2U2Mk/YVixczsCNmiSNw9pLspBt2G/P78Ddvck7/B2s+2M66It87Ak83TDtZd/WOSJQpsdsKtJt1T+YtZAYDVnjziOgUUe3iIMQNUbHkuhTwkQzhe40dDQxjbgPrUB3BqmSmeMHeBr0UF4uq70bYPH20Xs4WwrYPtkAkcI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712063871; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+vqxdTO2VKLgQ7KsbDKTOHrw/FHBZ8UlPh38mHZ3HDs=; b=iFUa2vzoQhxRMEPaaIDJz3JvkbDTDxYb/0vTrbNt+wR6ZyBu1scCJAljEM8MHsUsv6KtHbRZWNR2fRsjWOdhHMUJ590MNtQKIujrQ2ddu3/RoWYj01cTWLArTxPDNTaVEGga9xZPaJtrB1Ia9tbnfXvNTFiKoJiXUEttC5yiI64= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712063871494687.311430802305; Tue, 2 Apr 2024 06:17:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rre0w-0006Ml-KG; Tue, 02 Apr 2024 09:17:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rre0s-00063c-Fi for qemu-devel@nongnu.org; Tue, 02 Apr 2024 09:17:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rre0q-0006aq-5C for qemu-devel@nongnu.org; Tue, 02 Apr 2024 09:17:18 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-586-OdraOvlEP-endRO59Sbalg-1; Tue, 02 Apr 2024 09:17:13 -0400 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-33ec4fb1a83so1966754f8f.2 for ; Tue, 02 Apr 2024 06:17:12 -0700 (PDT) Received: from avogadro.local ([151.95.49.219]) by smtp.gmail.com with ESMTPSA id f1-20020a5d64c1000000b00341b5cf0527sm14275609wri.11.2024.04.02.06.17.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 06:17:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712063834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+vqxdTO2VKLgQ7KsbDKTOHrw/FHBZ8UlPh38mHZ3HDs=; b=PYxjDVcEjvbtnzsfOkKekwMfY+6+qT21IbP4O0XeWaYIGxhwSMA/zmr6xTWlyEi1EN2r2z +FYmzyt2OQp72zouhOJwwy6iH2ETwQTpY3y6wNZ6+UfM//JsW0ZCB0IYbzCVWtiqRypiEW sdNaJHbAGJH2nJyJOK9gg6qQzxQ6Xnk= X-MC-Unique: OdraOvlEP-endRO59Sbalg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712063830; x=1712668630; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+vqxdTO2VKLgQ7KsbDKTOHrw/FHBZ8UlPh38mHZ3HDs=; b=AwchYblmz8Hftyd5uAOm2vB+TkVW/K/UsqusH38FOkXY1MFfv1Xo6nD6CW9Ws+6QdE bGyeXbZCalPGL9gsmFmoa5IlCJ84Nqkj8Cr20HPp9TIYswsb5KADDRQS7u4c3AdONxbk 83fqgtkroAJMDlVcBaidFZgWWcsY4SBijMS9MK4h0v2rBVVaHf7iSrJ8MPzQeI6BEwlu PjortqEB5UYg6Gv3O1Nez3X3tDVkffYyX62nltGOP3rY7vbzo7bNYlrHAnhxSYi+RDVP 81Jz6eiFlXZTdbTvWjvhFOsISfJ6pela3ion9Tpj3qZ6EzEy0UO5F6vRpb5sGSCq3Efv luKA== X-Gm-Message-State: AOJu0YwbPs/eTkNqqX7gPTr/lXtx722KKR3SGprOnogIru6xnwpzMC12 UW+SRTJ7kav5+LBjacpfK2NS3JnoMU5tvTK4b1k1V3sI3odI2VUxG7cwaGY4B9Q1cz+FqJsPIx9 NtMpM2h0QZ7jdMYjRDjv4ZGTNDOXWSyURSv1qnVfX8M3rT4RKngpcPD+DE0zIvJh1iLZ4w0bsA1 3/ux/JXQlXkUKTV9nL9oDncHmlJYnRfeY3VfKp X-Received: by 2002:a5d:6e65:0:b0:343:419d:ba87 with SMTP id j37-20020a5d6e65000000b00343419dba87mr5309563wrz.13.1712063830625; Tue, 02 Apr 2024 06:17:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEL2BNwqs9WBKhoLzd9fhCtkNKamPiJwEGHUc4mlGviRc24lnCSEzpNICt8cvlqDm2pYjwL9Q== X-Received: by 2002:a5d:6e65:0:b0:343:419d:ba87 with SMTP id j37-20020a5d6e65000000b00343419dba87mr5309549wrz.13.1712063830376; Tue, 02 Apr 2024 06:17:10 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Chuhong Yuan Subject: [PULL 6/7] lsi53c895a: detect invalid Block Move instruction Date: Tue, 2 Apr 2024 15:16:48 +0200 Message-ID: <20240402131649.23225-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240402131649.23225-1-pbonzini@redhat.com> References: <20240402131649.23225-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712063872749100014 Content-Type: text/plain; charset="utf-8" The spec for the lsi53c895a says: "If the instruction is a Block Move and a value of 0x000000 is loaded into the DBC register, an illegal instruction interrupt occurs if the LSI53C895A is not in target mode, Command phase". Because QEMU only operates in initiator mode, generate the interrupt unconditionally if the low 24 bits are 0x000000. Reported-by: Chuhong Yuan Signed-off-by: Paolo Bonzini --- hw/scsi/lsi53c895a.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index eb9828dd5ef..1e18d88983b 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -1205,6 +1205,15 @@ again: break; } s->dbc =3D insn & 0xffffff; + if (!s->dbc) { + /* + * If the instruction is a Block Move and a value of 0x000000 = is + * loaded into the DBC register, an illegal instruction interr= upt + * occurs if the LSI53C895A is not in target mode, Command pha= se. + */ + lsi_script_dma_interrupt(s, LSI_DSTAT_IID); + break; + } s->rbc =3D s->dbc; /* ??? Set ESA. */ s->ia =3D s->dsp - 8; --=20 2.44.0 From nobody Sat May 18 00:03:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712063871; cv=none; d=zohomail.com; s=zohoarc; b=NDY7NAboTHN67+P3Qmff1jJtRhDSIwhy21RPLMsdRV6yVlBBBGYlTqZ9pYtYX1Fah6bNAv81CaWFCoiJ1NIdSnzKKnedq8uQYrwhq4/19qJ0gyjbjN8nFzvzq3mtE18K+i0MqlZmbyW4jY4rY6lyl/msu8eGdfUtLAnBfkf/6Go= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712063871; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=E8yIDiCX/Ln3x0nNQdql3UK/HtqDf0IEIrOFJt+xFMY=; b=Q5xFvztwKC4EsWfPxAkvP6R7i52lp81O6QszafUlhl/DUxqZiF8NU3TuuX9YHwBDQDyVdeasur5JyNs6VMTTn9/2jtUp1er4mCmzA6rYh6M3mjj6h5W/N4TLYbIOhucHMLRdmFuKieo+CXwqeCFuPiPcqvt7DUL/TP7qpcgSrhY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712063871965435.3810714467543; Tue, 2 Apr 2024 06:17:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rre10-0006gj-6i; Tue, 02 Apr 2024 09:17:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rre0u-00066v-93 for qemu-devel@nongnu.org; Tue, 02 Apr 2024 09:17:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rre0r-0006cL-SR for qemu-devel@nongnu.org; Tue, 02 Apr 2024 09:17:19 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-689-4hp9xJHDOcaiqHKWcn03aA-1; Tue, 02 Apr 2024 09:17:14 -0400 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4148b78d733so21117035e9.3 for ; Tue, 02 Apr 2024 06:17:14 -0700 (PDT) Received: from avogadro.local ([151.95.49.219]) by smtp.gmail.com with ESMTPSA id u8-20020a05600c19c800b0041478393b8fsm20919340wmq.42.2024.04.02.06.17.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 06:17:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712063836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=E8yIDiCX/Ln3x0nNQdql3UK/HtqDf0IEIrOFJt+xFMY=; b=HQAUyA7EuZVHhDztJWT2FaE8/JgdOqAnMmUiwZSydotj+Q1JHvFf47weyxnXZ8RIrpixsG /4T0py/0ZMe2xnT71TdbvnOfnjgEaYx/PTJnoku/bftOIajoFnGImXDwsIux1+WoSkz1U0 jTN601iLhJBu5eEoFkJUuTVtGFGNWkc= X-MC-Unique: 4hp9xJHDOcaiqHKWcn03aA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712063833; x=1712668633; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E8yIDiCX/Ln3x0nNQdql3UK/HtqDf0IEIrOFJt+xFMY=; b=jqqsHqHy+1fc7E7vRSKxSYn/ihNBQOQz02JBHCZdeHzHd/c1Onc+mbKFD0XyFu8keK 1JGh1zm1WLq45loajBwqh5tI2MUZguduv1L9Rqye3AHUdLb4u/iRoa8qXqqFtP78NxtC xGhaNjSM6azggkhDNnO/t9wyj18P30TTlKSdaYCFN/EdE58LxHm1v8vtIQgIFc/SMJrm McvLEe+xWphjAdAs2Ko17rkkJB0O0k9cEU2zFgkoXkHxVpwCJoHEqCGGK8M0StI+bvXM mP2KaOGRJtKTfnjvuLQUx9qFpel/rireNBBvADQi2JT1tKhjrx3a4F/35UZ8bk370q2U MFdQ== X-Gm-Message-State: AOJu0Yw9zqThLzpfBiOkSj6fg6afI1XYDoUWonO+DRKX9D+ta7g8yYRs Lfb+QtDoD3Ml1qKSbmbbWIR6jx/zWUfgcN9vnWo4Xs3GeDVPU8ZQQGcgECeqEX9hAUuEbMBS9vA Q6lJGGQDo13OCHPzKaZLBzzXX80W+MxpUti23ydkQHO936e+vKDWMl6j+HkPqD7d5PsilhrcsO7 S9x9trmr3Hb4lXroC1D/NJ1xq24NiMsVjHj7Y3 X-Received: by 2002:a05:600c:a04:b0:414:653f:26cd with SMTP id z4-20020a05600c0a0400b00414653f26cdmr9139016wmp.18.1712063833216; Tue, 02 Apr 2024 06:17:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEcxrBOtQHStrMlG/Qp0Faz2BeZlCrYksS07718HV4CIypFmRprZAiuFlSrLyCknWcYDqAJGA== X-Received: by 2002:a05:600c:a04:b0:414:653f:26cd with SMTP id z4-20020a05600c0a0400b00414653f26cdmr9138998wmp.18.1712063832868; Tue, 02 Apr 2024 06:17:12 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 7/7] pc_q35: remove unnecessary m->alias assignment Date: Tue, 2 Apr 2024 15:16:49 +0200 Message-ID: <20240402131649.23225-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240402131649.23225-1-pbonzini@redhat.com> References: <20240402131649.23225-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712063872744100013 Content-Type: text/plain; charset="utf-8" The assignment is already inherited from pc-q35-8.2. Signed-off-by: Paolo Bonzini --- hw/i386/pc_q35.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index b5922b44afa..c7bc8a2041f 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -393,7 +393,6 @@ static void pc_q35_8_1_machine_options(MachineClass *m) { PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); pc_q35_8_2_machine_options(m); - m->alias =3D NULL; pcmc->broken_32bit_mem_addr_check =3D true; compat_props_add(m->compat_props, hw_compat_8_1, hw_compat_8_1_len); compat_props_add(m->compat_props, pc_compat_8_1, pc_compat_8_1_len); --=20 2.44.0