[Qemu-devel] [PATCH v2 0/4] use new vgabios.

[Qemu-devel] [PATCH v2 0/4] use new vgabios.

[Gerd Hoffmann]

This patch series will put the new vgabios into use for stdvga and
vmware_vga.  The vgabios patches have been posted a while ago, they
are also also available from
  git://anongit.freedesktop.org/~kraxel/vgabios pcibios

For obvious reasons it depends on the new vgabios binaries being
present, i.e. vgabios patches being committed to vgabios.git, subtree
being updated and vgabios binaries being recompiled + committed to
qemu.git.

Changes in v2:
  * rebase to master, resolve video.x removal conflict.
  * add a new clean up patch, removes bits which where
    used by video.x code only.

The qemu patches are also available from
  git://anongit.freedesktop.org/spice/qemu vgabios.2

please pull,
  Gerd

Gerd Hoffmann (4):
  Add new vgabios binaries to blobs list.
  switch stdvga to pci vgabios
  switch vmware_vga to pci vgabios
  more stdvga cleanups.

 Makefile          |    5 +++--
 hw/pc.c           |    2 +-
 hw/pc.h           |    3 +--
 hw/ppc_newworld.c |    2 +-
 hw/ppc_oldworld.c |    2 +-
 hw/ppc_prep.c     |    2 +-
 hw/vga-pci.c      |   43 ++++++++-----------------------------------
 hw/vga.c          |    2 --
 hw/vga_int.h      |    2 --
 hw/vmware_vga.c   |    7 +------
 10 files changed, 17 insertions(+), 53 deletions(-)

[Qemu-devel] [PATCH v2 1/4] Add new vgabios binaries to blobs list.

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 Makefile |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 252c817..2aa69ff 100644
--- a/Makefile
+++ b/Makefile
@@ -175,8 +175,9 @@ ar      de     en-us  fi  fr-be  hr     it  lv  nl         pl  ru     th \
 common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr
 
 ifdef INSTALL_BLOBS
-BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
-openbios-sparc32 openbios-sparc64 openbios-ppc \
+BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin \
+vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \
+ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc \
 gpxe-eepro100-80861209.rom \
 gpxe-eepro100-80861229.rom \
 pxe-e1000.bin \
-- 
1.7.1

[Qemu-devel] [PATCH v2 2/4] switch stdvga to pci vgabios

[Gerd Hoffmann]

Make stdvga provide the new vgabios binary (with pcibios support)
using the PCI option rom bar.  Seabios will happily load it from
there.  The new vga bios will also lookup the framebuffer address
in pci config space, so the magic bochs lfb @ 0xe0000000 is not
needed any more -> zap it.

Without the patch:

  # dmesg | grep framebuffer
  vesafb: framebuffer at 0xe0000000, mapped to 0xf7e80000, using 1875k, total 8192k
  # lspci -vs2
  00:02.0 VGA compatible controller: Technical Corp. Device 1111 (prog-if 00 [VGA controller])
	Subsystem: Qumranet, Inc. Device 1100
	Physical Slot: 2
	Flags: fast devsel
	Memory at f0000000 (32-bit, prefetchable) [size=8M]
	Expansion ROM at <unassigned> [disabled]

With patch applied:

  # dmesg | grep framebuffer
  vesafb: framebuffer at 0xf0000000, mapped to 0xf7e80000, using 1875k, total 8192k
  # lspci -vs2
  00:02.0 VGA compatible controller: Technical Corp. Device 1111 (prog-if 00 [VGA controller])
	Subsystem: Qumranet, Inc. Device 1100
	Physical Slot: 2
	Flags: fast devsel
	Memory at f0000000 (32-bit, prefetchable) [size=8M]
	Expansion ROM at f0800000 [disabled] [size=64K]

