From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=39914 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OEfyq-0001Ih-Nj for qemu-devel@nongnu.org; Wed, 19 May 2010 05:54:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OEfyo-0000Fc-1V for qemu-devel@nongnu.org; Wed, 19 May 2010 05:54:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51508) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OEfyn-0000FG-OH for qemu-devel@nongnu.org; Wed, 19 May 2010 05:54:21 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4J9sKlW005267 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 19 May 2010 05:54:20 -0400 From: Gerd Hoffmann Date: Wed, 19 May 2010 11:54:17 +0200 Message-Id: <1274262857-31964-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1274262857-31964-1-git-send-email-kraxel@redhat.com> References: <1274262857-31964-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] all vga: fail graicefully when vga ports are taken List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Try to pci hotplug a vga card, watch qemu die with hw_error(). This patch fixes it. [v2: code style fixes] Signed-off-by: Gerd Hoffmann --- hw/cirrus_vga.c | 4 ++++ hw/vga-pci.c | 4 ++++ hw/vmware_vga.c | 4 ++++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 9f61a01..977abd2 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -3189,6 +3189,10 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev) uint8_t *pci_conf = d->dev.config; int device_id = CIRRUS_ID_CLGD5446; + if (is_ioport_assigned(0x3c0)) { + return -1; + } + /* setup VGA */ vga_common_init(&s->vga, VGA_RAM_SIZE); cirrus_init_common(s, device_id, 1); diff --git a/hw/vga-pci.c b/hw/vga-pci.c index c8d260c..9fa0bfb 100644 --- a/hw/vga-pci.c +++ b/hw/vga-pci.c @@ -79,6 +79,10 @@ static int pci_vga_initfn(PCIDevice *dev) VGACommonState *s = &d->vga; uint8_t *pci_conf = d->dev.config; + if (is_ioport_assigned(0x3c0)) { + return -1; + } + // vga + console init vga_common_init(s, VGA_RAM_SIZE); vga_init(s); diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index 4e7a75d..7a8cec0 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -1232,6 +1232,10 @@ static int pci_vmsvga_initfn(PCIDevice *dev) struct pci_vmsvga_state_s *s = DO_UPCAST(struct pci_vmsvga_state_s, card, dev); + if (is_ioport_assigned(0x3c0)) { + return -1; + } + pci_config_set_vendor_id(s->card.config, PCI_VENDOR_ID_VMWARE); pci_config_set_device_id(s->card.config, SVGA_PCI_DEVICE_ID); s->card.config[PCI_COMMAND] = PCI_COMMAND_IO | -- 1.6.6.1