hw/qxl.c: convert to PCIDeviceInfo to initialize ids
use PCIDeviceInfo to initialize ids. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
3a9d85491e
commit
96c05abc90
7
hw/qxl.c
7
hw/qxl.c
|
@ -1233,7 +1233,6 @@ static int qxl_init_common(PCIQXLDevice *qxl)
|
|||
break;
|
||||
}
|
||||
|
||||
pci_config_set_vendor_id(config, REDHAT_PCI_VENDOR_ID);
|
||||
pci_config_set_device_id(config, pci_device_id);
|
||||
pci_set_byte(&config[PCI_REVISION_ID], pci_device_rev);
|
||||
pci_set_byte(&config[PCI_INTERRUPT_PIN], 1);
|
||||
|
@ -1310,7 +1309,6 @@ static int qxl_init_primary(PCIDevice *dev)
|
|||
qxl0 = qxl;
|
||||
register_displaychangelistener(vga->ds, &display_listener);
|
||||
|
||||
pci_config_set_class(dev->config, PCI_CLASS_DISPLAY_VGA);
|
||||
return qxl_init_common(qxl);
|
||||
}
|
||||
|
||||
|
@ -1330,7 +1328,6 @@ static int qxl_init_secondary(PCIDevice *dev)
|
|||
qxl->vga.vram_size);
|
||||
qxl->vga.vram_ptr = qemu_get_ram_ptr(qxl->vga.vram_offset);
|
||||
|
||||
pci_config_set_class(dev->config, PCI_CLASS_DISPLAY_OTHER);
|
||||
return qxl_init_common(qxl);
|
||||
}
|
||||
|
||||
|
@ -1493,6 +1490,8 @@ static PCIDeviceInfo qxl_info_primary = {
|
|||
.init = qxl_init_primary,
|
||||
.config_write = qxl_write_config,
|
||||
.romfile = "vgabios-qxl.bin",
|
||||
.vendor_id = REDHAT_PCI_VENDOR_ID,
|
||||
.class_id = PCI_CLASS_DISPLAY_VGA,
|
||||
.qdev.props = (Property[]) {
|
||||
DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size, 64 * 1024 * 1024),
|
||||
DEFINE_PROP_UINT32("vram_size", PCIQXLDevice, vram_size, 64 * 1024 * 1024),
|
||||
|
@ -1511,6 +1510,8 @@ static PCIDeviceInfo qxl_info_secondary = {
|
|||
.qdev.reset = qxl_reset_handler,
|
||||
.qdev.vmsd = &qxl_vmstate,
|
||||
.init = qxl_init_secondary,
|
||||
.vendor_id = REDHAT_PCI_VENDOR_ID,
|
||||
.class_id = PCI_CLASS_DISPLAY_OTHER,
|
||||
.qdev.props = (Property[]) {
|
||||
DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size, 64 * 1024 * 1024),
|
||||
DEFINE_PROP_UINT32("vram_size", PCIQXLDevice, vram_size, 64 * 1024 * 1024),
|
||||
|
|
Loading…
Reference in a new issue