cheers,
  Gerd

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/vga-pci.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/hw/vga-pci.c b/hw/vga-pci.c
index 2315f70..eef0e3c 100644
--- a/hw/vga-pci.c
+++ b/hw/vga-pci.c
@@ -103,11 +103,10 @@ static int pci_vga_initfn(PCIDevice *dev)
             bios_total_size <<= 1;
         pci_register_bar(&d->dev, PCI_ROM_SLOT, bios_total_size,
                          PCI_BASE_ADDRESS_MEM_PREFETCH, vga_map);
+     } else {
+         if (dev->romfile == NULL)
+             dev->romfile = qemu_strdup("vgabios-stdvga.bin");
      }
-
-    vga_init_vbe(s);
-     /* ROM BIOS */
-     rom_add_vga(VGABIOS_FILENAME);
      return 0;
 }
 
-- 
1.7.1

[Qemu-devel] [PATCH v2 3/4] switch vmware_vga to pci vgabios

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/vmware_vga.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index 3d25c14..9337fdb 100644
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -114,14 +114,12 @@ struct pci_vmsvga_state_s {
 # define SVGA_IO_BASE		SVGA_LEGACY_BASE_PORT
 # define SVGA_IO_MUL		1
 # define SVGA_FIFO_SIZE		0x10000
-# define SVGA_MEM_BASE		0xe0000000
 # define SVGA_PCI_DEVICE_ID	PCI_DEVICE_ID_VMWARE_SVGA2
 #else
 # define SVGA_ID		SVGA_ID_1
 # define SVGA_IO_BASE		SVGA_LEGACY_BASE_PORT
 # define SVGA_IO_MUL		4
 # define SVGA_FIFO_SIZE		0x10000
-# define SVGA_MEM_BASE		0xe0000000
 # define SVGA_PCI_DEVICE_ID	PCI_DEVICE_ID_VMWARE_SVGA
 #endif
 
@@ -1219,10 +1217,6 @@ static void vmsvga_init(struct vmsvga_state_s *s, int vga_ram_size)
     vga_init(&s->vga);
     vmstate_register(NULL, 0, &vmstate_vga_common, &s->vga);
 
-    vga_init_vbe(&s->vga);
-
-    rom_add_vga(VGABIOS_FILENAME);
-
     vmsvga_reset(s);
 }
 
@@ -1320,6 +1314,7 @@ static PCIDeviceInfo vmsvga_info = {
     .qdev.size    = sizeof(struct pci_vmsvga_state_s),
     .qdev.vmsd    = &vmstate_vmware_vga,
     .init         = pci_vmsvga_initfn,
+    .romfile      = "vgabios-vmware.bin",
 };
 
 static void vmsvga_register(void)
-- 
1.7.1

[Qemu-devel] [PATCH v2 4/4] more stdvga cleanups.

[Gerd Hoffmann]

video.x is gone now.  It was the only user of the
vga bios_offset + bios_size logic.  Zap it.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/pc.c           |    2 +-
 hw/pc.h           |    3 +--
 hw/ppc_newworld.c |    2 +-
 hw/ppc_oldworld.c |    2 +-
 hw/ppc_prep.c     |    2 +-
 hw/vga-pci.c      |   42 ++++++++----------------------------------
 hw/vga.c          |    2 --
 hw/vga_int.h      |    2 --
 8 files changed, 13 insertions(+), 44 deletions(-)

