Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at 2014-03-27 06:12:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hwinfo" Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2014-03-21 12:14:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hwinfo.new/hwinfo.changes 2014-03-27 06:12:50.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Mar 24 13:46:26 CET 2014 - [email protected] + +- s390: add some virtio device IDs (bnc #807532) +- adding fingerprint reader (bnc #793928) +- use 'cp -x' in getsysinfo (bnc #760240) +- s390: recognize model 2 OSA Express interfaces (bnc #720082) +- add id to Validity fingerprint sensor (bnc #719202) +- add unisys hypervisor bus info (bnc #678966) +- report InfiniBand controller as network controller (bnc #645877, bnc #644299) +- recognize InfiniBand controller (bnc #645877, bnc #644299, bnc #639807) +- fix type to avoid compiler warning +- VMWare -> VMware (bnc #536888) +- integrated & removed hwinfo_pci_scan_label.patch + +------------------------------------------------------------------- Old: ---- hwinfo-21.0.tar.bz2 hwinfo_pci_scan_label.patch New: ---- hwinfo-21.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.YoTJ3s/_old 2014-03-27 06:12:51.000000000 +0100 +++ /var/tmp/diff_new_pack.YoTJ3s/_new 2014-03-27 06:12:51.000000000 +0100 @@ -16,7 +16,6 @@ # - Name: hwinfo BuildRequires: doxygen BuildRequires: flex @@ -37,10 +36,9 @@ Group: Hardware/Other # Until migration to github this should be correct url Url: http://gitorious.org/opensuse/hwinfo -Version: 21.0 +Version: 21.1 Release: 0 -Source: hwinfo-21.0.tar.bz2 -Patch0: hwinfo_pci_scan_label.patch +Source: hwinfo-21.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -75,7 +73,6 @@ %prep %setup -%patch0 -p1 %build make static ++++++ hwinfo-21.0.tar.bz2 -> hwinfo-21.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.0/VERSION new/hwinfo-21.1/VERSION --- old/hwinfo-21.0/VERSION 2013-11-27 16:00:19.000000000 +0100 +++ new/hwinfo-21.1/VERSION 2014-03-24 13:46:24.000000000 +0100 @@ -1 +1 @@ -21.0 +21.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.0/changelog new/hwinfo-21.1/changelog --- old/hwinfo-21.0/changelog 2013-11-27 16:00:20.000000000 +0100 +++ new/hwinfo-21.1/changelog 2014-03-24 13:46:25.000000000 +0100 @@ -1,3 +1,19 @@ +2014-03-24: HEAD + - show Consistant Device Name (CDN) as Device Name + - The Device name of a PCI or PCI Express device under OS may be exported + - by BIOS via label sysfs attribute. Read it and show it to the user as + - "Device Name:" (fate #316031, fate #315201). + - s390: add some virtio device IDs (bnc #807532) + - adding fingerprint reader (bnc #793928) + - use 'cp -x' in getsysinfo (bnc #760240) + - s390: recognize model 2 OSA Express interfaces (bnc #720082) + - add id to Validity fingerprint sensor (bnc #719202) + - add unisys hypervisor bus info (bnc #678966) + - report InfiniBand controller as network controller (bnc #645877, bnc #644299) + - recognize InfiniBand controller (bnc #645877, bnc #644299, bnc #639807) + - fix type to avoid compiler warning + - VMWare -> VMware (bnc #536888) + 2013-11-27: 21.0 - read and add ethtool private flags (bnc 841170) - update pci id list (bnc #813172) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.0/getsysinfo new/hwinfo-21.1/getsysinfo --- old/hwinfo-21.0/getsysinfo 2013-11-27 15:59:28.000000000 +0100 +++ new/hwinfo-21.1/getsysinfo 2014-03-24 13:25:58.000000000 +0100 @@ -50,7 +50,7 @@ do if [ -e "$i" ] ; then echo "$i" - cp -a --parents "$i" "$dir/$host" 2>/dev/null + cp -x -a --parents "$i" "$dir/$host" 2>/dev/null chmod -R u+w,a+r,a+X "$dir/$host" for i in `( cd "$dir/$host" ; find proc -type f -size 0 )` ; do cat "/$i" >"$dir/$host/$i" @@ -61,6 +61,7 @@ echo /proc/mounts perl -nl -e 'print unless (split)[0] =~ /none|automount|:/' /proc/mounts >"$dir/$host/proc/mounts" +mkdir -p "$dir/$host/var/log" echo -e "\n------ dmesg start ------\n" >>"$dir/$host/var/log/boot.msg" dmesg >>"$dir/$host/var/log/boot.msg" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.0/hwinfo.c new/hwinfo-21.1/hwinfo.c --- old/hwinfo-21.0/hwinfo.c 2013-11-27 15:59:28.000000000 +0100 +++ new/hwinfo-21.1/hwinfo.c 2014-03-24 11:46:38.000000000 +0100 @@ -53,7 +53,7 @@ int oem_install_info(hd_data_t *hd_data); void dump_packages(hd_data_t *hd_data); -void do_hw(hd_data_t *hd_data, FILE *f, hd_hw_item_t hw_item); +void do_hw(hd_data_t *hd_data, FILE *f, int hw_item); void do_hw_multi(hd_data_t *hd_data, FILE *f, hd_hw_item_t *hw_items); void do_short(hd_data_t *hd_data, hd_t *hd, FILE *f); void do_test(hd_data_t *hd_data); @@ -494,7 +494,11 @@ } -void do_hw(hd_data_t *hd_data, FILE *f, hd_hw_item_t hw_item) +/* + * hw_item might be either a 'real' hd_hw_item_t or some number >= 2000 used + * for some special probe runs. + */ +void do_hw(hd_data_t *hd_data, FILE *f, int hw_item) { hd_t *hd, *hd0; int smp = -1, uml = 0, xen = 0, i; @@ -513,7 +517,7 @@ case 2001: case 2003: i = -1; - switch((int) hw_item) { + switch(hw_item) { case 2000: i = pr_default; break; case 2001: i = pr_all; break; case 2003: i = pr_cpu; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.0/src/hd/block.c new/hwinfo-21.1/src/hd/block.c --- old/hwinfo-21.0/src/hd/block.c 2013-11-27 15:59:28.000000000 +0100 +++ new/hwinfo-21.1/src/hd/block.c 2014-03-24 11:31:54.000000000 +0100 @@ -881,7 +881,7 @@ hd_report_this(hd_data, hd) && hd->unix_dev_name && hd->sub_class.id == sc_sdev_cdrom && - !hd_data->flags.vmware /* VMWare doesn't like it */ + !hd_data->flags.vmware /* VMware doesn't like it */ ) { PROGRESS(5, 0, hd->unix_dev_name); fd = open(hd->unix_dev_name, O_RDONLY | O_NONBLOCK); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.0/src/hd/hd.c new/hwinfo-21.1/src/hd/hd.c --- old/hwinfo-21.0/src/hd/hd.c 2013-11-27 15:59:28.000000000 +0100 +++ new/hwinfo-21.1/src/hd/hd.c 2014-03-24 12:24:57.000000000 +0100 @@ -4700,6 +4700,12 @@ hd->base_class.id == bc_serial && hd->sub_class.id == sc_ser_fiber ) + || + ( /* add infiniband to network ctrl list */ + item == hw_network_ctrl && + hd->base_class.id == bc_serial && + hd->sub_class.id == sc_ser_infiniband + ) ) { hd_set_hw_class(hd, item); if(!hd->hw_class) hd->hw_class = item; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.0/src/hd/hd.h new/hwinfo-21.1/src/hd/hd.h --- old/hwinfo-21.0/src/hd/hd.h 2013-11-27 15:59:28.000000000 +0100 +++ new/hwinfo-21.1/src/hd/hd.h 2014-03-24 13:40:29.000000000 +0100 @@ -19,7 +19,7 @@ */ /** Interface version */ -#define HD_VERSION 20 +#define HD_VERSION 21 /** * @defgroup DEBUGpub Debug flags @@ -213,7 +213,7 @@ /** subclass values of bc_serial */ typedef enum sc_serial { sc_ser_fire, sc_ser_access, sc_ser_ssa, sc_ser_usb, sc_ser_fiber, - sc_ser_smbus, sc_ser_other = 0x80 + sc_ser_smbus, sc_ser_infiniband, sc_ser_other = 0x80 } hd_sc_serial_t; /** internal sub class values (bc_internal) */ @@ -296,7 +296,7 @@ /** outside the range of the PCI values */ bus_ps2 = 0x80, bus_serial, bus_parallel, bus_floppy, bus_scsi, bus_ide, bus_usb, bus_adb, bus_raid, bus_sbus, bus_i2o, bus_vio, bus_ccw, bus_iucv, bus_ps3_system_bus, - bus_virtio, bus_ibmebus, bus_gameport + bus_virtio, bus_ibmebus, bus_gameport, bus_uisvirtpci } hd_bus_types_t; /** @} */ @@ -1047,6 +1047,7 @@ char *sysfs_id; /**< sysfs path */ char *sysfs_bus_id; /**< sysfs bus id */ char *modalias; /**< module alias */ + char *label; /**< Consistant Device Name (CDN), pci firmware spec 3.1, chapter 4.6.7 */ unsigned edid_len[4]; /**< edid record length */ unsigned char edid_data[4][0x80]; /**< edid record */ } pci_t; @@ -2583,6 +2584,7 @@ hal_prop_t *persistent_prop; /**< persistent property list */ char *modalias; /**< module alias */ + char *label; /**< Consistent Device Name (CDN), pci firmware spec 3.1, chapter 4.6.7 */ /* * These are used internally for memory management. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.0/src/hd/hdp.c new/hwinfo-21.1/src/hd/hdp.c --- old/hwinfo-21.0/src/hd/hdp.c 2013-11-27 15:59:28.000000000 +0100 +++ new/hwinfo-21.1/src/hd/hdp.c 2014-03-24 13:40:29.000000000 +0100 @@ -357,6 +357,8 @@ hd_detail_monitor_t *mdetail; static char *geo_type_str[] = { "Physical", "Logical", "BIOS EDD", "BIOS Legacy" }; + if(h->label) dump_line("Device Name: \"%s\"\n", h->label); + if(h->model) dump_line("Model: \"%s\"\n", h->model); s = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.0/src/hd/pci.c new/hwinfo-21.1/src/hd/pci.c --- old/hwinfo-21.0/src/hd/pci.c 2013-11-27 15:59:28.000000000 +0100 +++ new/hwinfo-21.1/src/hd/pci.c 2014-03-24 13:40:29.000000000 +0100 @@ -58,6 +58,7 @@ static void add_xen_network(hd_data_t *hd_data); static void add_xen_storage(hd_data_t *hd_data); static void hd_read_virtio(hd_data_t *hd_data); +static void hd_read_uisvirtpci(hd_data_t *hd_data); static void hd_read_ibmebus(hd_data_t *hd_data); void hd_scan_sysfs_pci(hd_data_t *hd_data) @@ -107,6 +108,9 @@ PROGRESS(11, 0, "ibmebus"); hd_read_ibmebus(hd_data); + + PROGRESS(12, 0, "uisvirtpci"); + hd_read_uisvirtpci(hd_data); } @@ -192,6 +196,11 @@ pci->irq = ul0; } + if((s = get_sysfs_attr_by_path(sf_dev, "label"))) { + pci->label = canon_str(s, strlen(s)); + ADD2LOG(" label = \"%s\"\n", pci->label); + } + sl = hd_attr_list(get_sysfs_attr_by_path(sf_dev, "resource")); for(u = 0; sl; sl = sl->next, u++) { if( @@ -432,6 +441,11 @@ pci->modalias = NULL; } + if(pci->label && *pci->label) { + hd->label = pci->label; + pci->label = NULL; + } + hd->slot = pci->slot + (pci->bus << 8); hd->func = pci->func; hd->base_class.id = pci->base_class; @@ -1549,6 +1563,76 @@ free_str_list(sf_bus); } +/* + * uisvirtpci + */ +void hd_read_uisvirtpci(hd_data_t *hd_data) +{ + uint64_t ul0; + hd_t *hd; + str_list_t *sf_bus, *sf_bus_e; + char *sf_dev, *drv, *drv_name; + + sf_bus = read_dir("/sys/bus/uisvirtpci/devices", 'l'); + + if(!sf_bus) { + ADD2LOG("sysfs: no such bus: uisvirtpci\n"); + return; + } + + for(sf_bus_e = sf_bus; sf_bus_e; sf_bus_e = sf_bus_e->next) { + sf_dev = new_str(hd_read_sysfs_link("/sys/bus/uisvirtpci/devices", sf_bus_e->str)); + + ADD2LOG( + " uisvirtpci device: name = %s\n path = %s\n", + sf_bus_e->str, + hd_sysfs_id(sf_dev) + ); + hd = add_hd_entry(hd_data, __LINE__, 0); + hd->vendor.id = MAKE_ID(TAG_PCI, 0xA0F1); /* Unisys */ + + drv_name = NULL; + drv = new_str(hd_read_sysfs_link(sf_dev, "driver")); + if(drv) { + drv_name = strrchr(drv, '/'); + if(drv_name) { + drv_name++; + ADD2LOG(" driver = \"%s\"\n", drv_name); + + if(!strcmp(drv_name,"uisvirtnic")) { + hd->device.id = MAKE_ID(TAG_SPECIAL, 0x0002); + hd->base_class.id = bc_network; + } + else if(!strcmp(drv_name,"uisvirthba")) { + hd->device.id = MAKE_ID(TAG_SPECIAL, 0x0003); + hd->base_class.id = bc_storage; + } + else { + hd->device.id = MAKE_ID(TAG_SPECIAL, 0x0000); + hd->base_class.id = bc_other; + } + } + } + else { + hd->device.id = MAKE_ID(TAG_SPECIAL, 0x0001); + hd->base_class.id = bc_bridge; + } + + if(hd_attr_uint(get_sysfs_attr_by_path(sf_dev, "device"), &ul0, 0)) { + hd->device.id = MAKE_ID(TAG_SPECIAL, ul0 ); + ADD2LOG(" device = %lu\n", ul0); + } + + hd->sysfs_id = new_str(hd_sysfs_id(sf_dev)); + hd->sysfs_bus_id = new_str(sf_bus_e->str); + if(drv_name) add_str_list(&hd->drivers, drv_name); + + free_mem(sf_dev); + free_mem(drv); + } + + free_str_list(sf_bus); +} /** @} */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.0/src/hd/sys.c new/hwinfo-21.1/src/hd/sys.c --- old/hwinfo-21.0/src/hd/sys.c 2013-11-27 15:59:28.000000000 +0100 +++ new/hwinfo-21.1/src/hd/sys.c 2014-03-24 11:31:54.000000000 +0100 @@ -222,7 +222,7 @@ } if(is_vmware == 1) { - st->model = new_str("VMWare"); + st->model = new_str("VMware"); } hd_data->flags.vmware = is_vmware; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.0/src/ids/src/bus new/hwinfo-21.1/src/ids/src/bus --- old/hwinfo-21.0/src/ids/src/bus 2013-11-27 15:59:28.000000000 +0100 +++ new/hwinfo-21.1/src/ids/src/bus 2014-03-24 12:30:17.000000000 +0100 @@ -88,3 +88,6 @@ bus.id 0x91 +bus.name Gameport + bus.id 0x92 ++bus.name UISVIRTPCI + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.0/src/ids/src/extra new/hwinfo-21.1/src/ids/src/extra --- old/hwinfo-21.0/src/ids/src/extra 2013-11-27 15:59:28.000000000 +0100 +++ new/hwinfo-21.1/src/ids/src/extra 2014-03-24 11:31:54.000000000 +0100 @@ -131,7 +131,7 @@ +device.name INI-920 vendor.id pci 0x15ad -+vendor.name VMWare, Inc. ++vendor.name VMware, Inc. vendor.id pci 0x15ad &device.id pci 0x0405 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.0/src/ids/src/pci new/hwinfo-21.1/src/ids/src/pci --- old/hwinfo-21.0/src/ids/src/pci 2013-11-27 15:59:25.000000000 +0100 +++ new/hwinfo-21.1/src/ids/src/pci 2014-03-24 11:31:54.000000000 +0100 @@ -85709,7 +85709,7 @@ +device.name PCI Event Channel Controller vendor.id pci 0xfffe -+vendor.name VMWare Inc (temporary ID) ++vendor.name VMware Inc (temporary ID) vendor.id pci 0xfffe &device.id pci 0x0710 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.0/src/ids/src/s390 new/hwinfo-21.1/src/ids/src/s390 --- old/hwinfo-21.0/src/ids/src/s390 2013-11-27 15:59:28.000000000 +0100 +++ new/hwinfo-21.1/src/ids/src/s390 2014-03-24 13:33:55.000000000 +0100 @@ -6,6 +6,7 @@ &device.id special 0x1731 &subdevice.id special 0x1732 &detail.ccw.data.cu_model 1 +|detail.ccw.data.cu_model 2 +device.name OSA Express Network card +baseclass.id 2 +subclass.id 0x86 @@ -165,6 +166,29 @@ +progif.id 1 +driver.module.modprobe dasd_eckd_mod + vendor.id special 0x6001 +&device.id special 0x3832 +&detail.ccw.data.cu_model 1 ++device.name VirtIO Ethernet CCW Device ++baseclass.id 0x107 ++subclass.id 0x01 ++driver.module.modprobe virtio_net + + vendor.id special 0x6001 +&device.id special 0x3832 +&detail.ccw.data.cu_model 2 ++device.name VirtIO Block CCW Device ++baseclass.id 0x106 ++subclass.id 0 ++driver.module.modprobe virtio_blk + + vendor.id special 0x6001 +&device.id special 0x3832 +&detail.ccw.data.cu_model 5 ++device.name VirtIO Memory Balloon ++baseclass.id 0x005 ++driver.module.modprobe virtio_balloon + vendor.id special 0x6001 &device.id special 0x3705 &device.id special 0x3725 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.0/src/ids/src/special new/hwinfo-21.1/src/ids/src/special --- old/hwinfo-21.0/src/ids/src/special 2013-11-27 15:59:28.000000000 +0100 +++ new/hwinfo-21.1/src/ids/src/special 2014-03-24 13:30:38.000000000 +0100 @@ -779,6 +779,10 @@ &device.id usb 0x0007 |vendor.id usb 0x138a &device.id usb 0x003c +|vendor.id usb 0x138a +&device.id usb 0x003d +|vendor.id usb 0x138a +&device.id usb 0x003f +baseclass.id 0x116 +subclass.id 0x00 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.0/src/ids/src/x11.amd64 new/hwinfo-21.1/src/ids/src/x11.amd64 --- old/hwinfo-21.0/src/ids/src/x11.amd64 2013-11-27 15:59:28.000000000 +0100 +++ new/hwinfo-21.1/src/ids/src/x11.amd64 2014-03-24 11:31:54.000000000 +0100 @@ -3627,7 +3627,7 @@ +driver.xfree 4|nv|||||15,24 vendor.id pci 0x15ad -+vendor.name VMWare Inc ++vendor.name VMware Inc vendor.id pci 0x15ad &device.id pci 0x0405 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.0/src/ids/src/x11.i386 new/hwinfo-21.1/src/ids/src/x11.i386 --- old/hwinfo-21.0/src/ids/src/x11.i386 2013-11-27 15:59:28.000000000 +0100 +++ new/hwinfo-21.1/src/ids/src/x11.i386 2014-03-24 11:31:54.000000000 +0100 @@ -3614,7 +3614,7 @@ +driver.xfree 4|nv|||||15,24 vendor.id pci 0x15ad -+vendor.name VMWare Inc ++vendor.name VMware Inc vendor.id pci 0x15ad &device.id pci 0x0405 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.0/src/ids/src/x11.ia64 new/hwinfo-21.1/src/ids/src/x11.ia64 --- old/hwinfo-21.0/src/ids/src/x11.ia64 2013-11-27 15:59:28.000000000 +0100 +++ new/hwinfo-21.1/src/ids/src/x11.ia64 2014-03-24 11:31:54.000000000 +0100 @@ -3250,7 +3250,7 @@ +driver.xfree 4|nv|||||15,24 vendor.id pci 0x15ad -+vendor.name VMWare Inc ++vendor.name VMware Inc vendor.id pci 0x15ad &device.id pci 0x0405 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.0/src/ids/src/x11.ppc new/hwinfo-21.1/src/ids/src/x11.ppc --- old/hwinfo-21.0/src/ids/src/x11.ppc 2013-11-27 15:59:28.000000000 +0100 +++ new/hwinfo-21.1/src/ids/src/x11.ppc 2014-03-24 11:31:54.000000000 +0100 @@ -3083,7 +3083,7 @@ +driver.xfree 4|nv|||||15,24 vendor.id pci 0x15ad -+vendor.name VMWare Inc ++vendor.name VMware Inc vendor.id pci 0x15ad &device.id pci 0x0405 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
