Skip to contentSkip to conversation

remove unused field from pci device.

PATCH In review Gleb Natapov 2 participants 5 messages Jun 9, 2009

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 remove unused field from pci device.

Rename pci_irq_index to pci_device_count because this is what it actually does.

hw/pci.c +4 -4
index 0ab5b94..d00041a 100644
@@ -54,7 +54,7 @@ static void pci_set_irq(void *opaque, int irq_num, int level);
 target_phys_addr_t pci_mem_base;
 static uint16_t pci_default_sub_vendor_id = PCI_SUBVENDOR_ID_REDHAT_QUMRANET;
 static uint16_t pci_default_sub_device_id = PCI_SUBDEVICE_ID_QEMU;
-static int pci_irq_index;
+static int pci_device_count;
 static PCIBus *first_bus;
 
 static void pcibus_save(QEMUFile *f, void *opaque)
@@ -245,7 +245,7 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,
                                          PCIConfigReadFunc *config_read,
                                          PCIConfigWriteFunc *config_write)
 {
-    if (pci_irq_index >= PCI_DEVICES_MAX)
+    if (pci_device_count >= PCI_DEVICES_MAX)
         return NULL;
 
     if (devfn < 0) {
@@ -268,7 +268,7 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,
         config_write = pci_default_write_config;
     pci_dev->config_read = config_read;
     pci_dev->config_write = config_write;
-    pci_dev->irq_index = pci_irq_index++;
+    pci_device_count++;
     bus->devices[devfn] = pci_dev;
     pci_dev->irq = qemu_allocate_irqs(pci_set_irq, pci_dev, 4);
     return pci_dev;
@@ -322,7 +322,7 @@ int pci_unregister_device(PCIDevice *pci_dev)
     pci_unregister_io_regions(pci_dev);
 
     qemu_free_irqs(pci_dev->irq);
-    pci_irq_index--;
+    pci_device_count--;
     pci_dev->bus->devices[pci_dev->devfn] = NULL;
     qdev_free(&pci_dev->qdev);
     return 0;
hw/pci.h +0 -2
index 0405837..fb7b89a 100644
@@ -154,8 +154,6 @@ struct PCIDevice {
     PCIConfigReadFunc *config_read;
     PCIConfigWriteFunc *config_write;
     PCIUnregisterFunc *unregister;
-    /* ??? This is a PC-specific hack, and should be removed.  */
-    int irq_index;
 
     /* IRQ objects for the INTA-INTD pins.  */
     qemu_irq *irq;

--
Gleb.

#1 lore raw
Quoted 2 lines · Gleb Natapov

Rename pci_irq_index to pci_device_count because this is what it actually does.

This whole thing looks bogus. AFAICS the limit is completely arbitrary and unnecessary.

Paul

#2 lore raw
Quoted 7 lines · Paul Brook
Quoted 2 lines · Gleb Natapov

Rename pci_irq_index to pci_device_count because this is what it actually does.

This whole thing looks bogus. AFAICS the limit is completely arbitrary and unnecessary.

So? Left it bogus with unused field and cryptic name instead?

--
Gleb.

#3 lore raw
Quoted 9 lines · Gleb Natapov
Quoted 6 lines · Paul Brook
Quoted 2 lines · Gleb Natapov

Rename pci_irq_index to pci_device_count because this is what it actually does.

This whole thing looks bogus. AFAICS the limit is completely arbitrary and unnecessary.

So? Left it bogus with unused field and cryptic name instead?

No. Remove the whole thing.

Paul

#4 lore raw
Quoted 6 lines · Paul Brook
Quoted 5 lines · Gleb Natapov
Quoted 4 lines · Paul Brook
Quoted 2 lines · Gleb Natapov

Rename pci_irq_index to pci_device_count because this is what it actually does.

Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

This whole thing looks bogus. AFAICS the limit is completely arbitrary and unnecessary.

So? Left it bogus with unused field and cryptic name instead?

No. Remove the whole thing.

Well, not with may understanding of that code, but if somebody wants to do it...

--
Gleb.