diff --git a/hw/pc.c b/hw/pc.c
index 69b13bf..0e44df8 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -993,7 +993,7 @@ void pc_vga_init(PCIBus *pci_bus)
             fprintf(stderr, "%s: vmware_vga: no PCI bus\n", __FUNCTION__);
     } else if (std_vga_enabled) {
         if (pci_bus) {
-            pci_vga_init(pci_bus, 0, 0);
+            pci_vga_init(pci_bus);
         } else {
             isa_vga_init();
         }
diff --git a/hw/pc.h b/hw/pc.h
index 63b0249..6852790 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -154,8 +154,7 @@ enum vga_retrace_method {
 extern enum vga_retrace_method vga_retrace_method;
 
 int isa_vga_init(void);
-int pci_vga_init(PCIBus *bus,
-                 unsigned long vga_bios_offset, int vga_bios_size);
+int pci_vga_init(PCIBus *bus);
 int isa_vga_mm_init(target_phys_addr_t vram_base,
                     target_phys_addr_t ctrl_base, int it_shift);
 
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index 4369337..305b2d4 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -316,7 +316,7 @@ static void ppc_core99_init (ram_addr_t ram_size,
         machine_arch = ARCH_MAC99;
     }
     /* init basic PC hardware */
-    pci_vga_init(pci_bus, 0, 0);
+    pci_vga_init(pci_bus);
 
     escc_mem_index = escc_init(0x80013000, pic[0x25], pic[0x24],
                                serial_hds[0], serial_hds[1], ESCC_CLOCK, 4);
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index a2f9ddf..5efc93d 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -227,7 +227,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size,
     }
     pic = heathrow_pic_init(&pic_mem_index, 1, heathrow_irqs);
     pci_bus = pci_grackle_init(0xfec00000, pic);
-    pci_vga_init(pci_bus, 0, 0);
+    pci_vga_init(pci_bus);
 
     escc_mem_index = escc_init(0x80013000, pic[0x0f], pic[0x10], serial_hds[0],
                                serial_hds[1], ESCC_CLOCK, 4);
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index a6915f7..b1f9cc7 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -694,7 +694,7 @@ static void ppc_prep_init (ram_addr_t ram_size,
     cpu_register_physical_memory(0x80000000, 0x00800000, PPC_io_memory);
 
     /* init basic PC hardware */
-    pci_vga_init(pci_bus, 0, 0);
+    pci_vga_init(pci_bus);
     //    openpic = openpic_init(0x00000000, 0xF0000000, 1);
     //    pit = pit_init(0x40, i8259[0]);
     rtc_init(2000, NULL);
diff --git a/hw/vga-pci.c b/hw/vga-pci.c
index eef0e3c..b09789c 100644
--- a/hw/vga-pci.c
+++ b/hw/vga-pci.c
@@ -52,14 +52,11 @@ static void vga_map(PCIDevice *pci_dev, int region_num,
 {
     PCIVGAState *d = (PCIVGAState *)pci_dev;
     VGACommonState *s = &d->vga;
-    if (region_num == PCI_ROM_SLOT) {
-        cpu_register_physical_memory(addr, s->bios_size, s->bios_offset);
-    } else {
-        cpu_register_physical_memory(addr, s->vram_size, s->vram_offset);
-        s->map_addr = addr;
-        s->map_end = addr + s->vram_size;
-        vga_dirty_log_start(s);
-    }
+
+    cpu_register_physical_memory(addr, s->vram_size, s->vram_offset);
+    s->map_addr = addr;
+    s->map_end = addr + s->vram_size;
+    vga_dirty_log_start(s);
 }
 
 static void pci_vga_write_config(PCIDevice *d,
@@ -95,31 +92,12 @@ static int pci_vga_initfn(PCIDevice *dev)
      pci_register_bar(&d->dev, 0, VGA_RAM_SIZE,
                       PCI_BASE_ADDRESS_MEM_PREFETCH, vga_map);
 
-     if (s->bios_size) {
-        unsigned int bios_total_size;
-        /* must be a power of two */
-        bios_total_size = 1;
-        while (bios_total_size < s->bios_size)
-            bios_total_size <<= 1;
-        pci_register_bar(&d->dev, PCI_ROM_SLOT, bios_total_size,
-                         PCI_BASE_ADDRESS_MEM_PREFETCH, vga_map);
-     } else {
-         if (dev->romfile == NULL)
-             dev->romfile = qemu_strdup("vgabios-stdvga.bin");
-     }
      return 0;
 }
 
-int pci_vga_init(PCIBus *bus,
-                 unsigned long vga_bios_offset, int vga_bios_size)
+int pci_vga_init(PCIBus *bus)
 {
-    PCIDevice *dev;
-
-    dev = pci_create(bus, -1, "VGA");
-    qdev_prop_set_uint32(&dev->qdev, "bios-offset", vga_bios_offset);
-    qdev_prop_set_uint32(&dev->qdev, "bios-size", vga_bios_size);
-    qdev_init_nofail(&dev->qdev);
-
+    pci_create_simple(bus, -1, "VGA");
     return 0;
 }
 
@@ -129,11 +107,7 @@ static PCIDeviceInfo vga_info = {
     .qdev.vmsd    = &vmstate_vga_pci,
     .init         = pci_vga_initfn,
     .config_write = pci_vga_write_config,
-    .qdev.props   = (Property[]) {
-        DEFINE_PROP_HEX32("bios-offset", PCIVGAState, vga.bios_offset, 0),
-        DEFINE_PROP_HEX32("bios-size",   PCIVGAState, vga.bios_size,   0),
-        DEFINE_PROP_END_OF_LIST(),
-    }
+    .romfile      = "vgabios-stdvga.bin",
 };
 
 static void vga_register(void)
diff --git a/hw/vga.c b/hw/vga.c
index 966185e..c057f4f 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -1934,8 +1934,6 @@ void vga_common_reset(VGACommonState *s)
     s->map_addr = 0;
     s->map_end = 0;
     s->lfb_vram_mapped = 0;
-    s->bios_offset = 0;
-    s->bios_size = 0;
     s->sr_index = 0;
     memset(s->sr, '\0', sizeof(s->sr));
     s->gr_index = 0;
diff --git a/hw/vga_int.h b/hw/vga_int.h
index 6a46a43..bc1327f 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -112,8 +112,6 @@ typedef struct VGACommonState {
     uint32_t map_addr;
     uint32_t map_end;
     uint32_t lfb_vram_mapped; /* whether 0xa0000 is mapped as ram */
-    uint32_t bios_offset;
-    uint32_t bios_size;
     uint32_t latch;
     uint8_t sr_index;
     uint8_t sr[256];
-- 
1.7.1

[Qemu-devel] Re: [PATCH v2 0/4] use new vgabios.

[Gerd Hoffmann]

On 10/15/10 12:02, Gerd Hoffmann wrote:
> This patch series will put the new vgabios into use for stdvga and
> vmware_vga.  The vgabios patches have been posted a while ago, they
> are also also available from
>    git://anongit.freedesktop.org/~kraxel/vgabios pcibios
>
> For obvious reasons it depends on the new vgabios binaries being
> present, i.e. vgabios patches being committed to vgabios.git, subtree
> being updated and vgabios binaries being recompiled + committed to
> qemu.git.
>
> Changes in v2:
>    * rebase to master, resolve video.x removal conflict.
>    * add a new clean up patch, removes bits which where
>      used by video.x code only.
>
> The qemu patches are also available from
>    git://anongit.freedesktop.org/spice/qemu vgabios.2
>
> please pull,
>    Gerd

Ping?

cheers,
   Gerd

Re: [Qemu-devel] Re: [PATCH v2 0/4] use new vgabios.

[Anthony Liguori]

On 11/01/2010 11:03 AM, Gerd Hoffmann wrote:
> On 10/15/10 12:02, Gerd Hoffmann wrote:
>> This patch series will put the new vgabios into use for stdvga and
>> vmware_vga.  The vgabios patches have been posted a while ago, they
>> are also also available from
>>    git://anongit.freedesktop.org/~kraxel/vgabios pcibios
>>
>> For obvious reasons it depends on the new vgabios binaries being
>> present, i.e. vgabios patches being committed to vgabios.git, subtree
>> being updated and vgabios binaries being recompiled + committed to
>> qemu.git.
>>
>> Changes in v2:
>>    * rebase to master, resolve video.x removal conflict.
>>    * add a new clean up patch, removes bits which where
>>      used by video.x code only.
>>
>> The qemu patches are also available from
>>    git://anongit.freedesktop.org/spice/qemu vgabios.2
>>
>> please pull,
>>    Gerd
>
> Ping?

Have you tried getting the bios patches upstream?

I don't mind carrying the patches.  I can't upload them at the moment as 
our qemu.org DNS server is having issues.

The QEMU patches are missing Signed-off-by's though.

Regards,

Anthony Liguori

>
> cheers,
>   Gerd
>
>

Re: [Qemu-devel] Re: [PATCH v2 0/4] use new vgabios.

[Gerd Hoffmann]

On 11/01/10 18:15, Anthony Liguori wrote:

>> Ping?
>
> Have you tried getting the bios patches upstream?

Sent to the list, no response at all, even got a bounce from Volker 
Ruppert's email address.  I'd take that as sign that upstream is pretty 
much dead ...

> The QEMU patches are missing Signed-off-by's though.

The patches on the list have them.  Might be the git tree has not. 
Looks like I have to adjust my work flow a bit, letting 'git 
format-patch' do the sign-off doesn't fly with pull requests ...

cheers,
   Gerd

Re: [Qemu-devel] Re: [PATCH v2 0/4] use new vgabios.

[Anthony Liguori]

On 11/01/2010 11:03 AM, Gerd Hoffmann wrote:
> On 10/15/10 12:02, Gerd Hoffmann wrote:
>> This patch series will put the new vgabios into use for stdvga and
>> vmware_vga.  The vgabios patches have been posted a while ago, they
>> are also also available from
>>    git://anongit.freedesktop.org/~kraxel/vgabios pcibios
>>
>> For obvious reasons it depends on the new vgabios binaries being
>> present, i.e. vgabios patches being committed to vgabios.git, subtree
>> being updated and vgabios binaries being recompiled + committed to
>> qemu.git.
>>
>> Changes in v2:
>>    * rebase to master, resolve video.x removal conflict.
>>    * add a new clean up patch, removes bits which where
>>      used by video.x code only.
>>
>> The qemu patches are also available from
>>    git://anongit.freedesktop.org/spice/qemu vgabios.2
>>
>> please pull,
>>    Gerd
>
> Ping?

Merged this and the qemu patches (vgabios.3 branch).  Thanks.

Regards,

Anthony Liguori

>
> cheers,
>   Gerd
>
>
>

Re: [Qemu-devel] Re: [PATCH v2 0/4] use new vgabios.

[Gerd Hoffmann]

On 11/16/10 15:51, Anthony Liguori wrote:
> On 11/01/2010 11:03 AM, Gerd Hoffmann wrote:
>> On 10/15/10 12:02, Gerd Hoffmann wrote:
>>> This patch series will put the new vgabios into use for stdvga and
>>> vmware_vga. The vgabios patches have been posted a while ago, they
>>> are also also available from
>>> git://anongit.freedesktop.org/~kraxel/vgabios pcibios

> Merged this and the qemu patches (vgabios.3 branch). Thanks.

The updates are not visible @ http://git.qemu.org/vgabios.git/, forgot 
to push?

cheers,
   Gerd

Re: [Qemu-devel] Re: [PATCH v2 0/4] use new vgabios.

[Anthony Liguori]

On 11/17/2010 04:26 AM, Gerd Hoffmann wrote:
> On 11/16/10 15:51, Anthony Liguori wrote:
>> On 11/01/2010 11:03 AM, Gerd Hoffmann wrote:
>>> On 10/15/10 12:02, Gerd Hoffmann wrote:
>>>> This patch series will put the new vgabios into use for stdvga and
>>>> vmware_vga. The vgabios patches have been posted a while ago, they
>>>> are also also available from
>>>> git://anongit.freedesktop.org/~kraxel/vgabios pcibios
>
>> Merged this and the qemu patches (vgabios.3 branch). Thanks.
>
> The updates are not visible @ http://git.qemu.org/vgabios.git/, forgot 
> to push?

Hrm, vgabios is currently setup in mirror mode.  I guess if we're going 
to take it over, I need to switch it back to push mode.

I'll reswizzle the repo.

Regards,

Anthony Liguori

> cheers,
>   Gerd
>
>