diff options
| author | tnn <tnn> | 2010-10-30 20:06:52 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2010-10-30 20:06:52 +0000 |
| commit | 1476aa5c909475a9950be866d7f84ed73c6f06be (patch) | |
| tree | d59783e2d3828e6f8c0e15abeae9a3c90702a119 /sysutils/xentools33 | |
| parent | bc83178a98260a6674f25a51cf96663afe318bfe (diff) | |
| download | pkgsrc-1476aa5c909475a9950be866d7f84ed73c6f06be.tar.gz | |
Add patch from emulators/qemu to let NetBSD hvm guest use emulated wm(4) NIC.
Diffstat (limited to 'sysutils/xentools33')
| -rw-r--r-- | sysutils/xentools33/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/xentools33/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/xentools33/patches/patch-ak | 34 |
3 files changed, 38 insertions, 3 deletions
diff --git a/sysutils/xentools33/Makefile b/sysutils/xentools33/Makefile index 7bbabcf1a9a..eceee099472 100644 --- a/sysutils/xentools33/Makefile +++ b/sysutils/xentools33/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.21 2010/05/05 06:12:35 cegger Exp $ +# $NetBSD: Makefile,v 1.22 2010/10/30 20:06:52 tnn Exp $ # VERSION= 3.3.2 DISTNAME= xen-${VERSION} PKGNAME= xentools33-${VERSION} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= sysutils MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ EXTRACT_SUFX= .tar.gz diff --git a/sysutils/xentools33/distinfo b/sysutils/xentools33/distinfo index 3411918b41c..908cb6969d0 100644 --- a/sysutils/xentools33/distinfo +++ b/sysutils/xentools33/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2010/05/05 06:12:35 cegger Exp $ +$NetBSD: distinfo,v 1.21 2010/10/30 20:06:52 tnn Exp $ SHA1 (xen-3.3.2.tar.gz) = 7f438e73ac81b25cf5e1570709e87001066bafe4 RMD160 (xen-3.3.2.tar.gz) = 28faa56286f2a418e35dcba6079570ea871d6c7b @@ -13,6 +13,7 @@ SHA1 (patch-ag) = 6b6c26c5fbb28b9cc37e76b250cc90fed111e78a SHA1 (patch-ah) = cc8d95c73d7f4a08f311e8417d26f53ffd010549 SHA1 (patch-ai) = 0906a5ec3a7450fc987b01289e2560e60966d00d SHA1 (patch-aj) = 64c87cd4d1d22af745043bc66b4fbab884920278 +SHA1 (patch-ak) = 17deee0790c25513efe15656389905658a9adaa5 SHA1 (patch-ba) = e1ac8768dd1676262309b422799adde7f151b3e2 SHA1 (patch-bb) = dacb9f95908c07c066d5a7c3ceff8a3c10537d27 SHA1 (patch-bc) = ea31de81114f52dd9d06f2510c1555d641570784 diff --git a/sysutils/xentools33/patches/patch-ak b/sysutils/xentools33/patches/patch-ak new file mode 100644 index 00000000000..e30d5925a42 --- /dev/null +++ b/sysutils/xentools33/patches/patch-ak @@ -0,0 +1,34 @@ +$NetBSD: patch-ak,v 1.1 2010/10/30 20:06:52 tnn Exp $ + +From emulators/qemu/patches/patch-ee. + +qemu-0.13.x will include this fix: +http://git.qemu.org/qemu.git/commit/?id=9651ac55e5de0e1534d898316cc851af6ffc4334 + +--- ioemu/hw/e1000.c.orig 2009-08-06 12:56:34.000000000 +0000 ++++ ioemu/hw/e1000.c +@@ -244,16 +244,20 @@ set_eecd(E1000State *s, int index, uint3 + + s->eecd_state.old_eecd = val & (E1000_EECD_SK | E1000_EECD_CS | + E1000_EECD_DI|E1000_EECD_FWE_MASK|E1000_EECD_REQ); ++ if (!(E1000_EECD_CS & val)) // CS inactive; nothing to do ++ return; ++ if (E1000_EECD_CS & (val ^ oldval)) { // CS rise edge; reset state ++ s->eecd_state.val_in = 0; ++ s->eecd_state.bitnum_in = 0; ++ s->eecd_state.bitnum_out = 0; ++ s->eecd_state.reading = 0; ++ } + if (!(E1000_EECD_SK & (val ^ oldval))) // no clock edge + return; + if (!(E1000_EECD_SK & val)) { // falling edge + s->eecd_state.bitnum_out++; + return; + } +- if (!(val & E1000_EECD_CS)) { // rising, no CS (EEPROM reset) +- memset(&s->eecd_state, 0, sizeof s->eecd_state); +- return; +- } + s->eecd_state.val_in <<= 1; + if (val & E1000_EECD_DI) + s->eecd_state.val_in |= 1; |