From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1ManX8-0000ii-Ar for qemu-devel@nongnu.org; Tue, 11 Aug 2009 05:20:42 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1ManX3-0000gu-PE for qemu-devel@nongnu.org; Tue, 11 Aug 2009 05:20:41 -0400 Received: from [199.232.76.173] (port=38973 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ManX3-0000go-9B for qemu-devel@nongnu.org; Tue, 11 Aug 2009 05:20:37 -0400 Received: from mx20.gnu.org ([199.232.41.8]:56706) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1ManX2-0004Kv-Vb for qemu-devel@nongnu.org; Tue, 11 Aug 2009 05:20:37 -0400 Received: from mx2.redhat.com ([66.187.237.31]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1ManX1-0004wX-LN for qemu-devel@nongnu.org; Tue, 11 Aug 2009 05:20:35 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7B9KYcM010382 for ; Tue, 11 Aug 2009 05:20:34 -0400 From: Gerd Hoffmann Date: Tue, 11 Aug 2009 11:20:27 +0200 Message-Id: <1249982427-14481-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1249982427-14481-1-git-send-email-kraxel@redhat.com> References: <1249982427-14481-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] qdev: add display capability List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann ... and tag devices. Signed-off-by: Gerd Hoffmann --- hw/cirrus_vga.c | 1 + hw/qdev.c | 1 + hw/qdev.h | 2 ++ hw/syborg_fb.c | 1 + hw/tcx.c | 1 + hw/vga.c | 1 + hw/vmware_vga.c | 1 + 7 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 95d822a..65dd8a0 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -3345,6 +3345,7 @@ void pci_cirrus_vga_init(PCIBus *bus) static PCIDeviceInfo cirrus_vga_info = { .qdev.name = "Cirrus VGA", .qdev.size = sizeof(PCICirrusVGAState), + .qdev.caps = DEV_CAP_DISPLAY, .init = pci_cirrus_vga_initfn, .config_write = pci_cirrus_write_config, }; diff --git a/hw/qdev.c b/hw/qdev.c index c026305..b15408d 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -110,6 +110,7 @@ static int qdev_print_devinfo(DeviceInfo *info, char *dest, int len) static const char *capname[] = { [ DEV_CAP_BIT_AUDIO ] = "audio", [ DEV_CAP_BIT_ETHERNET ] = "ethernet", + [ DEV_CAP_BIT_DISPLAY ] = "display", }; const char *sep; int pos = 0; diff --git a/hw/qdev.h b/hw/qdev.h index ee282f0..ea38a88 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -105,10 +105,12 @@ typedef void (*SCSIAttachFn)(DeviceState *host, BlockDriverState *bdrv, enum DeviceCapBits { DEV_CAP_BIT_AUDIO = 0, DEV_CAP_BIT_ETHERNET = 1, + DEV_CAP_BIT_DISPLAY = 2, }; #define DEV_CAP_AUDIO (1 << DEV_CAP_BIT_AUDIO) #define DEV_CAP_ETHERNET (1 << DEV_CAP_BIT_ETHERNET) +#define DEV_CAP_DISPLAY (1 << DEV_CAP_BIT_DISPLAY) struct DeviceInfo { const char *name; diff --git a/hw/syborg_fb.c b/hw/syborg_fb.c index efa5c0e..9d9a07e 100644 --- a/hw/syborg_fb.c +++ b/hw/syborg_fb.c @@ -534,6 +534,7 @@ static SysBusDeviceInfo syborg_fb_info = { .init = syborg_fb_init, .qdev.name = "syborg,framebuffer", .qdev.size = sizeof(SyborgFBState), + .qdev.caps = DEV_CAP_DISPLAY, .qdev.props = (Property[]) { DEFINE_PROP_UINT32("width", SyborgFBState, cols, 0), DEFINE_PROP_UINT32("height", SyborgFBState, rows, 0), diff --git a/hw/tcx.c b/hw/tcx.c index 68dbf02..a6f29fc 100644 --- a/hw/tcx.c +++ b/hw/tcx.c @@ -645,6 +645,7 @@ static SysBusDeviceInfo tcx_info = { .init = tcx_init1, .qdev.name = "SUNW,tcx", .qdev.size = sizeof(TCXState), + .qdev.caps = DEV_CAP_DISPLAY, .qdev.props = (Property[]) { DEFINE_PROP_TADDR("addr", TCXState, addr, -1), DEFINE_PROP_HEX32("vram_size", TCXState, vram_size, -1), diff --git a/hw/vga.c b/hw/vga.c index 4a0f197..7090075 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -2530,6 +2530,7 @@ int pci_vga_init(PCIBus *bus, static PCIDeviceInfo vga_info = { .qdev.name = "VGA", .qdev.size = sizeof(PCIVGAState), + .qdev.caps = DEV_CAP_DISPLAY, .init = pci_vga_initfn, .config_write = pci_vga_write_config, .qdev.props = (Property[]) { diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index 5ceebf1..0c7df8e 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -1246,6 +1246,7 @@ void pci_vmsvga_init(PCIBus *bus) static PCIDeviceInfo vmsvga_info = { .qdev.name = "QEMUware SVGA", .qdev.size = sizeof(struct pci_vmsvga_state_s), + .qdev.caps = DEV_CAP_DISPLAY, .init = pci_vmsvga_initfn, }; -- 1.6.2.5