From: Soren Hansen Subject: Re: [PATCH] Move common VGAState attributes to VGA_STATE_COMMON Date: Fri, 22 Feb 2008 11:12:42 +0100 Message-ID: <20080222101242.GB10221@butch.linux2go.dk> References: <20080211175555.GB8986@butch.linux2go.dk> <47B194CB.4050406@qumranet.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0518567997==" To: kvm-devel@lists.sourceforge.net Return-path: In-Reply-To: <47B194CB.4050406@qumranet.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces@lists.sourceforge.net Errors-To: kvm-devel-bounces@lists.sourceforge.net List-Id: kvm.vger.kernel.org --===============0518567997== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="wzJLGUyc3ArbnUjN" Content-Disposition: inline --wzJLGUyc3ArbnUjN Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable vmware_vga.c uses functions in vga.c to do some things. They need to agree on which parts of their state struct is common and which aren't, otherwise they'll overwrite parts of each other's state. This patch makes it so. Signed-off-by: Soren Hansen --- qemu/hw/cirrus_vga.c | 3 --- qemu/hw/vga_int.h | 13 +++++-------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/qemu/hw/cirrus_vga.c b/qemu/hw/cirrus_vga.c index 43307d8..4bff503 100644 --- a/qemu/hw/cirrus_vga.c +++ b/qemu/hw/cirrus_vga.c @@ -240,9 +240,6 @@ typedef struct CirrusVGAState { int cirrus_mmio_io_addr; unsigned long cirrus_lfb_addr; unsigned long cirrus_lfb_end; - int aliases_enabled; - uint32_t aliased_bank_base[2]; - uint32_t aliased_bank_limit[2]; uint32_t cirrus_addr_mask; uint32_t linear_mmio_mask; uint8_t cirrus_shadow_gr0; diff --git a/qemu/hw/vga_int.h b/qemu/hw/vga_int.h index 912d977..c5a3992 100644 --- a/qemu/hw/vga_int.h +++ b/qemu/hw/vga_int.h @@ -147,18 +147,15 @@ uint32_t last_palette[256]; \ uint32_t last_ch_attr[CH_ATTR_SIZE]; /* XXX: make it dynamic */ \ unsigned long map_addr; \ - unsigned long map_end; + unsigned long map_end; \ + int32_t aliases_enabled; \ + int32_t pad1; \ + uint32_t aliased_bank_base[2]; \ + uint32_t aliased_bank_limit[2]; =20 =20 typedef struct VGAState { VGA_STATE_COMMON - - int32_t aliases_enabled; - int32_t pad1; - uint32_t aliased_bank_base[2]; - uint32_t aliased_bank_limit[2]; - - } VGAState; =20 static inline int c6_to_8(int v) --=20 1.5.3.8 --=20 Soren Hansen Virtualisation specialist Ubuntu Server Team http://www.ubuntu.com/ --wzJLGUyc3ArbnUjN Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFHvqAaonjfXui9pOMRAjZSAJ43K6MeCFAtrODAySoBfapZXFqf6QCfbjZN xmDazvMylrW7V8tOYCyUPRg= =3TD5 -----END PGP SIGNATURE----- --wzJLGUyc3ArbnUjN-- --===============0518567997== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ --===============0518567997== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel --===============0518567997==--