diff mbox

kvm tools: Use vesa reserved space for strings and modes

Message ID 1306941042-18606-1-git-send-email-levinsasha928@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Sasha Levin June 1, 2011, 3:10 p.m. UTC
As defined in the spec, the reserved space in struct vesa_general_info
should be used to store vesa oem string an a list of possible modes.

Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
---
 tools/kvm/bios/int10.c |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

Comments

Pekka Enberg June 2, 2011, 8:55 a.m. UTC | #1
On Wed, 1 Jun 2011, Sasha Levin wrote:

> As defined in the spec, the reserved space in struct vesa_general_info
> should be used to store vesa oem string an a list of possible modes.
>
> Signed-off-by: Sasha Levin <levinsasha928@gmail.com>

Francis, could you test this, please? I sent you a copy of the patch 
privately.
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Francis Moreau June 6, 2011, 7:43 a.m. UTC | #2
Hi guys

sorry for being quiet those last days...

On Thu, Jun 2, 2011 at 10:55 AM, Pekka Enberg <penberg@kernel.org> wrote:
> On Wed, 1 Jun 2011, Sasha Levin wrote:
>
>> As defined in the spec, the reserved space in struct vesa_general_info
>> should be used to store vesa oem string an a list of possible modes.
>>
>> Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
>
> Francis, could you test this, please?

Sure, but unfortunately it doesn't fix the issue I'm facing :(

> I sent you a copy of the patch privately.

Hmm, I haven't found it. I tried Sasha's one.

Thanks
Pekka Enberg June 6, 2011, 7:50 a.m. UTC | #3
On 6/6/11 10:43 AM, Francis Moreau wrote:
> Hi guys
>
> sorry for being quiet those last days...
>
> On Thu, Jun 2, 2011 at 10:55 AM, Pekka Enberg<penberg@kernel.org>  wrote:
>> On Wed, 1 Jun 2011, Sasha Levin wrote:
>>
>>> As defined in the spec, the reserved space in struct vesa_general_info
>>> should be used to store vesa oem string an a list of possible modes.
>>>
>>> Signed-off-by: Sasha Levin<levinsasha928@gmail.com>
>> Francis, could you test this, please?
> Sure, but unfortunately it doesn't fix the issue I'm facing :(

Can you please try out master? It has fixes that might be related to 
your problem.

                     Pekka
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Francis Moreau June 6, 2011, 8:06 a.m. UTC | #4
On Mon, Jun 6, 2011 at 9:50 AM, Pekka Enberg <penberg@cs.helsinki.fi> wrote:
> On 6/6/11 10:43 AM, Francis Moreau wrote:
>>
>> Hi guys
>>
>> sorry for being quiet those last days...
>>
>> On Thu, Jun 2, 2011 at 10:55 AM, Pekka Enberg<penberg@kernel.org>  wrote:
>>>
>>> On Wed, 1 Jun 2011, Sasha Levin wrote:
>>>
>>>> As defined in the spec, the reserved space in struct vesa_general_info
>>>> should be used to store vesa oem string an a list of possible modes.
>>>>
>>>> Signed-off-by: Sasha Levin<levinsasha928@gmail.com>
>>>
>>> Francis, could you test this, please?
>>
>> Sure, but unfortunately it doesn't fix the issue I'm facing :(
>
> Can you please try out master? It has fixes that might be related to your
> problem.

Sorry but it doesn't help.

Thanks
diff mbox

Patch

diff --git a/tools/kvm/bios/int10.c b/tools/kvm/bios/int10.c
index 48abe10..57647a1 100644
--- a/tools/kvm/bios/int10.c
+++ b/tools/kvm/bios/int10.c
@@ -20,14 +20,16 @@  struct int10_args {
 
 /* VESA General Information table */
 struct vesa_general_info {
-	u32 signature;			/* 0 Magic number = "VESA" */
-	u16 version;			/* 4 */
-	void *vendor_string;		/* 6 */
-	u32 capabilities;		/* 10 */
-	void *video_mode_ptr;		/* 14 */
-	u16 total_memory;		/* 18 */
-
-	u8 reserved[236];		/* 20 */
+	u32	signature;		/* 0 Magic number = "VESA" */
+	u16	version;		/* 4 */
+	void	*vendor_string;		/* 6 */
+	u32	capabilities;		/* 10 */
+	void	*video_mode_ptr;	/* 14 */
+	u16	total_memory;		/* 18 */
+	u16	modes[2];		/* 20 */
+	char	oem_string[11];		/* 24 */
+
+	u8 reserved[223];		/* 35 */
 } __attribute__ ((packed));
 
 
@@ -69,9 +71,6 @@  struct vminfo {
 	u8	reserved[206];		/* 50 */
 };
 
-char oemstring[11] = "KVM VESA";
-u16 modes[2] = { 0x0112, 0xffff };
-
 static inline void outb(unsigned short port, unsigned char val)
 {
 	asm volatile("outb %0, %1" : : "a"(val), "Nd"(port));
@@ -104,10 +103,12 @@  static void int10_vesa(struct int10_args *args)
 		*destination = (struct vesa_general_info) {
 			.signature	= VESA_MAGIC,
 			.version	= 0x102,
-			.vendor_string	= oemstring,
+			.vendor_string	= &destination->oem_string,
 			.capabilities	= 0x10,
-			.video_mode_ptr	= modes,
+			.video_mode_ptr	= &destination->modes,
 			.total_memory	= (4*VESA_WIDTH * VESA_HEIGHT) / 0x10000,
+			.oem_string	= "KVM VESA",
+			.modes		= { 0x0112, 0xffff },
 		};
 
 		break;