Hello community, here is the log from the commit of package hwinfo checked in at Fri Nov 24 15:57:39 CET 2006. -------- --- hwinfo/hwinfo.changes 2006-11-20 15:46:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/hwinfo/hwinfo.changes 2006-11-24 15:29:19.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Nov 24 15:29:14 CET 2006 - snwint@suse.de + +- updated X11 data + +------------------------------------------------------------------- +Fri Nov 24 13:06:35 CET 2006 - snwint@suse.de + +- updated X11 data +- fix xen network detection (#220817) + +------------------------------------------------------------------- Old: ---- hwinfo-13.15.tar.bz2 New: ---- hwinfo-13.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.UmHRb3/_old 2006-11-24 15:57:23.000000000 +0100 +++ /var/tmp/diff_new_pack.UmHRb3/_new 2006-11-24 15:57:23.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package hwinfo (Version 13.15) +# spec file for package hwinfo (Version 13.17) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,9 +20,9 @@ PreReq: /sbin/ldconfig %insserv_prereq %fillup_prereq Autoreqprov: on Summary: Hardware Library -Version: 13.15 +Version: 13.17 Release: 1 -Source: hwinfo-13.15.tar.bz2 +Source: hwinfo-13.17.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -89,6 +89,11 @@ %doc doc/libhd/html %changelog -n hwinfo +* Fri Nov 24 2006 - snwint@suse.de +- updated X11 data +* Fri Nov 24 2006 - snwint@suse.de +- updated X11 data +- fix xen network detection (#220817) * Mon Nov 20 2006 - snwint@suse.de - sometimes usb mice were missed (#216091) * Tue Nov 14 2006 - snwint@suse.de ++++++ hwinfo-13.15.tar.bz2 -> hwinfo-13.17.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.15/Changelog new/hwinfo-13.17/Changelog --- old/hwinfo-13.15/Changelog 2006-11-20 15:29:44.000000000 +0100 +++ new/hwinfo-13.17/Changelog 2006-11-24 15:06:12.000000000 +0100 @@ -1,3 +1,10 @@ +24/11/2006: v13.17 + - updated X11 data + +24/11/2006: v13.16 + - updated X11 data + - fix xen network detection (#220817) + 20/11/2006: v13.15 - sometimes usb mice were missed (#216091) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.15/VERSION new/hwinfo-13.17/VERSION --- old/hwinfo-13.15/VERSION 2006-11-20 14:35:53.000000000 +0100 +++ new/hwinfo-13.17/VERSION 2006-11-24 15:05:52.000000000 +0100 @@ -1 +1 @@ -13.15 +13.17 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.15/src/hd/net.c new/hwinfo-13.17/src/hd/net.c --- old/hwinfo-13.15/src/hd/net.c 2006-09-01 12:39:25.000000000 +0200 +++ new/hwinfo-13.17/src/hd/net.c 2006-11-24 12:31:54.000000000 +0100 @@ -40,7 +40,6 @@ static void add_iseries(hd_data_t *hdata); static void add_uml(hd_data_t *hdata); static void add_kma(hd_data_t *hdata); -static void add_xen(hd_data_t *hdata); static void add_if_name(hd_t *hd_card, hd_t *hd); /* @@ -297,7 +296,6 @@ if(hd_is_sgi_altix(hd_data)) add_xpnet(hd_data); if(hd_is_iseries(hd_data)) add_iseries(hd_data); add_uml(hd_data); - add_xen(hd_data); add_kma(hd_data); add_mv(hd_data); @@ -687,54 +685,6 @@ /* - * XEN veth devices. - */ -void add_xen(hd_data_t *hd_data) -{ - hd_t *hd, *hd_card; - hd_res_t *res, *res2; - unsigned card_cnt = 0; - char *s = NULL; - struct stat sbuf; - - for(hd = hd_data->hd ; hd; hd = hd->next) { - if( - hd->module == hd_data->module && - hd->base_class.id == bc_network_interface - ) { - str_printf(&s, 0, "/proc/xen/net/%s", hd->unix_dev_name); - if(stat(s, &sbuf) || !S_ISDIR(sbuf.st_mode)) continue; - - hd_card = add_hd_entry(hd_data, __LINE__, 0); - hd_card->base_class.id = bc_network; - hd_card->sub_class.id = 0x00; - hd_card->vendor.id = MAKE_ID(TAG_SPECIAL, 0x6011); // Xen - hd_card->device.id = MAKE_ID(TAG_SPECIAL, 0x0001); - hd_card->slot = card_cnt++; - str_printf(&hd_card->device.name, 0, "Virtual Ethernet card %d", hd_card->slot); - - hd->attached_to = hd_card->idx; - - for(res = hd->res; res; res = res->next) { - if(res->any.type == res_hwaddr) break; - } - - if(res) { - res2 = new_mem(sizeof *res2); - res2->hwaddr.type = res_hwaddr; - res2->hwaddr.addr = new_str(res->hwaddr.addr); - add_res_entry(&hd_card->res, res2); - } - - add_if_name(hd_card, hd); - } - } - - free_mem(s); -} - - -/* * add interface name to card */ void add_if_name(hd_t *hd_card, hd_t *hd) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.15/src/hd/pci.c new/hwinfo-13.17/src/hd/pci.c --- old/hwinfo-13.15/src/hd/pci.c 2006-11-14 14:49:46.000000000 +0100 +++ new/hwinfo-13.17/src/hd/pci.c 2006-11-24 12:33:36.000000000 +0100 @@ -49,6 +49,7 @@ static void dump_pci_data(hd_data_t *hd_data); static void hd_read_macio(hd_data_t *hd_data); static void hd_read_vio(hd_data_t *hd_data); +static void hd_read_xen(hd_data_t *hd_data); void hd_scan_sysfs_pci(hd_data_t *hd_data) { @@ -75,9 +76,13 @@ hd_read_macio(hd_data); - PROGRESS(3, 0, "vio"); + PROGRESS(4, 0, "vio"); hd_read_vio(hd_data); + + PROGRESS(5, 0, "xen"); + + hd_read_xen(hd_data); } @@ -720,5 +725,73 @@ free_str_list(sf_bus); } + +/* + * Get xen (network) data from sysfs. + */ +void hd_read_xen(hd_data_t *hd_data) +{ + char *s, *xen_type, *xen_node; + int eth_cnt = 0; + hd_t *hd; + str_list_t *sf_bus, *sf_bus_e; + char *sf_dev; + + sf_bus = reverse_str_list(read_dir("/sys/bus/xen/devices", 'l')); + + if(!sf_bus) { + ADD2LOG("sysfs: no such bus: xen\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/xen/devices", sf_bus_e->str)); + + ADD2LOG( + " xen device: name = %s\n path = %s\n", + sf_bus_e->str, + hd_sysfs_id(sf_dev) + ); + + xen_type = xen_node = NULL; + + if((s = get_sysfs_attr_by_path(sf_dev, "devtype"))) { + xen_type = canon_str(s, strlen(s)); + ADD2LOG(" type = \"%s\"\n", xen_type); + } + + if((s = get_sysfs_attr_by_path(sf_dev, "nodename"))) { + xen_node = canon_str(s, strlen(s)); + ADD2LOG(" node = \"%s\"\n", xen_node); + } + + if( + xen_type && + !strcmp(xen_type, "vif") + ) { + hd = add_hd_entry(hd_data, __LINE__, 0); + + hd->bus.id = bus_none; + hd->base_class.id = bc_network; + hd->sub_class.id = 0; /* ethernet */ + hd->slot = eth_cnt++; + hd->vendor.id = MAKE_ID(TAG_SPECIAL, 0x6011); /* xen */ + hd->device.id = MAKE_ID(TAG_SPECIAL, 0x0001); + str_printf(&hd->device.name, 0, "Virtual Ethernet card %d", hd->slot); + hd->rom_id = new_str(xen_node); + + hd->sysfs_id = new_str(hd_sysfs_id(sf_dev)); + hd->sysfs_bus_id = new_str(sf_bus_e->str); + s = hd_sysfs_find_driver(hd_data, hd->sysfs_id, 1); + if(s) add_str_list(&hd->drivers, s); + } + + free_mem(sf_dev); + } + + free_str_list(sf_bus); +} + + /** @} */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.15/src/ids/src/x11.amd64 new/hwinfo-13.17/src/ids/src/x11.amd64 --- old/hwinfo-13.15/src/ids/src/x11.amd64 2006-11-20 15:44:37.000000000 +0100 +++ new/hwinfo-13.17/src/ids/src/x11.amd64 2006-11-24 14:51:28.000000000 +0100 @@ -5,7 +5,7 @@ &device.id pci 0x3150 +device.name Radeon Mobility X600 (M24) 3150 (PCIE) +driver.xfree 4|radeon -+driver.xfree 4|fglrx|3d||dri ++driver.xfree 4|radeon|3d||dri vendor.id pci 0x1002 &device.id pci 0x3152 @@ -513,7 +513,7 @@ &device.id pci 0x4e44 +device.name R300 ND +driver.xfree 4|radeon -+driver.xfree 4|fglrx|3d||dri ++driver.xfree 4|radeon|3d||dri vendor.id pci 0x1002 &device.id pci 0x4e44 @@ -537,7 +537,7 @@ &device.id pci 0x4e47 +device.name R300 NG +driver.xfree 4|radeon -+driver.xfree 4|fglrx|3d||dri ++driver.xfree 4|radeon|3d||dri vendor.id pci 0x1002 &device.id pci 0x4e47 @@ -777,7 +777,6 @@ &device.id pci 0x5148 +device.name fgl8x00 +driver.xfree 4|radeon -+driver.xfree 4|radeon|3d||dri vendor.id pci 0x1002 &device.id pci 0x5148 @@ -1162,7 +1161,7 @@ +device.name Mobility Radeon X700 5653 (M26) (PCIE) +driver.xfree 4|radeon +driver.xfree.config Option "MonitorLayout" "LVDS,AUTO" -+driver.xfree 4|fglrx|3d||dri ++driver.xfree 4|radeon|3d||dri vendor.id pci 0x1002 &device.id pci 0x5654 @@ -1279,7 +1278,7 @@ &device.id pci 0x5b60 +device.name Radeon X300 (RV370) 5B60 (PCIE) +driver.xfree 4|radeon -+driver.xfree 4|fglrx|3d||dri ++driver.xfree 4|radeon|3d||dri vendor.id pci 0x1002 &device.id pci 0x5b60 @@ -1304,7 +1303,7 @@ &device.id pci 0x5b64 +device.name FireGL V3100 (RV370) 5B64 (PCIE) +driver.xfree 4|radeon -+driver.xfree 4|fglrx|3d||dri ++driver.xfree 4|radeon|3d||dri vendor.id pci 0x1002 &device.id pci 0x5b65 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.15/src/ids/src/x11.i386 new/hwinfo-13.17/src/ids/src/x11.i386 --- old/hwinfo-13.15/src/ids/src/x11.i386 2006-11-20 15:44:38.000000000 +0100 +++ new/hwinfo-13.17/src/ids/src/x11.i386 2006-11-24 14:51:29.000000000 +0100 @@ -5,7 +5,7 @@ &device.id pci 0x3150 +device.name Radeon Mobility X600 (M24) 3150 (PCIE) +driver.xfree 4|radeon -+driver.xfree 4|fglrx|3d||dri ++driver.xfree 4|radeon|3d||dri vendor.id pci 0x1002 &device.id pci 0x3152 @@ -513,7 +513,7 @@ &device.id pci 0x4e44 +device.name R300 ND +driver.xfree 4|radeon -+driver.xfree 4|fglrx|3d||dri ++driver.xfree 4|radeon|3d||dri vendor.id pci 0x1002 &device.id pci 0x4e44 @@ -537,7 +537,7 @@ &device.id pci 0x4e47 +device.name R300 NG +driver.xfree 4|radeon -+driver.xfree 4|fglrx|3d||dri ++driver.xfree 4|radeon|3d||dri vendor.id pci 0x1002 &device.id pci 0x4e47 @@ -777,7 +777,6 @@ &device.id pci 0x5148 +device.name fgl8x00 +driver.xfree 4|radeon -+driver.xfree 4|radeon|3d||dri vendor.id pci 0x1002 &device.id pci 0x5148 @@ -1162,7 +1161,7 @@ +device.name Mobility Radeon X700 5653 (M26) (PCIE) +driver.xfree 4|radeon +driver.xfree.config Option "MonitorLayout" "LVDS,AUTO" -+driver.xfree 4|fglrx|3d||dri ++driver.xfree 4|radeon|3d||dri vendor.id pci 0x1002 &device.id pci 0x5654 @@ -1279,7 +1278,7 @@ &device.id pci 0x5b60 +device.name Radeon X300 (RV370) 5B60 (PCIE) +driver.xfree 4|radeon -+driver.xfree 4|fglrx|3d||dri ++driver.xfree 4|radeon|3d||dri vendor.id pci 0x1002 &device.id pci 0x5b60 @@ -1304,7 +1303,7 @@ &device.id pci 0x5b64 +device.name FireGL V3100 (RV370) 5B64 (PCIE) +driver.xfree 4|radeon -+driver.xfree 4|fglrx|3d||dri ++driver.xfree 4|radeon|3d||dri vendor.id pci 0x1002 &device.id pci 0x5b65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de