clone 614169 -1
reassign -1 vgabios 0.6c-2
severity -1 wishlist
retitle -1 make vgabios usable as pcibios (for qemu)
tags -1 + upstream patch
forwarded -1 http://thread.gmane.org/gmane.comp.emulators.qemu/78356
block 614169 by -1
quit
Michael Tokarev wrote:
> Current vgabios package does not have all files qemu expects.
> New vgabios package is needed, with stdvga and a few more
> images - for spice, vmware just to name a few.
>
> But there's no vgabios released with these components included.
> As far as I can see, qemu basically maintains its own fork of
> vgabios again.
Thanks for explaining. It looks like the divergence is not so
terrible --- six readable looking patches:
http://git.qemu.org/vgabios.git/log/
After building vgabios with the attached patch applied and
installing a symlink
ln -s ../vgabios/vgabios.stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
the warning is gone (not that that should mean much) :).
diff --git a/debian/changelog b/debian/changelog
index 23cf68b..16092a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+vgabios (0.6c-3~exp0) experimental; urgency=low
+
+ * Patches from the QEMU tree by Gerd Hoffman:
+ - Makefile: factor out a single rule to build BIOS binaries,
+ using variables to account for their differences.
+ + debian/patches/01-Makefile-cleanup: New file.
+ - Allow PCI vendor and device IDs to be set for each BIOS
+ binary.
+ + debian/patches/02-Add-defines-for-PCI-IDs: New file.
+ - Introduce vgabios-stdvga.bin, for QEMU's standard VGA card
+ (1234:1111).
+ + debian/patches/03-Add-qemu-stdvga-bios: New file.
+ - Make pci_get_lfb_addr check PCI region 1 in addition to region
+ zero, so it can be used for the VmWare SVGA-II compatible
+ adapter.
+ + debian/patches/04-update-pci_get_lfb_addr-for...: New file.
+ - Introduce vgabios-vmware.bin, for the VmWare SVGA-II card
+ (15ad:0405).
+ + debian/patches/05-Add-qemu-vmware-vga-pci-bios: New file.
+ - Introduce vgabios-qxl.bin, for QEMU's QXL paravirtual graphics
+ card (1b36:0100).
+ + debian/patches/06-Add-qemu-qxl-vga-pci-bios: New file.
+ * Install the new binaries in debian/rules.
+
+ -- Jonathan Nieder <jrnie...@gmail.com> Sun, 20 Feb 2011 03:57:05 -0600
+
vgabios (0.6c-2) unstable; urgency=low
* Switch to source format “3.0 (quilt)”:
diff --git a/debian/patches/01-Makefile-cleanup
b/debian/patches/01-Makefile-cleanup
new file mode 100644
index 0000000..04fc772
--- /dev/null
+++ b/debian/patches/01-Makefile-cleanup
@@ -0,0 +1,120 @@
+From: Gerd Hoffmann <kra...@redhat.com>
+Date: Thu, 6 May 2010 09:58:40 +0200
+Subject: Makefile cleanup
+
+Use a single rule for building bios binaries.
+Use target specific variables to set compile flags.
+
+This makes it more obvious what the differences between the versions
+are. It also makes it easier to add new bios binaries with slightly
+different settings.
+
+Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
+---
+ Makefile | 76 +++++++++++++++++++++++++++----------------------------------
+ 1 files changed, 34 insertions(+), 42 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 00e8c66..c3c744c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,8 +16,7 @@ VGABIOS_DATE = "-DVGABIOS_DATE=\"$(RELDATE)\""
+
+ all: bios cirrus-bios
+
+-
+-bios: biossums vgabios.bin vgabios.debug.bin
++bios: vgabios.bin vgabios.debug.bin
+
+ cirrus-bios: vgabios-cirrus.bin vgabios-cirrus.debug.bin
+
+@@ -27,6 +26,39 @@ clean:
+
+ dist-clean: clean
+
++# source files
++VGA_FILES := vgabios.c vgabios.h vgafonts.h vgatables.h
++VBE_FILES := vbe.h vbe.c vbetables.h
++
++# build flags
++vgabios.bin : VGAFLAGS := -DVBE
++vgabios.debug.bin : VGAFLAGS := -DVBE -DDEBUG
++vgabios-cirrus.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS
++vgabios-cirrus.debug.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS -DCIRRUS_DEBUG
++
++# dist names
++vgabios.bin : DISTNAME := VGABIOS-lgpl-latest.bin
++vgabios.debug.bin : DISTNAME := VGABIOS-lgpl-latest.debug.bin
++vgabios-cirrus.bin : DISTNAME := VGABIOS-lgpl-latest.cirrus.bin
++vgabios-cirrus.debug.bin : DISTNAME := VGABIOS-lgpl-latest.cirrus.debug.bin
++
++# dependencies
++vgabios.bin : $(VGA_FILES) $(VBE_FILES) biossums
++vgabios.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
++vgabios-cirrus.bin : $(VGA_FILES) clext.c biossums
++vgabios-cirrus.debug.bin : $(VGA_FILES) clext.c biossums
++
++# build rule
++%.bin:
++ $(GCC) -E -P vgabios.c $(VGABIOS_VERS) $(VGAFLAGS) $(VGABIOS_DATE) >
_$*_.c
++ $(BCC) -o $*.s -C-c -D__i86__ -S -0 _$*_.c
++ sed -e 's/^\.text//' -e 's/^\.data//' $*.s > _$*_.s
++ $(AS86) _$*_.s -b $*.bin -u -w- -g -0 -j -O -l $*.txt
++ rm -f _$*_.s _$*_.c $*.s
++ mv $*.bin $(DISTNAME)
++ ./biossums $(DISTNAME)
++ ls -l $(DISTNAME)
++
+ release:
+ VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" make bios cirrus-bios
+ /bin/rm -f *.o *.s *.ld86 \
+@@ -37,46 +69,6 @@ release:
+ cp VGABIOS-lgpl-latest.cirrus.debug.bin ../$(RELEASE).cirrus.debug.bin
+ tar czvf ../$(RELEASE).tgz --exclude CVS -C .. $(RELEASE)/
+
+-vgabios.bin: vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c
vbetables.h
+- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE $(VGABIOS_DATE) >
_vgabios_.c
+- $(BCC) -o vgabios.s -C-c -D__i86__ -S -0 _vgabios_.c
+- sed -e 's/^\.text//' -e 's/^\.data//' vgabios.s > _vgabios_.s
+- $(AS86) _vgabios_.s -b vgabios.bin -u -w- -g -0 -j -O -l vgabios.txt
+- rm -f _vgabios_.s _vgabios_.c vgabios.s
+- mv vgabios.bin VGABIOS-lgpl-latest.bin
+- ./biossums VGABIOS-lgpl-latest.bin
+- ls -l VGABIOS-lgpl-latest.bin
+-
+-vgabios.debug.bin: vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c
vbetables.h
+- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE -DDEBUG $(VGABIOS_DATE) >
_vgabios-debug_.c
+- $(BCC) -o vgabios-debug.s -C-c -D__i86__ -S -0 _vgabios-debug_.c
+- sed -e 's/^\.text//' -e 's/^\.data//' vgabios-debug.s >
_vgabios-debug_.s
+- $(AS86) _vgabios-debug_.s -b vgabios.debug.bin -u -w- -g -0 -j -O -l
vgabios.debug.txt
+- rm -f _vgabios-debug_.s _vgabios-debug_.c vgabios-debug.s
+- mv vgabios.debug.bin VGABIOS-lgpl-latest.debug.bin
+- ./biossums VGABIOS-lgpl-latest.debug.bin
+- ls -l VGABIOS-lgpl-latest.debug.bin
+-
+-vgabios-cirrus.bin: vgabios.c vgabios.h vgafonts.h vgatables.h clext.c
+- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DPCIBIOS
$(VGABIOS_DATE) > _vgabios-cirrus_.c
+- $(BCC) -o vgabios-cirrus.s -C-c -D__i86__ -S -0 _vgabios-cirrus_.c
+- sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus.s >
_vgabios-cirrus_.s
+- $(AS86) _vgabios-cirrus_.s -b vgabios-cirrus.bin -u -w- -g -0 -j -O -l
vgabios.cirrus.txt
+- rm -f _vgabios-cirrus_.s _vgabios-cirrus_.c vgabios-cirrus.s
+- mv vgabios-cirrus.bin VGABIOS-lgpl-latest.cirrus.bin
+- ./biossums VGABIOS-lgpl-latest.cirrus.bin
+- ls -l VGABIOS-lgpl-latest.cirrus.bin
+-
+-vgabios-cirrus.debug.bin: vgabios.c vgabios.h vgafonts.h vgatables.h clext.c
+- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DCIRRUS_DEBUG
-DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus-debug_.c
+- $(BCC) -o vgabios-cirrus-debug.s -C-c -D__i86__ -S -0
_vgabios-cirrus-debug_.c
+- sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus-debug.s >
_vgabios-cirrus-debug_.s
+- $(AS86) _vgabios-cirrus-debug_.s -b vgabios.cirrus.debug.bin -u -w- -g
-0 -j -O -l vgabios.cirrus.debug.txt
+- rm -f _vgabios-cirrus-debug_.s _vgabios-cirrus-debug_.c
vgabios-cirrus-debug.s
+- mv vgabios.cirrus.debug.bin VGABIOS-lgpl-latest.cirrus.debug.bin
+- ./biossums VGABIOS-lgpl-latest.cirrus.debug.bin
+- ls -l VGABIOS-lgpl-latest.cirrus.debug.bin
+-
+ biossums: biossums.c
+ $(CC) -o biossums biossums.c
+
+--
+1.7.4.1
+
diff --git a/debian/patches/02-Add-defines-for-PCI-IDs
b/debian/patches/02-Add-defines-for-PCI-IDs
new file mode 100644
index 0000000..43cc2ef
--- /dev/null
+++ b/debian/patches/02-Add-defines-for-PCI-IDs
@@ -0,0 +1,67 @@
+From: Gerd Hoffmann <kra...@redhat.com>
+Date: Thu, 6 May 2010 10:21:47 +0200
+Subject: Add defines for PCI IDs.
+
+This patch allows to set PCI vendor and device IDs using defines
+(PCI_VID and PCI_DID). Use it for vgabios.bin.
+
+Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
+---
+ Makefile | 4 ++--
+ vbe.c | 6 +++++-
+ vgabios.c | 5 +++++
+ 3 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c3c744c..d440b93 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,8 +31,8 @@ VGA_FILES := vgabios.c vgabios.h vgafonts.h vgatables.h
+ VBE_FILES := vbe.h vbe.c vbetables.h
+
+ # build flags
+-vgabios.bin : VGAFLAGS := -DVBE
+-vgabios.debug.bin : VGAFLAGS := -DVBE -DDEBUG
++vgabios.bin : VGAFLAGS := -DVBE -DPCI_VID=0x1234
++vgabios.debug.bin : VGAFLAGS := -DVBE -DPCI_VID=0x1234 -DDEBUG
+ vgabios-cirrus.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS
+ vgabios-cirrus.debug.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS -DCIRRUS_DEBUG
+
+diff --git a/vbe.c b/vbe.c
+index ecff90d..1fab2f9 100644
+--- a/vbe.c
++++ b/vbe.c
+@@ -925,7 +925,11 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u DI;
+ if (using_lfb) {
+ info.NumberOfBanks = 1;
+ }
+- lfb_addr = pci_get_lfb_addr(0x1234); // experimental vendor
++#ifdef PCI_VID
++ lfb_addr = pci_get_lfb_addr(PCI_VID);
++#else
++ lfb_addr = 0;
++#endif
+ if (lfb_addr > 0) {
+ info.PhysBasePtr = ((Bit32u)lfb_addr << 16);
+ }
+diff --git a/vgabios.c b/vgabios.c
+index ea3aae8..2e8b5d7 100644
+--- a/vgabios.c
++++ b/vgabios.c
+@@ -210,8 +210,13 @@ vgabios_pci_data:
+ .word 0x1013
+ .word 0x00b8 // CLGD5446
+ #else
++#ifdef PCI_VID
++.word PCI_VID
++.word PCI_DID
++#else
+ #error "Unknown PCI vendor and device id"
+ #endif
++#endif
+ .word 0 // reserved
+ .word 0x18 // dlen
+ .byte 0 // revision
+--
+1.7.4.1
+
diff --git a/debian/patches/03-Add-qemu-stdvga-pci-bios
b/debian/patches/03-Add-qemu-stdvga-pci-bios
new file mode 100644
index 0000000..e90b059
--- /dev/null
+++ b/debian/patches/03-Add-qemu-stdvga-pci-bios
@@ -0,0 +1,60 @@
+From: Gerd Hoffmann <kra...@redhat.com>
+Date: Thu, 6 May 2010 10:39:33 +0200
+Subject: Add qemu stdvga pci bios
+
+Add PCI vgabios for the qemu standard vga (1234:1111).
+Name it vgabios-stdvga.bin.
+
+Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
+---
+ Makefile | 10 +++++++++-
+ 1 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d440b93..58f064e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,12 +14,14 @@ RELVERS = `pwd | sed "s-.*/--" | sed "s/vgabios//" | sed
"s/-//"`
+
+ VGABIOS_DATE = "-DVGABIOS_DATE=\"$(RELDATE)\""
+
+-all: bios cirrus-bios
++all: bios cirrus-bios stdvga-bios
+
+ bios: vgabios.bin vgabios.debug.bin
+
+ cirrus-bios: vgabios-cirrus.bin vgabios-cirrus.debug.bin
+
++stdvga-bios: vgabios-stdvga.bin vgabios-stdvga.debug.bin
++
+ clean:
+ /bin/rm -f biossums vbetables-gen vbetables.h *.o *.s *.ld86 \
+ temp.awk.* vgabios*.orig _vgabios_* _vgabios-debug_* core
vgabios*.bin vgabios*.txt $(RELEASE).bin *.bak
+@@ -35,18 +37,24 @@ vgabios.bin : VGAFLAGS := -DVBE
-DPCI_VID=0x1234
+ vgabios.debug.bin : VGAFLAGS := -DVBE -DPCI_VID=0x1234 -DDEBUG
+ vgabios-cirrus.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS
+ vgabios-cirrus.debug.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS -DCIRRUS_DEBUG
++vgabios-stdvga.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1234
-DPCI_DID=0x1111
++vgabios-stdvga.debug.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1234
-DPCI_DID=0x1111 -DDEBUG
+
+ # dist names
+ vgabios.bin : DISTNAME := VGABIOS-lgpl-latest.bin
+ vgabios.debug.bin : DISTNAME := VGABIOS-lgpl-latest.debug.bin
+ vgabios-cirrus.bin : DISTNAME := VGABIOS-lgpl-latest.cirrus.bin
+ vgabios-cirrus.debug.bin : DISTNAME := VGABIOS-lgpl-latest.cirrus.debug.bin
++vgabios-stdvga.bin : DISTNAME := VGABIOS-lgpl-latest.stdvga.bin
++vgabios-stdvga.debug.bin : DISTNAME := VGABIOS-lgpl-latest.stdvga.debug.bin
+
+ # dependencies
+ vgabios.bin : $(VGA_FILES) $(VBE_FILES) biossums
+ vgabios.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
+ vgabios-cirrus.bin : $(VGA_FILES) clext.c biossums
+ vgabios-cirrus.debug.bin : $(VGA_FILES) clext.c biossums
++vgabios-stdvga.bin : $(VGA_FILES) $(VBE_FILES) biossums
++vgabios-stdvga.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
+
+ # build rule
+ %.bin:
+--
+1.7.4.1
+
diff --git a/debian/patches/04-update-pci_get_lfb_addr-for-vmware-vga
b/debian/patches/04-update-pci_get_lfb_addr-for-vmware-vga
new file mode 100644
index 0000000..f190e79
--- /dev/null
+++ b/debian/patches/04-update-pci_get_lfb_addr-for-vmware-vga
@@ -0,0 +1,61 @@
+From: Gerd Hoffmann <kra...@redhat.com>
+Date: Thu, 6 May 2010 15:11:39 +0200
+Subject: update pci_get_lfb_addr for vmware vga
+
+vmware vga has the framebuffer at pci region 1 not 0. This patch makes
+pci_get_lfb_addr check region 1 too. It also gives names to the
+numbered labels to make the code more readable.
+
+Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
+---
+ vgabios.c | 23 ++++++++++++++---------
+ 1 files changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/vgabios.c b/vgabios.c
+index 2e8b5d7..c1e312b 100644
+--- a/vgabios.c
++++ b/vgabios.c
+@@ -3852,26 +3852,31 @@ _pci_get_lfb_addr:
+ mov dl, #0x00
+ call pci_read_reg
+ cmp ax, #0xffff
+- jz pci_get_lfb_addr_5
+- pci_get_lfb_addr_3:
++ jz pci_get_lfb_addr_fail
++ pci_get_lfb_addr_next_dev:
+ mov dl, #0x00
+ call pci_read_reg
+ cmp ax, bx ;; check vendor
+- jz pci_get_lfb_addr_4
++ jz pci_get_lfb_addr_found
+ add cx, #0x8
+ cmp cx, #0x200 ;; search bus #0 and #1
+- jb pci_get_lfb_addr_3
+- pci_get_lfb_addr_5:
++ jb pci_get_lfb_addr_next_dev
++ pci_get_lfb_addr_fail:
+ xor dx, dx ;; no LFB
+- jmp pci_get_lfb_addr_6
+- pci_get_lfb_addr_4:
++ jmp pci_get_lfb_addr_return
++ pci_get_lfb_addr_found:
+ mov dl, #0x10 ;; I/O space #0
+ call pci_read_reg
+ test ax, #0xfff1
+- jnz pci_get_lfb_addr_5
++ jz pci_get_lfb_addr_success
++ mov dl, #0x14 ;; I/O space #1
++ call pci_read_reg
++ test ax, #0xfff1
++ jnz pci_get_lfb_addr_fail
++ pci_get_lfb_addr_success:
+ shr eax, #16
+ mov dx, ax ;; LFB address
+- pci_get_lfb_addr_6:
++ pci_get_lfb_addr_return:
+ pop eax
+ mov ax, dx
+ pop dx
+--
+1.7.4.1
+
diff --git a/debian/patches/05-Add-qemu-vmware-vga-pci-bios
b/debian/patches/05-Add-qemu-vmware-vga-pci-bios
new file mode 100644
index 0000000..04e1e53
--- /dev/null
+++ b/debian/patches/05-Add-qemu-vmware-vga-pci-bios
@@ -0,0 +1,64 @@
+From: Gerd Hoffmann <kra...@redhat.com>
+Date: Thu, 6 May 2010 10:47:01 +0200
+Subject: Add qemu vmware vga pci bios
+
+Add PCI vgabios for the qemu vmeare vga (15ad:0405).
+Name it vgabios-vmware.bin.
+
+Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
+---
+ Makefile | 10 +++++++++-
+ 1 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 58f064e..2a093e8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,7 +14,7 @@ RELVERS = `pwd | sed "s-.*/--" | sed "s/vgabios//" | sed
"s/-//"`
+
+ VGABIOS_DATE = "-DVGABIOS_DATE=\"$(RELDATE)\""
+
+-all: bios cirrus-bios stdvga-bios
++all: bios cirrus-bios stdvga-bios vmware-bios
+
+ bios: vgabios.bin vgabios.debug.bin
+
+@@ -22,6 +22,8 @@ cirrus-bios: vgabios-cirrus.bin vgabios-cirrus.debug.bin
+
+ stdvga-bios: vgabios-stdvga.bin vgabios-stdvga.debug.bin
+
++vmware-bios: vgabios-vmware.bin vgabios-vmware.debug.bin
++
+ clean:
+ /bin/rm -f biossums vbetables-gen vbetables.h *.o *.s *.ld86 \
+ temp.awk.* vgabios*.orig _vgabios_* _vgabios-debug_* core
vgabios*.bin vgabios*.txt $(RELEASE).bin *.bak
+@@ -39,6 +41,8 @@ vgabios-cirrus.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS
+ vgabios-cirrus.debug.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS -DCIRRUS_DEBUG
+ vgabios-stdvga.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1234
-DPCI_DID=0x1111
+ vgabios-stdvga.debug.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1234
-DPCI_DID=0x1111 -DDEBUG
++vgabios-vmware.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x15ad
-DPCI_DID=0x0405
++vgabios-vmware.debug.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x15ad
-DPCI_DID=0x0405 -DDEBUG
+
+ # dist names
+ vgabios.bin : DISTNAME := VGABIOS-lgpl-latest.bin
+@@ -47,6 +51,8 @@ vgabios-cirrus.bin : DISTNAME :=
VGABIOS-lgpl-latest.cirrus.bin
+ vgabios-cirrus.debug.bin : DISTNAME := VGABIOS-lgpl-latest.cirrus.debug.bin
+ vgabios-stdvga.bin : DISTNAME := VGABIOS-lgpl-latest.stdvga.bin
+ vgabios-stdvga.debug.bin : DISTNAME := VGABIOS-lgpl-latest.stdvga.debug.bin
++vgabios-vmware.bin : DISTNAME := VGABIOS-lgpl-latest.vmware.bin
++vgabios-vmware.debug.bin : DISTNAME := VGABIOS-lgpl-latest.vmware.debug.bin
+
+ # dependencies
+ vgabios.bin : $(VGA_FILES) $(VBE_FILES) biossums
+@@ -55,6 +61,8 @@ vgabios-cirrus.bin : $(VGA_FILES) clext.c biossums
+ vgabios-cirrus.debug.bin : $(VGA_FILES) clext.c biossums
+ vgabios-stdvga.bin : $(VGA_FILES) $(VBE_FILES) biossums
+ vgabios-stdvga.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
++vgabios-vmware.bin : $(VGA_FILES) $(VBE_FILES) biossums
++vgabios-vmware.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
+
+ # build rule
+ %.bin:
+--
+1.7.4.1
+
diff --git a/debian/patches/06-Add-qemu-qxl-vga-pci-bios
b/debian/patches/06-Add-qemu-qxl-vga-pci-bios
new file mode 100644
index 0000000..a4cec8d
--- /dev/null
+++ b/debian/patches/06-Add-qemu-qxl-vga-pci-bios
@@ -0,0 +1,64 @@
+From: Gerd Hoffmann <kra...@redhat.com>
+Date: Thu, 6 May 2010 10:50:41 +0200
+Subject: Add qemu qxl vga pci bios
+
+Add PCI vgabios for the qemu qxl vga (1b36:0100).
+Name it vgabios-qxl.bin.
+
+Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
+---
+ Makefile | 10 +++++++++-
+ 1 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2a093e8..578721a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,7 +14,7 @@ RELVERS = `pwd | sed "s-.*/--" | sed "s/vgabios//" | sed
"s/-//"`
+
+ VGABIOS_DATE = "-DVGABIOS_DATE=\"$(RELDATE)\""
+
+-all: bios cirrus-bios stdvga-bios vmware-bios
++all: bios cirrus-bios stdvga-bios vmware-bios qxl-bios
+
+ bios: vgabios.bin vgabios.debug.bin
+
+@@ -24,6 +24,8 @@ stdvga-bios: vgabios-stdvga.bin vgabios-stdvga.debug.bin
+
+ vmware-bios: vgabios-vmware.bin vgabios-vmware.debug.bin
+
++qxl-bios: vgabios-qxl.bin vgabios-qxl.debug.bin
++
+ clean:
+ /bin/rm -f biossums vbetables-gen vbetables.h *.o *.s *.ld86 \
+ temp.awk.* vgabios*.orig _vgabios_* _vgabios-debug_* core
vgabios*.bin vgabios*.txt $(RELEASE).bin *.bak
+@@ -43,6 +45,8 @@ vgabios-stdvga.bin : VGAFLAGS := -DVBE -DPCIBIOS
-DPCI_VID=0x1234 -DPCI_DI
+ vgabios-stdvga.debug.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1234
-DPCI_DID=0x1111 -DDEBUG
+ vgabios-vmware.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x15ad
-DPCI_DID=0x0405
+ vgabios-vmware.debug.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x15ad
-DPCI_DID=0x0405 -DDEBUG
++vgabios-qxl.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1b36
-DPCI_DID=0x0100
++vgabios-qxl.debug.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1b36
-DPCI_DID=0x0100 -DDEBUG
+
+ # dist names
+ vgabios.bin : DISTNAME := VGABIOS-lgpl-latest.bin
+@@ -53,6 +57,8 @@ vgabios-stdvga.bin : DISTNAME :=
VGABIOS-lgpl-latest.stdvga.bin
+ vgabios-stdvga.debug.bin : DISTNAME := VGABIOS-lgpl-latest.stdvga.debug.bin
+ vgabios-vmware.bin : DISTNAME := VGABIOS-lgpl-latest.vmware.bin
+ vgabios-vmware.debug.bin : DISTNAME := VGABIOS-lgpl-latest.vmware.debug.bin
++vgabios-qxl.bin : DISTNAME := VGABIOS-lgpl-latest.qxl.bin
++vgabios-qxl.debug.bin : DISTNAME := VGABIOS-lgpl-latest.qxl.debug.bin
+
+ # dependencies
+ vgabios.bin : $(VGA_FILES) $(VBE_FILES) biossums
+@@ -63,6 +69,8 @@ vgabios-stdvga.bin : $(VGA_FILES) $(VBE_FILES) biossums
+ vgabios-stdvga.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
+ vgabios-vmware.bin : $(VGA_FILES) $(VBE_FILES) biossums
+ vgabios-vmware.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
++vgabios-qxl.bin : $(VGA_FILES) $(VBE_FILES) biossums
++vgabios-qxl.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
+
+ # build rule
+ %.bin:
+--
+1.7.4.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 139597f..2050da8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,6 @@
-
-
+01-Makefile-cleanup
+02-Add-defines-for-PCI-IDs
+03-Add-qemu-stdvga-pci-bios
+04-update-pci_get_lfb_addr-for-vmware-vga
+05-Add-qemu-vmware-vga-pci-bios
+06-Add-qemu-qxl-vga-pci-bios
diff --git a/debian/rules b/debian/rules
index 4a69d2d..2d22f9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,9 +27,12 @@ install: build-indep
dh_prep
dh_installdirs
- for i in "" .debug .cirrus .cirrus.debug ; do \
- install -m644 $(CURDIR)/VGABIOS-lgpl-latest$$i.bin \
- debian/vgabios/usr/share/vgabios/vgabios$$i.bin ; \
+ set -e; \
+ for i in "" .cirrus .qxl .stdvga .vmware; do \
+ for j in "$$i" "$$i.debug"; do \
+ install -m644 $(CURDIR)/VGABIOS-lgpl-latest$$j.bin \
+ debian/vgabios/usr/share/vgabios/vgabios$$j.bin ; \
+ done; \
done
binary-indep: install
