From: Jack Lange Date: Mon, 16 Mar 2009 18:54:14 +0000 (-0500) Subject: Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios... X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=070a5e61e5647340caf353167440add206093765;hp=3c86fc75c137455a3cc45d7383c6bca69a4f7168;p=palacios.git Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios/palacios into devel --- diff --git a/palacios/include/devices/pci.h b/palacios/include/devices/pci.h index 3c6a08b..5d96168 100644 --- a/palacios/include/devices/pci.h +++ b/palacios/include/devices/pci.h @@ -68,8 +68,8 @@ struct pci_device { int (*config_update)(struct pci_device * pci_dev, uint_t reg_num, int length); - int (*cmd_update)(struct pci_dev *pci_dev, uchar_t io_enabled, uchar_t mem_enabled); - int (*ext_rom_update)(struct pci_dev *pci_dev); + int (*cmd_update)(struct pci_device *pci_dev, uchar_t io_enabled, uchar_t mem_enabled); + int (*ext_rom_update)(struct pci_device *pci_dev); int ext_rom_update_flag; diff --git a/palacios/src/devices/pci.c b/palacios/src/devices/pci.c index ef57cdb..1db0134 100644 --- a/palacios/src/devices/pci.c +++ b/palacios/src/devices/pci.c @@ -583,7 +583,7 @@ struct pci_device * v3_pci_register_device(struct vm_device * pci, int dev_num, struct v3_pci_bar * bars, int (*config_update)(struct pci_device * pci_dev, uint_t reg_num, int length), - int (*cmd_update)(struct pci_dev *pci_dev, uchar_t io_enabled, uchar_t mem_enabled), + int (*cmd_update)(struct pci_device *pci_dev, uchar_t io_enabled, uchar_t mem_enabled), int (*bar_update)(struct pci_device * pci_dev, uint_t bar), void * private_data) {