diff options
| -rw-r--r-- | doc/CHANGES-2009 | 4 | ||||
| -rw-r--r-- | sysutils/xenkernel33/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/xenkernel33/distinfo | 10 | ||||
| -rw-r--r-- | sysutils/xenkernel33/patches/patch-aa | 14 | ||||
| -rw-r--r-- | sysutils/xentools33/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/xentools33/PLIST | 4 | ||||
| -rw-r--r-- | sysutils/xentools33/distinfo | 15 | ||||
| -rw-r--r-- | sysutils/xentools33/patches/patch-af | 29 | ||||
| -rw-r--r-- | sysutils/xentools33/patches/patch-ce | 21 | ||||
| -rw-r--r-- | sysutils/xentools33/patches/patch-ga | 111 | ||||
| -rw-r--r-- | sysutils/xentools33/patches/patch-gc | 152 | ||||
| -rw-r--r-- | sysutils/xentools33/patches/patch-gd | 60 |
12 files changed, 61 insertions, 369 deletions
diff --git a/doc/CHANGES-2009 b/doc/CHANGES-2009 index 50425226b30..17c4993f8e4 100644 --- a/doc/CHANGES-2009 +++ b/doc/CHANGES-2009 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2009,v 1.219 2009/01/13 13:24:41 wiz Exp $ +$NetBSD: CHANGES-2009,v 1.220 2009/01/13 13:48:32 cegger Exp $ Changes to the packages collection and infrastructure in 2009: @@ -299,3 +299,5 @@ Changes to the packages collection and infrastructure in 2009: Updated mail/evolution-data-server to 2.24.3 [wiz 2009-01-13] Updated mail/evolution to 2.24.3 [wiz 2009-01-13] Updated mail/evolution-exchange to 2.24.3 [wiz 2009-01-13] + Updated sysutils/xenkernel33 to 3.3.1nb1 [cegger 2009-01-13] + Updated sysutils/xentools33 to 3.3.1nb3 [cegger 2009-01-13] diff --git a/sysutils/xenkernel33/Makefile b/sysutils/xenkernel33/Makefile index 4dc9cfe2118..f7cdb23d344 100644 --- a/sysutils/xenkernel33/Makefile +++ b/sysutils/xenkernel33/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2008/10/13 21:41:26 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2009/01/13 13:48:33 cegger Exp $ # -VERSION= 3.3.0 +VERSION= 3.3.1 DISTNAME= xen-${VERSION} PKGNAME= xenkernel33-${VERSION} PKGREVISION= 1 @@ -11,7 +11,7 @@ EXTRACT_SUFX= .tar.gz MAINTAINER= cegger@NetBSD.org HOMEPAGE= http://xen.org/ -COMMENT= Xen 3.3.0 Kernel +COMMENT= Xen 3.3.1 Kernel PKG_DESTDIR_SUPPORT= user-destdir diff --git a/sysutils/xenkernel33/distinfo b/sysutils/xenkernel33/distinfo index 158047b7a0d..c27fe68e6f6 100644 --- a/sysutils/xenkernel33/distinfo +++ b/sysutils/xenkernel33/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2008/10/14 11:31:54 joerg Exp $ +$NetBSD: distinfo,v 1.8 2009/01/13 13:48:33 cegger Exp $ -SHA1 (xen-3.3.0.tar.gz) = b6365864eeb5125e0f66a056c4c72816e1789358 -RMD160 (xen-3.3.0.tar.gz) = c98c08617e302ef4004d17cb0ba161d0ed7af59c -Size (xen-3.3.0.tar.gz) = 11338614 bytes -SHA1 (patch-aa) = 2f29787cff46fbfb76eaa27d430e828cb1b6e0d3 +SHA1 (xen-3.3.1.tar.gz) = fa63c80e04dfc1bb376d98c5a0a0b08f7912b3f9 +RMD160 (xen-3.3.1.tar.gz) = 31d3e801b4eec37715900c6247be403aaafdd5e1 +Size (xen-3.3.1.tar.gz) = 11329774 bytes +SHA1 (patch-aa) = 0d11c758ad0a0ca657bf2e0f89ca23ff67b76bb7 diff --git a/sysutils/xenkernel33/patches/patch-aa b/sysutils/xenkernel33/patches/patch-aa index d3efbaa4009..97bfa279df2 100644 --- a/sysutils/xenkernel33/patches/patch-aa +++ b/sysutils/xenkernel33/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2008/08/07 20:31:34 cegger Exp $ +$NetBSD: patch-aa,v 1.2 2009/01/13 13:48:33 cegger Exp $ ---- xen/include/asm-x86/page.h.orig 2008-08-01 10:54:54.000000000 +0200 +--- xen/include/asm-x86/page.h.orig 2009-01-05 11:27:00.000000000 +0000 +++ xen/include/asm-x86/page.h @@ -301,7 +301,7 @@ void setup_idle_pagetable(void); * WARNING: This will need to be disabled to run OSes that use the spare PTE * bits themselves (e.g., *BSD). */ --#ifndef NDEBUG -+#if 0 - #define _PAGE_GNTTAB _PAGE_AVAIL2 - #else - #define _PAGE_GNTTAB 0 +-#ifdef NDEBUG ++#if 1 + #undef _PAGE_GNTTAB + #endif + #ifndef _PAGE_GNTTAB diff --git a/sysutils/xentools33/Makefile b/sysutils/xentools33/Makefile index 468ba1c97e8..3f4727d90f5 100644 --- a/sysutils/xentools33/Makefile +++ b/sysutils/xentools33/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2008/10/27 14:02:06 cegger Exp $ +# $NetBSD: Makefile,v 1.12 2009/01/13 13:48:32 cegger Exp $ # -VERSION= 3.3.0 +VERSION= 3.3.1 DISTNAME= xen-${VERSION} PKGNAME= xentools33-${VERSION} PKGREVISION= 3 diff --git a/sysutils/xentools33/PLIST b/sysutils/xentools33/PLIST index 247406f7e0d..c3930e964fc 100644 --- a/sysutils/xentools33/PLIST +++ b/sysutils/xentools33/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2008/09/30 15:08:34 joerg Exp $ +@comment $NetBSD: PLIST,v 1.7 2009/01/13 13:48:32 cegger Exp $ bin/lsevtchn bin/pygrub bin/readnotes @@ -8,7 +8,6 @@ bin/xen-detect bin/xencons bin/xenconsole bin/xenctx -bin/xenperf bin/xenstore bin/xenstore-chmod bin/xenstore-control @@ -496,6 +495,7 @@ sbin/xenconsoled sbin/xend sbin/xenmon.py sbin/xenperf +sbin/xenpm sbin/xenstored sbin/xentop sbin/xentrace_setmask diff --git a/sysutils/xentools33/distinfo b/sysutils/xentools33/distinfo index 0dff3752d8c..89f1b419a52 100644 --- a/sysutils/xentools33/distinfo +++ b/sysutils/xentools33/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.14 2008/10/09 10:15:52 cegger Exp $ +$NetBSD: distinfo,v 1.15 2009/01/13 13:48:32 cegger Exp $ -SHA1 (xen-3.3.0.tar.gz) = b6365864eeb5125e0f66a056c4c72816e1789358 -RMD160 (xen-3.3.0.tar.gz) = c98c08617e302ef4004d17cb0ba161d0ed7af59c -Size (xen-3.3.0.tar.gz) = 11338614 bytes +SHA1 (xen-3.3.1.tar.gz) = fa63c80e04dfc1bb376d98c5a0a0b08f7912b3f9 +RMD160 (xen-3.3.1.tar.gz) = 31d3e801b4eec37715900c6247be403aaafdd5e1 +Size (xen-3.3.1.tar.gz) = 11329774 bytes SHA1 (patch-aa) = 74c3023e39baf488f8bae060e93f6175b32df61a SHA1 (patch-ab) = a6244d421dc995c9bcbc9959de422972f9d46b6d SHA1 (patch-ac) = 70af1b1a787b9dad9e41a2ffe14d595c6797b4d7 SHA1 (patch-ad) = 323e854e5872e770580068fa93a74bd0b1531025 SHA1 (patch-ae) = bb7116a71bf6637591b639511f055836a13d9887 -SHA1 (patch-af) = 5995f0f8ee9cf40c8ac43d02568d942430993b3e +SHA1 (patch-af) = c39bd79ebb409e6e0bfc45b9c048fbf77863d7a0 SHA1 (patch-ag) = 6b6c26c5fbb28b9cc37e76b250cc90fed111e78a SHA1 (patch-ah) = cc8d95c73d7f4a08f311e8417d26f53ffd010549 SHA1 (patch-ai) = 0906a5ec3a7450fc987b01289e2560e60966d00d @@ -28,7 +28,7 @@ SHA1 (patch-ca) = b62ec8f0db5e65d737d1aaf3bd44580f5969328b SHA1 (patch-cb) = 9b7834e367a1820f28c0c1053d3f351751a12283 SHA1 (patch-cc) = 598f7cda0e3137188f97605037b0b1c26ae8d0c0 SHA1 (patch-cd) = 5563a72e203e789a86f4166c71ddb3fcff5215c6 -SHA1 (patch-ce) = 379774429d79724dbcd69d7c246d68d974d5ba89 +SHA1 (patch-ce) = 24d71f68a93b59bd5c5441c257d34862e7302040 SHA1 (patch-cf) = 055af260b497cbfaa5732f05267526e9fb1d1536 SHA1 (patch-cg) = 1f6ec716a101256274b6fff47b825271403a1ee0 SHA1 (patch-da) = b775dc2ba49bd2d3e044f7393294e2194d8c6b60 @@ -49,6 +49,3 @@ SHA1 (patch-fb) = 22a07628566b43aa786c410927d29a283e8cf141 SHA1 (patch-fc) = 37c9b0897182de93a01f9620ef6346ef68157770 SHA1 (patch-fd) = cb4741bf33050d72cfbcd2eff4a8632d976de643 SHA1 (patch-fe) = 85d42672766fe8ce2dc7f745938722710c6ee5a3 -SHA1 (patch-ga) = c7a32f0feefd9b00993e64e406ad2914e6737fb6 -SHA1 (patch-gc) = 26a750ca14bcaa33b3f63c16104d2acfae764c96 -SHA1 (patch-gd) = 78e9bcba7dbd2dbd520c015947240b7e514abf8c diff --git a/sysutils/xentools33/patches/patch-af b/sysutils/xentools33/patches/patch-af index 162457cee14..5662953c8c9 100644 --- a/sysutils/xentools33/patches/patch-af +++ b/sysutils/xentools33/patches/patch-af @@ -1,9 +1,9 @@ -$NetBSD: patch-af,v 1.1.1.1 2008/08/07 20:26:58 cegger Exp $ +$NetBSD: patch-af,v 1.2 2009/01/13 13:48:33 cegger Exp $ ---- misc/Makefile.orig 2008-08-01 16:38:07.000000000 +0200 +--- misc/Makefile.orig 2009-01-05 11:26:59.000000000 +0000 +++ misc/Makefile -@@ -14,12 +14,14 @@ TARGETS-y := xenperf - TARGETS-$(CONFIG_X86) += xen-detect +@@ -14,17 +14,21 @@ TARGETS-y := xenperf + TARGETS-$(CONFIG_X86) += xen-detect xenpm TARGETS := $(TARGETS-y) -SUBDIRS-$(CONFIG_LOMOUNT) += lomount @@ -11,16 +11,23 @@ $NetBSD: patch-af,v 1.1.1.1 2008/08/07 20:26:58 cegger Exp $ SUBDIRS-$(CONFIG_MINITERM) += miniterm SUBDIRS := $(SUBDIRS-y) --INSTALL_BIN = $(TARGETS) xencons --INSTALL_SBIN = netfix xm xen-bugtool xen-python-path xend xenperf xsview -+INSTALL_BIN = $(TARGETS) -+INSTALL_BIN_SCRIPT = xencons -+INSTALL_SBIN = xenperf -+INSTALL_SBIN_SCRIPT = netfix xm xen-bugtool xen-python-path xend xsview +-INSTALL_BIN-y := xencons ++INSTALL_BIN-y := ++INSTALL_BIN_SCRIPT-y := xencons + INSTALL_BIN-$(CONFIG_X86) += xen-detect + INSTALL_BIN := $(INSTALL_BIN-y) ++INSTALL_BIN_SCRIPT := $(INSTALL_BIN_SCRIPT-y) + +-INSTALL_SBIN-y := netfix xm xen-bugtool xen-python-path xend xenperf xsview ++INSTALL_SBIN-y := xenperf ++INSTALL_SBIN_SCRIPT-y := netfix xm xen-bugtool xen-python-path xend xsview + INSTALL_SBIN-$(CONFIG_X86) += xenpm + INSTALL_SBIN := $(INSTALL_SBIN-y) ++INSTALL_SBIN_SCRIPT := $(INSTALL_SBIN_SCRIPT-y) DEFAULT_PYTHON_PATH := $(shell $(XEN_ROOT)/tools/python/get-path) PYTHON_PATH ?= $(DEFAULT_PYTHON_PATH) -@@ -35,10 +37,12 @@ build: $(TARGETS) +@@ -40,10 +44,12 @@ build: $(TARGETS) .PHONY: install install: build diff --git a/sysutils/xentools33/patches/patch-ce b/sysutils/xentools33/patches/patch-ce index 50e030ffc17..9e505df9304 100644 --- a/sysutils/xentools33/patches/patch-ce +++ b/sysutils/xentools33/patches/patch-ce @@ -1,9 +1,9 @@ -$NetBSD: patch-ce,v 1.1.1.1 2008/08/07 20:26:58 cegger Exp $ +$NetBSD: patch-ce,v 1.2 2009/01/13 13:48:33 cegger Exp $ ---- ../docs/man/xm.pod.1.orig 2008-08-01 16:38:07.000000000 +0200 +--- ../docs/man/xm.pod.1.orig 2009-01-05 11:26:58.000000000 +0000 +++ ../docs/man/xm.pod.1 -@@ -76,7 +76,7 @@ format, and possible options used in eit - I<name>=I<value> combinations. +@@ -75,7 +75,7 @@ in the config file. See L<xmdomain.cfg> + format, and possible options used in either the configfile or for I<vars>. I<configfile> can either be an absolute path to a file, or a relative -path to a file located in /etc/xen. @@ -11,7 +11,7 @@ $NetBSD: patch-ce,v 1.1.1.1 2008/08/07 20:26:58 cegger Exp $ Create will return B<as soon> as the domain is started. This B<does not> mean the guest OS in the domain has actually booted, or is -@@ -101,7 +101,7 @@ B<EXAMPLES> +@@ -156,7 +156,7 @@ B<EXAMPLES> xm create Fedora4 @@ -20,7 +20,16 @@ $NetBSD: patch-ce,v 1.1.1.1 2008/08/07 20:26:58 cegger Exp $ soon as it is run. =item I<without config file> -@@ -842,7 +842,7 @@ I<policy> is a dot-separated list of nam +@@ -388,7 +388,7 @@ file format, and possible options used i + I<vars>. + + I<configfile> can either be an absolute path to a file, or a relative +-path to a file located in /etc/xen. ++path to a file located in @XENDCONFDIR@. + + The new subcommand will return without starting the domain. The + domain needs to be started using the B<xm start> command. +@@ -1068,7 +1068,7 @@ I<policy> is a dot-separated list of nam name pre-fix for the policy XML file. The preceding name parts are translated into the local path pointing to the policy XML file relative to the global policy root directory diff --git a/sysutils/xentools33/patches/patch-ga b/sysutils/xentools33/patches/patch-ga deleted file mode 100644 index f56287c8730..00000000000 --- a/sysutils/xentools33/patches/patch-ga +++ /dev/null @@ -1,111 +0,0 @@ -$NetBSD: patch-ga,v 1.1 2008/10/08 19:13:41 cegger Exp $ - ---- python/xen/xend/XendDomainInfo.py.orig 2008-08-22 09:49:08.000000000 +0000 -+++ python/xen/xend/XendDomainInfo.py -@@ -455,8 +455,8 @@ class XendDomainInfo: - try: - self._constructDomain() - self._storeVmDetails() -- self._createDevices() - self._createChannels() -+ self._createDevices() - self._storeDomDetails() - self._endRestore() - except: -@@ -1232,31 +1232,6 @@ class XendDomainInfo: - def permissionsVm(self, *args): - return xstransact.SetPermissions(self.vmpath, *args) - -- -- def _readVmTxn(self, transaction, *args): -- paths = map(lambda x: self.vmpath + "/" + x, args) -- return transaction.read(*paths) -- -- def _writeVmTxn(self, transaction, *args): -- paths = map(lambda x: self.vmpath + "/" + x, args) -- return transaction.write(*paths) -- -- def _removeVmTxn(self, transaction, *args): -- paths = map(lambda x: self.vmpath + "/" + x, args) -- return transaction.remove(*paths) -- -- def _gatherVmTxn(self, transaction, *args): -- paths = map(lambda x: self.vmpath + "/" + x, args) -- return transaction.gather(paths) -- -- def storeVmTxn(self, transaction, *args): -- paths = map(lambda x: self.vmpath + "/" + x, args) -- return transaction.store(*paths) -- -- def permissionsVmTxn(self, transaction, *args): -- paths = map(lambda x: self.vmpath + "/" + x, args) -- return transaction.set_permissions(*paths) -- - # - # Function to update xenstore /dom/* - # -@@ -1304,8 +1279,11 @@ class XendDomainInfo: - def _recreateDomFunc(self, t): - t.remove() - t.mkdir() -- t.set_permissions({'dom' : self.domid}) -+ t.set_permissions({'dom' : self.domid, 'read' : True}) - t.write('vm', self.vmpath) -+ for i in [ 'device', 'control', 'error' ]: -+ t.mkdir(i) -+ t.set_permissions(i, {'dom' : self.domid}) - - def _storeDomDetails(self): - to_store = { -@@ -2390,11 +2368,11 @@ class XendDomainInfo: - - paths = self._prepare_phantom_paths() - -- self._cleanupVm() - if self.dompath is not None: - self.destroyDomain() - - self._cleanup_phantom_devs(paths) -+ self._cleanupVm() - - if "transient" in self.info["other_config"] \ - and bool(self.info["other_config"]["transient"]): -@@ -2731,7 +2709,6 @@ class XendDomainInfo: - self._writeVm(to_store) - self._setVmPermissions() - -- - def _setVmPermissions(self): - """Allow the guest domain to read its UUID. We don't allow it to - access any other entry, for security.""" -@@ -2750,7 +2727,7 @@ class XendDomainInfo: - log.warn("".join(traceback.format_stack())) - return self._stateGet() - else: -- raise AttributeError() -+ raise AttributeError(name) - - def __setattr__(self, name, value): - if name == "state": -@@ -2864,12 +2841,6 @@ class XendDomainInfo: - ignore_devices = ignore_store, - legacy_only = legacy_only) - -- #if not ignore_store and self.dompath: -- # vnc_port = self.readDom('console/vnc-port') -- # if vnc_port is not None: -- # result.append(['device', -- # ['console', ['vnc-port', str(vnc_port)]]]) -- - return result - - # Xen API -@@ -3135,7 +3106,7 @@ class XendDomainInfo: - if not config.has_key('device'): - devid = config.get('id') - if devid != None: -- config['device'] = 'eth%d' % devid -+ config['device'] = 'eth%s' % devid - else: - config['device'] = '' - diff --git a/sysutils/xentools33/patches/patch-gc b/sysutils/xentools33/patches/patch-gc deleted file mode 100644 index ffdda19b1a9..00000000000 --- a/sysutils/xentools33/patches/patch-gc +++ /dev/null @@ -1,152 +0,0 @@ -$NetBSD: patch-gc,v 1.1 2008/10/08 19:13:41 cegger Exp $ - ---- python/xen/xend/server/DevController.py.orig 2008-08-22 09:49:08.000000000 +0000 -+++ python/xen/xend/server/DevController.py -@@ -126,8 +126,11 @@ class DevController: - log.debug( - 'DevController: still waiting to write device entries.') - -+ devpath = self.devicePath(devid) -+ - t.remove(frontpath) - t.remove(backpath) -+ t.remove(devpath) - - t.mkdir(backpath) - t.set_permissions(backpath, -@@ -142,6 +145,14 @@ class DevController: - t.write2(frontpath, front) - t.write2(backpath, back) - -+ t.mkdir(devpath) -+ t.write2(devpath, { -+ 'backend' : backpath, -+ 'backend-id' : "%i" % backdom, -+ 'frontend' : frontpath, -+ 'frontend-id' : "%i" % self.vm.getDomid() -+ }) -+ - if t.commit(): - return devid - -@@ -254,11 +265,12 @@ class DevController: - - if force: - frontpath = self.frontendPath(dev) -- backpath = xstransact.Read(frontpath, "backend") -+ backpath = self.readVm(devid, "backend") - if backpath: - xstransact.Remove(backpath) - xstransact.Remove(frontpath) - -+ # xstransact.Remove(self.devicePath()) ?? Below is the same ? - self.vm._removeVm("device/%s/%d" % (self.deviceClass, dev)) - - def configurations(self, transaction = None): -@@ -302,9 +314,10 @@ class DevController: - @return: dict - """ - if transaction is None: -- backdomid = xstransact.Read(self.frontendPath(devid), "backend-id") -+ backdomid = xstransact.Read(self.devicePath(devid), "backend-id") - else: -- backdomid = transaction.read(self.frontendPath(devid) + "/backend-id") -+ backdomid = transaction.read(self.devicePath(devid) + "/backend-id") -+ - if backdomid is None: - raise VmError("Device %s not connected" % devid) - -@@ -446,17 +459,22 @@ class DevController: - else: - raise VmError("Device %s not connected" % devid) - -+ def readVm(self, devid, *args): -+ devpath = self.devicePath(devid) -+ if devpath: -+ return xstransact.Read(devpath, *args) -+ else: -+ raise VmError("Device config %s not found" % devid) -+ - def readBackend(self, devid, *args): -- frontpath = self.frontendPath(devid) -- backpath = xstransact.Read(frontpath, "backend") -+ backpath = self.readVm(devid, "backend") - if backpath: - return xstransact.Read(backpath, *args) - else: - raise VmError("Device %s not connected" % devid) - - def readBackendTxn(self, transaction, devid, *args): -- frontpath = self.frontendPath(devid) -- backpath = transaction.read(frontpath + "/backend") -+ backpath = self.readVm(devid, "backend") - if backpath: - paths = map(lambda x: backpath + "/" + x, args) - return transaction.read(*paths) -@@ -474,7 +492,7 @@ class DevController: - """@return The IDs of each of the devices currently configured for - this instance's deviceClass. - """ -- fe = self.backendRoot() -+ fe = self.deviceRoot() - - if transaction: - return map(lambda x: int(x.split('/')[-1]), transaction.list(fe)) -@@ -483,8 +501,7 @@ class DevController: - - - def writeBackend(self, devid, *args): -- frontpath = self.frontendPath(devid) -- backpath = xstransact.Read(frontpath, "backend") -+ backpath = self.readVm(devid, "backend") - - if backpath: - xstransact.Write(backpath, *args) -@@ -549,9 +566,8 @@ class DevController: - - - def waitForBackend(self, devid): -- - frontpath = self.frontendPath(devid) -- # lookup a phantom -+ # lookup a phantom - phantomPath = xstransact.Read(frontpath, 'phantom_vbd') - if phantomPath is not None: - log.debug("Waiting for %s's phantom %s.", devid, phantomPath) -@@ -564,7 +580,7 @@ class DevController: - if result['status'] != 'Connected': - return (result['status'], err) - -- backpath = xstransact.Read(frontpath, "backend") -+ backpath = self.readVm(devid, "backend") - - - if backpath: -@@ -629,17 +645,20 @@ class DevController: - def frontendRoot(self): - return "%s/device/%s" % (self.vm.getDomainPath(), self.deviceClass) - -- def backendRoot(self): -- """Construct backend root path assuming backend is domain 0.""" -- from xen.xend.XendDomain import DOM0_ID -- from xen.xend.xenstore.xsutil import GetDomainPath -- return "%s/backend/%s/%s" % (GetDomainPath(DOM0_ID), -- self.deviceClass, self.vm.getDomid()) -- - def frontendMiscPath(self): - return "%s/device-misc/%s" % (self.vm.getDomainPath(), - self.deviceClass) - -+ def deviceRoot(self): -+ """Return the /vm/device. Because backendRoot assumes the -+ backend domain is 0""" -+ return "%s/device/%s" % (self.vm.vmpath, self.deviceClass) -+ -+ def devicePath(self, devid): -+ """Return the /device entry of the given VM. We use it to store -+ backend/frontend locations""" -+ return "%s/device/%s/%s" % (self.vm.vmpath, -+ self.deviceClass, devid) - - def hotplugStatusCallback(statusPath, ev, result): - log.debug("hotplugStatusCallback %s.", statusPath) diff --git a/sysutils/xentools33/patches/patch-gd b/sysutils/xentools33/patches/patch-gd deleted file mode 100644 index 25196fcb94a..00000000000 --- a/sysutils/xentools33/patches/patch-gd +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-gd,v 1.1 2008/10/08 19:13:41 cegger Exp $ - ---- python/xen/xend/server/netif.py.orig 2008-08-22 09:49:08.000000000 +0000 -+++ python/xen/xend/server/netif.py -@@ -142,10 +142,6 @@ class NetifController(DevController): - if sec_lab: - back['security_label'] = sec_lab - -- config_path = "device/%s/%d/" % (self.deviceClass, devid) -- for x in back: -- self.vm._writeVm(config_path + x, back[x]) -- - back['handle'] = "%i" % devid - back['script'] = os.path.join(xoptions.network_script_dir, script) - if rate: -@@ -189,40 +185,14 @@ class NetifController(DevController): - - result = DevController.getDeviceConfiguration(self, devid, transaction) - -- config_path = "device/%s/%d/" % (self.deviceClass, devid) -- devinfo = () - for x in ( 'script', 'ip', 'bridge', 'mac', - 'type', 'vifname', 'rate', 'uuid', 'model', 'accel', - 'security_label'): - if transaction is None: -- y = self.vm._readVm(config_path + x) -+ y = self.readBackend(devid, x) - else: -- y = self.vm._readVmTxn(transaction, config_path + x) -- devinfo += (y,) -- (script, ip, bridge, mac, typ, vifname, rate, uuid, -- model, accel, security_label) = devinfo -- -- if script: -- result['script'] = script -- if ip: -- result['ip'] = ip -- if bridge: -- result['bridge'] = bridge -- if mac: -- result['mac'] = mac -- if typ: -- result['type'] = typ -- if vifname: -- result['vifname'] = vifname -- if rate: -- result['rate'] = rate -- if uuid: -- result['uuid'] = uuid -- if model: -- result['model'] = model -- if accel: -- result['accel'] = accel -- if security_label: -- result['security_label'] = security_label -+ y = self.readBackendTxn(transaction, devid, x) -+ if y: -+ result[x] = y - - return result |