From 40a88676cdb22e844dce24c1745b6004a8cf7806 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Thu, 26 Apr 2018 02:54:07 +0000 Subject: Remove ich9_uhci123_irqpin_override As we do not support RHEL 6 compatibility we remove this hack. This hack was introduced in RHEL 7.1 for BZ 1085701 and 1103581 (Guest hits call trace migrate from RHEL6.5 to RHEL7.0 host with -M 6.1 & balloon & uhci device) by commits 8061ffe65490 and 42a193d925b3, and was backported to RHEL 7.0 as 0day fix (BZ 1090981, commit 48addb5b5b3b). Signed-off-by: Miroslav Rezanina --- hw/usb/hcd-uhci.c | 13 +------------ include/hw/usb.h | 3 --- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index 86d6ab8..9d7b9df 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -152,8 +152,6 @@ typedef struct UHCI_QH { uint32_t el_link; } UHCI_QH; -bool ich9_uhci123_irqpin_override; - static void uhci_async_cancel(UHCIAsync *async); static void uhci_queue_fill(UHCIQueue *q, UHCI_TD *td); static void uhci_resume(void *opaque); @@ -1222,16 +1220,7 @@ static void usb_uhci_common_realize(PCIDevice *dev, Error **errp) /* TODO: reset value should be 0. */ pci_conf[USB_SBRN] = USB_RELEASE_1; // release number - if (ich9_uhci123_irqpin_override && - u->info.vendor_id == PCI_VENDOR_ID_INTEL && - (u->info.device_id == PCI_DEVICE_ID_INTEL_82801I_UHCI1 || - u->info.device_id == PCI_DEVICE_ID_INTEL_82801I_UHCI2 || - u->info.device_id == PCI_DEVICE_ID_INTEL_82801I_UHCI3)) { - fprintf(stderr, "RHEL-6 compat: %s: irq_pin = 3\n", u->info.name); - irq_pin = 3; - } else { - irq_pin = u->info.irq_pin; - } + irq_pin = u->info.irq_pin; pci_config_set_interrupt_pin(pci_conf, irq_pin + 1); if (s->masterbus) { diff --git a/include/hw/usb.h b/include/hw/usb.h index 5b3fb1f..b943ec9 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -607,9 +607,6 @@ int usb_get_quirks(uint16_t vendor_id, uint16_t product_id, uint8_t interface_protocol); -/* hcd-uhci.c -- RHEL-6 machine type compatibility */ -extern bool ich9_uhci123_irqpin_override; - /* hcd-xhci.c -- rhel7.0.0 machine type compatibility */ extern bool migrate_cve_2014_5263_xhci_fields; -- 1.8.3.1