- bnc#745880 - cpuid setting is not preserved across xend restarts
xend-cpuid.patch - Rename 2XXXX-vif-bridge.patch -> vif-bridge-tap-fix.patch - bnc#747331 - XEN: standard "newburn" kernel QA stress test on guest (+ smartd on Dom0?) freezes the guest 24883-x86-guest-walk-not-present.patch - bnc#745367 - MCE bank handling during migration 24781-x86-vmce-mcg_ctl.patch 24886-x86-vmce-mcg_ctl-default.patch 24887-x86-vmce-sr.patch - bnc#744771 - L3: VM with passed through PCI card fails to reboot under dom0 load 24888-pci-release-devices.patch - Upstream patches from Jan 24517-VT-d-fault-softirq.patch 24527-AMD-Vi-fault-softirq.patch 24535-x86-vMSI-misc.patch 24615-VESA-lfb-flush.patch 24690-x86-PCI-SERR-no-deadlock.patch 24701-gnttab-map-grant-ref-recovery.patch 24742-gnttab-misc.patch 24780-x86-paging-use-clear_guest.patch 24805-x86-MSI-X-dom0-ro.patch ioemu-9869-MSI-X-init.patch ioemu-9873-MSI-X-fix-unregister_iomem.patch - bnc#745005 - Update vif configuration examples in xmexample* Updated xen-xmexample.diff OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=172
This commit is contained in:
Charles Arnold
committed by
Git OBS Bridge
Git OBS Bridge
parent
c7e936769c
commit
7f6bd728fd
@@ -4,7 +4,7 @@ Index: xen-4.1.2-testing/tools/examples/xmexample1
|
||||
===================================================================
|
||||
--- xen-4.1.2-testing.orig/tools/examples/xmexample1
|
||||
+++ xen-4.1.2-testing/tools/examples/xmexample1
|
||||
@@ -7,11 +7,13 @@
|
||||
@@ -7,11 +7,17 @@
|
||||
#============================================================================
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
@@ -17,13 +17,31 @@ Index: xen-4.1.2-testing/tools/examples/xmexample1
|
||||
+kernel = "/boot/vmlinuz-xen"
|
||||
+ramdisk = "/boot/initrd-xen"
|
||||
+
|
||||
+# Or use domUloader instead of kernel/ramdisk to get kernel from domU FS
|
||||
+# Or use a bootloader instead of kernel/ramdisk to get the kernel from domU FS
|
||||
+# domUloader bootloader example:
|
||||
+#bootloader = "/usr/lib/xen/boot/domUloader.py"
|
||||
+#bootentry = "hda2:/vmlinuz-xen,/initrd-xen"
|
||||
+# pygrub bootloader example:
|
||||
+#bootloader="/usr/bin/pygrub"
|
||||
+#bootargs=""
|
||||
|
||||
# The domain build function. Default is 'linux'.
|
||||
#builder='linux'
|
||||
@@ -131,7 +133,7 @@ disk = [ 'phy:hda1,hda1,w' ]
|
||||
@@ -49,11 +55,11 @@ name = "ExampleDomain"
|
||||
#
|
||||
# or optionally override backend, bridge, ip, mac, script, type, or vifname:
|
||||
#
|
||||
-# vif = [ 'mac=00:16:3e:00:00:11, bridge=xenbr0' ]
|
||||
+# vif = [ 'mac=00:16:3e:00:00:11, bridge=br0' ]
|
||||
#
|
||||
# or more than one interface may be configured:
|
||||
#
|
||||
-# vif = [ '', 'bridge=xenbr1' ]
|
||||
+# vif = [ '', 'bridge=br1' ]
|
||||
|
||||
vif = [ '' ]
|
||||
|
||||
@@ -131,7 +137,7 @@ disk = [ 'phy:hda1,hda1,w' ]
|
||||
#hostname= "vm%d" % vmid
|
||||
|
||||
# Set root device.
|
||||
@@ -32,7 +50,7 @@ Index: xen-4.1.2-testing/tools/examples/xmexample1
|
||||
|
||||
# Root device for nfs.
|
||||
#root = "/dev/nfs"
|
||||
@@ -140,8 +142,8 @@ root = "/dev/hda1 ro"
|
||||
@@ -140,8 +146,8 @@ root = "/dev/hda1 ro"
|
||||
# Root directory on the nfs server.
|
||||
#nfs_root = '/full/path/to/root/directory'
|
||||
|
||||
@@ -47,7 +65,7 @@ Index: xen-4.1.2-testing/tools/examples/xmexample2
|
||||
===================================================================
|
||||
--- xen-4.1.2-testing.orig/tools/examples/xmexample2
|
||||
+++ xen-4.1.2-testing/tools/examples/xmexample2
|
||||
@@ -35,11 +35,13 @@ xm_vars.var('vmid',
|
||||
@@ -35,11 +35,17 @@ xm_vars.var('vmid',
|
||||
xm_vars.check()
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
@@ -60,13 +78,31 @@ Index: xen-4.1.2-testing/tools/examples/xmexample2
|
||||
+kernel = "/boot/vmlinuz-xen"
|
||||
+ramdisk = "/boot/initrd-xen"
|
||||
+
|
||||
+# Or use domUloader instead of kernel/ramdisk to get kernel from domU FS
|
||||
+# Or use a bootloader instead of kernel/ramdisk to get the kernel from domU FS
|
||||
+# domUloader bootloader example:
|
||||
+#bootloader = "/usr/lib/xen/boot/domUloader.py"
|
||||
+#bootentry = "hda2:/vmlinuz-xen,/initrd-xen"
|
||||
+# pygrub bootloader example:
|
||||
+#bootloader="/usr/bin/pygrub"
|
||||
+#bootargs=""
|
||||
|
||||
# The domain build function. Default is 'linux'.
|
||||
#builder='linux'
|
||||
@@ -167,7 +169,7 @@ disk = [ 'phy:sda%d,sda1,w' % (7+vmid),
|
||||
@@ -80,11 +86,11 @@ vcpus = 4 # make your domain a 4-way
|
||||
#
|
||||
# or optionally override backend, bridge, ip, mac, script, type, or vifname:
|
||||
#
|
||||
-# vif = [ 'mac=00:16:3e:00:00:11, bridge=xenbr0' ]
|
||||
+# vif = [ 'mac=00:16:3e:00:00:11, bridge=br0' ]
|
||||
#
|
||||
# or more than one interface may be configured:
|
||||
#
|
||||
-# vif = [ '', 'bridge=xenbr1' ]
|
||||
+# vif = [ '', 'bridge=br1' ]
|
||||
|
||||
vif = [ '' ]
|
||||
|
||||
@@ -167,7 +173,7 @@ disk = [ 'phy:sda%d,sda1,w' % (7+vmid),
|
||||
#hostname= "vm%d" % vmid
|
||||
|
||||
# Set root device.
|
||||
@@ -75,7 +111,7 @@ Index: xen-4.1.2-testing/tools/examples/xmexample2
|
||||
|
||||
# Root device for nfs.
|
||||
#root = "/dev/nfs"
|
||||
@@ -176,8 +178,8 @@ root = "/dev/sda1 ro"
|
||||
@@ -176,8 +182,8 @@ root = "/dev/sda1 ro"
|
||||
# Root directory on the nfs server.
|
||||
#nfs_root = '/full/path/to/root/directory'
|
||||
|
||||
@@ -90,7 +126,7 @@ Index: xen-4.1.2-testing/tools/examples/xmexample3
|
||||
===================================================================
|
||||
--- xen-4.1.2-testing.orig/tools/examples/xmexample3
|
||||
+++ xen-4.1.2-testing/tools/examples/xmexample3
|
||||
@@ -35,11 +35,13 @@ xm_vars.var('vmid',
|
||||
@@ -35,11 +35,17 @@ xm_vars.var('vmid',
|
||||
xm_vars.check()
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
@@ -102,9 +138,13 @@ Index: xen-4.1.2-testing/tools/examples/xmexample3
|
||||
|
||||
-# Optional ramdisk.
|
||||
-#ramdisk = "/boot/initrd.gz"
|
||||
+# Or use domUloader instead of kernel/ramdisk to get kernel from domU FS
|
||||
+# Or use a bootloader instead of kernel/ramdisk to get the kernel from domU FS
|
||||
+# domUloader bootloader example:
|
||||
+#bootloader = "/usr/lib/xen/boot/domUloader.py"
|
||||
+#bootentry = "hda2:/vmlinuz-xen,/initrd-xen"
|
||||
+# pygrub bootloader example:
|
||||
+#bootloader="/usr/bin/pygrub"
|
||||
+#bootargs=""
|
||||
|
||||
# The domain build function. Default is 'linux'.
|
||||
#builder='linux'
|
||||
@@ -112,7 +152,39 @@ Index: xen-4.1.2-testing/tools/examples/xmexample.hvm
|
||||
===================================================================
|
||||
--- xen-4.1.2-testing.orig/tools/examples/xmexample.hvm
|
||||
+++ xen-4.1.2-testing/tools/examples/xmexample.hvm
|
||||
@@ -78,7 +78,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ]
|
||||
@@ -64,11 +64,26 @@ name = "ExampleHVMDomain"
|
||||
#cpus = "0-3,5,^1" # all vcpus run on cpus 0,2,3,5
|
||||
#cpus = ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3
|
||||
|
||||
-# Optionally define mac and/or bridge for the network interfaces.
|
||||
-# Random MACs are assigned if not given.
|
||||
-#vif = [ 'type=ioemu, mac=00:16:3e:00:00:11, bridge=xenbr0, model=ne2k_pci' ]
|
||||
-# type=ioemu specify the NIC is an ioemu device not netfront
|
||||
-vif = [ 'type=ioemu, bridge=xenbr0' ]
|
||||
+#----------------------------------------------------------------------------
|
||||
+# Define network interfaces.
|
||||
+
|
||||
+# By default, no network interfaces are configured. You may have one created
|
||||
+# with sensible defaults using an empty vif clause:
|
||||
+#
|
||||
+# vif = [ '' ]
|
||||
+#
|
||||
+# or optionally override backend, bridge, ip, mac, script, type, model,
|
||||
+# or vifname.
|
||||
+#
|
||||
+# An emulated RealTek 8139 network interface can be configured with:
|
||||
+#
|
||||
+# vif = [ 'mac=00:16:3e:00:00:11, type=ioemu, model=rtl8139, bridge=br0' ]
|
||||
+#
|
||||
+# A para-virtual network interface can be configured with:
|
||||
+#
|
||||
+# vif = [ 'mac=00:16:3e:00:00:11, type=netfront, bridge=br0' ]
|
||||
+#
|
||||
+vif = [ '' ]
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Define the disk devices you want the domain to have access to, and
|
||||
@@ -78,7 +93,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ]
|
||||
# and MODE is r for read-only, w for read-write.
|
||||
|
||||
#disk = [ 'phy:hda1,hda1,r' ]
|
||||
@@ -175,3 +247,93 @@ Index: xen-4.1.2-testing/docs/man/xm.pod.1
|
||||
name=ramdisk vif='' vcpus=1 \
|
||||
memory=64 root=/dev/ram0
|
||||
|
||||
Index: xen-4.1.2-testing/tools/examples/xmexample.hvm-stubdom
|
||||
===================================================================
|
||||
--- xen-4.1.2-testing.orig/tools/examples/xmexample.hvm-stubdom
|
||||
+++ xen-4.1.2-testing/tools/examples/xmexample.hvm-stubdom
|
||||
@@ -55,11 +55,26 @@ name = "xmexample.hvm"
|
||||
#cpus = "0-3,5,^1" # all vcpus run on cpus 0,2,3,5
|
||||
#cpus = ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3
|
||||
|
||||
-# Optionally define mac and/or bridge for the network interfaces.
|
||||
-# Random MACs are assigned if not given.
|
||||
-#vif = [ 'type=ioemu, mac=00:16:3e:00:00:11, bridge=xenbr0, model=ne2k_pci' ]
|
||||
-# type=ioemu specify the NIC is an ioemu device not netfront
|
||||
-vif = [ 'type=ioemu, bridge=xenbr0' ]
|
||||
+#----------------------------------------------------------------------------
|
||||
+# Define network interfaces.
|
||||
+
|
||||
+# By default, no network interfaces are configured. You may have one created
|
||||
+# with sensible defaults using an empty vif clause:
|
||||
+#
|
||||
+# vif = [ '' ]
|
||||
+#
|
||||
+# or optionally override backend, bridge, ip, mac, script, type, model,
|
||||
+# or vifname.
|
||||
+#
|
||||
+# An emulated RealTek 8139 network interface can be configured with:
|
||||
+#
|
||||
+# vif = [ 'mac=00:16:3e:00:00:11, type=ioemu, model=rtl8139, bridge=br0' ]
|
||||
+#
|
||||
+# A para-virtual network interface can be configured with:
|
||||
+#
|
||||
+# vif = [ 'mac=00:16:3e:00:00:11, type=netfront, bridge=br0' ]
|
||||
+#
|
||||
+vif = [ '' ]
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Define the disk devices you want the domain to have access to, and
|
||||
Index: xen-4.1.2-testing/tools/examples/xmexample.pv-grub
|
||||
===================================================================
|
||||
--- xen-4.1.2-testing.orig/tools/examples/xmexample.pv-grub
|
||||
+++ xen-4.1.2-testing/tools/examples/xmexample.pv-grub
|
||||
@@ -53,11 +53,11 @@ name = "ExampleDomain"
|
||||
#
|
||||
# or optionally override backend, bridge, ip, mac, script, type, or vifname:
|
||||
#
|
||||
-# vif = [ 'mac=00:16:3e:00:00:11, bridge=xenbr0' ]
|
||||
+# vif = [ 'mac=00:16:3e:00:00:11, bridge=br0' ]
|
||||
#
|
||||
# or more than one interface may be configured:
|
||||
#
|
||||
-# vif = [ '', 'bridge=xenbr1' ]
|
||||
+# vif = [ '', 'bridge=br1' ]
|
||||
|
||||
vif = [ '' ]
|
||||
|
||||
Index: xen-4.1.2-testing/tools/examples/xmexample.vti
|
||||
===================================================================
|
||||
--- xen-4.1.2-testing.orig/tools/examples/xmexample.vti
|
||||
+++ xen-4.1.2-testing/tools/examples/xmexample.vti
|
||||
@@ -40,11 +40,26 @@ name = "ExampleVTIDomain"
|
||||
# In Windows OS, smaller size shows better performance.
|
||||
#vhpt = 23
|
||||
|
||||
-# Optionally define mac and/or bridge for the network interfaces.
|
||||
-# Random MACs are assigned if not given.
|
||||
-#vif = [ 'type=ioemu, mac=00:16:3e:00:00:11, bridge=xenbr0, model=ne2k_pci' ]
|
||||
-# type=ioemu specify the NIC is an ioemu device not netfront
|
||||
-vif = [ 'type=ioemu, bridge=xenbr0' ]
|
||||
+#----------------------------------------------------------------------------
|
||||
+# Define network interfaces.
|
||||
+
|
||||
+# By default, no network interfaces are configured. You may have one created
|
||||
+# with sensible defaults using an empty vif clause:
|
||||
+#
|
||||
+# vif = [ '' ]
|
||||
+#
|
||||
+# or optionally override backend, bridge, ip, mac, script, type, model,
|
||||
+# or vifname.
|
||||
+#
|
||||
+# An emulated RealTek 8139 network interface can be configured with:
|
||||
+#
|
||||
+# vif = [ 'mac=00:16:3e:00:00:11, type=ioemu, model=rtl8139, bridge=br0' ]
|
||||
+#
|
||||
+# A para-virtual network interface can be configured with:
|
||||
+#
|
||||
+# vif = [ 'mac=00:16:3e:00:00:11, type=netfront, bridge=br0' ]
|
||||
+#
|
||||
+vif = [ '' ]
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Define the disk devices you want the domain to have access to, and
|
||||
|
||||
Reference in New Issue
Block a user