From: Ross Philipson Date: Thu, 8 Oct 2009 16:52:29 +0000 (-0400) Subject: Removed blktap hotplug script (already there), fixed extra whitespace. X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b2fb2c7a1ed7a4e86d1df66d89b5295d3eb274d4;p=xenclient%2Fxen-pq.git Removed blktap hotplug script (already there), fixed extra whitespace. Changes to be committed: modified: master/status modified: master/xen-unstable-netchannel2 --- diff --git a/master/status b/master/status index e69de29..c3402a2 100644 --- a/master/status +++ b/master/status @@ -0,0 +1,25 @@ +xen-unstable-netchannel2 +xen-unstable-19932-c0cb307d927f +check-open-pv-log-file +fix_compilation +power-management-enhancement +smbios +acpi-slic +oem-features +thermal-management +pt-load-vga-bios +init-vgabios-and-set-size +mfn-validity-check-before-shadow-remove +remove-fixed-host-bridge-check +mtrr-changes +video-memory-workaround +tools-hvm-info +default-iommu-inclusive-mapping +igd-cmd-reg-change-for-reboot +xblanker +ugly-hack-to-fix-sata +serial-card +boot-second-cd +b-m-arb-sync-with-native-linux +iommu-replace-panic-with-printk +hack-vbe-always-on diff --git a/master/xen-unstable-netchannel2 b/master/xen-unstable-netchannel2 index 39061dd..877bed6 100644 --- a/master/xen-unstable-netchannel2 +++ b/master/xen-unstable-netchannel2 @@ -14,105 +14,6 @@ index bdd1cc0..bc50e65 100644 XEN_SCRIPTS += block XEN_SCRIPTS += block-enbd block-nbd XEN_SCRIPTS += blktap -diff --git a/tools/hotplug/Linux/blktap b/tools/hotplug/Linux/blktap -new file mode 100644 -index 0000000..01a0f6c ---- /dev/null -+++ b/tools/hotplug/Linux/blktap -@@ -0,0 +1,93 @@ -+#!/bin/bash -+ -+# Copyright (c) 2005, XenSource Ltd. -+ -+dir=$(dirname "$0") -+. "$dir/xen-hotplug-common.sh" -+. "$dir/block-common.sh" -+ -+findCommand "$@" -+ -+## -+# check_blktap_sharing file mode -+# -+# Perform the sharing check for the given blktap and mode. -+# -+check_blktap_sharing() -+{ -+ local file="$1" -+ local mode="$2" -+ -+ local base_path="$XENBUS_BASE_PATH/$XENBUS_TYPE" -+ for dom in $(xenstore-list "$base_path") -+ do -+ for dev in $(xenstore-list "$base_path/$dom") -+ do -+ params=$(xenstore_read "$base_path/$dom/$dev/params" | cut -d: -f2) -+ if [ "$file" = "$params" ] -+ then -+ -+ if [ "$mode" = 'w' ] -+ then -+ if ! same_vm "$dom" -+ then -+ echo 'guest' -+ return -+ fi -+ else -+ local m=$(xenstore_read "$base_path/$dom/$dev/mode") -+ m=$(canonicalise_mode "$m") -+ -+ if [ "$m" = 'w' ] -+ then -+ if ! same_vm "$dom" -+ then -+ echo 'guest' -+ return -+ fi -+ fi -+ fi -+ fi -+ done -+ done -+ -+ echo 'ok' -+} -+ -+ -+t=$(xenstore_read_default "$XENBUS_PATH/type" 'MISSING') -+if [ -n "$t" ] -+then -+ p=$(xenstore_read "$XENBUS_PATH/params") -+ # if we have a ':', chew from head including : -+ if echo $p | grep -q \: -+ then -+ p=${p#*:} -+ fi -+fi -+# some versions of readlink cannot be passed a regular file -+if [ -L "$p" ]; then -+ file=$(readlink -f "$p") || fatal "$p link does not exist." -+else -+ file="$p" -+fi -+ -+if [ "$command" = 'add' ] -+then -+ [ -e "$file" ] || { fatal $file does not exist; } -+ -+ FRONTEND_ID=$(xenstore_read "$XENBUS_PATH/frontend-id") -+ FRONTEND_UUID=$(xenstore_read "/local/domain/$FRONTEND_ID/vm") -+ mode=$(xenstore_read "$XENBUS_PATH/mode") -+ mode=$(canonicalise_mode "$mode") -+ -+ if [ "$mode" != '!' ] -+ then -+ result=$(check_blktap_sharing "$file" "$mode") -+ [ "$result" = 'ok' ] || ebusy "$file already in use by other domain" -+ fi -+ -+ success -+fi -+ -+exit 0 diff --git a/tools/hotplug/Linux/vif2 b/tools/hotplug/Linux/vif2 new file mode 100644 index 0000000..247fa67 @@ -1288,7 +1189,7 @@ index 0000000..a098c13 + + if pdev: + back['pdev'] = pdev -+ ++ + return (devid, back, front) + + def getDeviceConfiguration(self, devid, transaction = None): @@ -1302,7 +1203,7 @@ index 0000000..a098c13 + return read_fn(frontpath + x) + def back_read(x): + return read_fn(backpath + x) -+ ++ + result = DevController.getDeviceConfiguration(self, devid, transaction) + + dev = self.convertToDeviceNumber(devid) @@ -1452,7 +1353,7 @@ index a460bc8..a1779f7 100644 + dom = params[0] + devs = server.xend.domain.getDeviceSxprs(dom, 'vif2') + map(PrettyPrint.prettyprint, devs) -+ ++ def xm_network_attach(args): arg_check(args, 'network-attach', 1, 11) @@ -1732,7 +1633,7 @@ index 5306354..40fc183 100644 +static int _set_status_v1(domid_t domid, + int readonly, + int mapflag, -+ grant_entry_header_t *shah, ++ grant_entry_header_t *shah, + struct active_grant_entry *act) +{ + int rc = GNTST_okay; @@ -1759,7 +1660,7 @@ index 5306354..40fc183 100644 + /* + * This loop attempts to set the access (reading/writing) flags + * in the grant table entry. It tries a cmpxchg on the field -+ * up to five times, and then fails under the assumption that ++ * up to five times, and then fails under the assumption that + * the guest is misbehaving. + */ + for ( ; ; ) @@ -1804,7 +1705,7 @@ index 5306354..40fc183 100644 +static int _set_status_v2(domid_t domid, + int readonly, + int mapflag, -+ grant_entry_header_t *shah, ++ grant_entry_header_t *shah, + struct active_grant_entry *act, + grant_status_t *status) +{ @@ -2878,7 +2779,7 @@ index 5306354..40fc183 100644 static unsigned int max_nr_active_grant_frames(void) { - return (((max_nr_grant_frames * (PAGE_SIZE / sizeof(grant_entry_t))) + -+ return (((max_nr_grant_frames * (PAGE_SIZE / sizeof(grant_entry_v1_t))) + ++ return (((max_nr_grant_frames * (PAGE_SIZE / sizeof(grant_entry_v1_t))) + ((PAGE_SIZE / sizeof(struct active_grant_entry))-1)) / (PAGE_SIZE / sizeof(struct active_grant_entry))); }