Rebased to version 1.3.3.3

schema: don't validate paths (bz #1353296)
Rebased to version 1.3.3.2
2017-05-10 17:21:12 -04:00 · 2016-07-18 20:31:11 -04:00 · 2016-07-13 17:49:41 +01:00 · 2016-06-23 16:47:05 -04:00 · 2016-06-08 19:14:09 -04:00 · 2016-05-20 16:39:42 -04:00
7 changed files with 1933 additions and 1396 deletions
@@ -1,180 +0,0 @@
-From f3997733f0bca081d71848e66ca7d728b4c0a864 Mon Sep 17 00:00:00 2001
-From: Alon Levy <alevy@redhat.com>
-Date: Tue, 8 May 2012 20:42:44 +0300
-Subject: [PATCH] domain_conf: add "default" to list of valid spice channels
-
-qemu's behavior in this case is to change the spice server behavior to
-require secure connection to any channel not otherwise specified as
-being in plaintext mode. libvirt doesn't currently allow requesting this
-(via plaintext-channel=<channel name>).
-
-RHBZ: 819499
-
-Signed-off-by: Alon Levy <alevy@redhat.com>
-(cherry picked from commit ba97e4edc6aa439a4f1e70855cf4503181efdb7f)
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
- docs/formatdomain.html.in                          |    7 +++++++
- docs/schemas/domaincommon.rng                      |    9 +++++++++
- src/conf/domain_conf.c                             |   20 ++++++++++++++++++++
- src/conf/domain_conf.h                             |    1 +
- src/qemu/qemu_command.c                            |   13 +++++++++++++
- .../qemuxml2argv-graphics-spice.args               |    2 +-
- .../qemuxml2argv-graphics-spice.xml                |    2 +-
- 7 files changed, 52 insertions(+), 2 deletions(-)
-
-diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
-index e33913f..4a70b0f 100644
--- a/docs/formatdomain.html.in
-+++ b/docs/formatdomain.html.in
-@@ -2913,6 +2913,13 @@ qemu-kvm -net nic,model=? /dev/null
-               <span class="since">Since 0.9.3</span>
-               NB, this may not be supported by all hypervisors.
-               <span class="since">"spice" since 0.8.6</span>.
-+              The <code>defaultMode</code> attribute sets the default channel
-+              security policy, valid values are <code>secure</code>,
-+              <code>insecure</code> and the default <code>any</code>
-+              (which is secure if possible, but falls back to insecure
-+              rather than erroring out if no secure path is
-+              available). <span class="since">"defaultMode" since
-+              0.9.12</span>.
-             </p>
-             <p>
-               When SPICE has both a normal and TLS secured TCP port
-diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
-index 5bcf1b9..30ab4c6 100644
--- a/docs/schemas/domaincommon.rng
-+++ b/docs/schemas/domaincommon.rng
-@@ -1779,6 +1779,15 @@
-               </choice>
-             </attribute>
-           </optional>
-+          <optional>
-+            <attribute name="defaultMode">
-+              <choice>
-+                <value>any</value>
-+                <value>secure</value>
-+                <value>insecure</value>
-+              </choice>
-+            </attribute>
-+          </optional>
-           <interleave>
-             <ref name="listenElements"/>
-             <zeroOrMore>
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index d017ea4..2b21b11 100644
--- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -6069,6 +6069,8 @@ virDomainGraphicsDefParseXML(xmlNodePtr node,
-         char *port = virXMLPropString(node, "port");
-         char *tlsPort;
-         char *autoport;
-+        char *defaultMode;
-+        int defaultModeVal;
- 
-         if (port) {
-             if (virStrToLong_i(port, NULL, 10, &def->data.spice.port) < 0) {
-@@ -6101,6 +6103,20 @@ virDomainGraphicsDefParseXML(xmlNodePtr node,
-             VIR_FREE(autoport);
-         }
- 
-+        def->data.spice.defaultMode = VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY;
-+
-+        if ((defaultMode = virXMLPropString(node, "defaultMode")) != NULL) {
-+            if ((defaultModeVal = virDomainGraphicsSpiceChannelModeTypeFromString(defaultMode)) < 0) {
-+                virDomainReportError(VIR_ERR_INTERNAL_ERROR,
-+                                     _("unknown default spice channel mode %s"),
-+                                     defaultMode);
-+                VIR_FREE(defaultMode);
-+                goto error;
-+            }
-+            def->data.spice.defaultMode = defaultModeVal;
-+            VIR_FREE(defaultMode);
-+        }
-+
-         if (def->data.spice.port == -1 && def->data.spice.tlsPort == -1) {
-             /* Legacy compat syntax, used -1 for auto-port */
-             def->data.spice.autoport = 1;
-@@ -12111,6 +12127,10 @@ virDomainGraphicsDefFormat(virBufferPtr buf,
-             virBufferEscapeString(buf, " keymap='%s'",
-                                   def->data.spice.keymap);
- 
-+        if (def->data.spice.defaultMode != VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY)
-+            virBufferAsprintf(buf, " defaultMode='%s'",
-+              virDomainGraphicsSpiceChannelModeTypeToString(def->data.spice.defaultMode));
-+
-         virDomainGraphicsAuthDefFormatAttr(buf, &def->data.spice.auth, flags);
-         break;
- 
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index a2fea00..62eaafb 100644
--- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -1233,6 +1233,7 @@ struct _virDomainGraphicsDef {
-             virDomainGraphicsAuthDef auth;
-             unsigned int autoport :1;
-             int channels[VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST];
-+            int defaultMode; /* enum virDomainGraphicsSpiceChannelMode */
-             int image;
-             int jpeg;
-             int zlib;
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 55e772f..f411712 100644
--- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -5499,6 +5499,7 @@ qemuBuildCommandLine(virConnectPtr conn,
-         const char *listenAddr = NULL;
-         char *netAddr = NULL;
-         int ret;
-+        int defaultMode = def->graphics[0]->data.spice.defaultMode;
- 
-         if (!qemuCapsGet(qemuCaps, QEMU_CAPS_SPICE)) {
-             qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-@@ -5582,6 +5583,18 @@ qemuBuildCommandLine(virConnectPtr conn,
-             virBufferAsprintf(&opt, ",x509-dir=%s",
-                               driver->spiceTLSx509certdir);
- 
-+        switch (defaultMode) {
-+        case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE:
-+            virBufferAsprintf(&opt, ",tls-channel=default");
-+            break;
-+        case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_INSECURE:
-+            virBufferAsprintf(&opt, ",plaintext-channel=default");
-+            break;
-+        case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY:
-+            /* nothing */
-+            break;
-+        }
-+
-         for (i = 0 ; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST ; i++) {
-             int mode = def->graphics[0]->data.spice.channels[i];
-             switch (mode) {
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args
-index c9fdb99..698e39c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args
-@@ -2,7 +2,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefaults -monitor \
- unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
- /dev/HostVG/QEMUGuest1 -spice port=5903,tls-port=5904,addr=127.0.0.1,\
-x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,\
-+x509-dir=/etc/pki/libvirt-spice,tls-channel=default,tls-channel=main,plaintext-channel=inputs,\
- image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,\
- playback-compression=on,streaming-video=filter,disable-copy-paste -vga \
- qxl -global qxl.vram_size=18874368 -device qxl,id=video1,vram_size=33554432,bus=pci.0,addr=0x4 \
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml
-index 8930b60..a3789f2 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml
-@@ -22,7 +22,7 @@
-     <controller type='usb' index='0'/>
-     <controller type='ide' index='0'/>
-     <input type='mouse' bus='ps2'/>
-    <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1'>
-+    <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1' defaultMode='secure'>
-       <listen type='address' address='127.0.0.1'/>
-       <channel name='main' mode='secure'/>
-       <channel name='inputs' mode='insecure'/>
-- 
-1.7.7.6
-
@@ -1,182 +0,0 @@
-From 3c3816ed226e766aa76624de7d159cdd1ee67913 Mon Sep 17 00:00:00 2001
-From: Alon Levy <alevy@redhat.com>
-Date: Tue, 8 May 2012 16:00:28 +0300
-Subject: [PATCH] domain_conf: add "usbredir" to list of valid spice channels
-
-Add "usbredir" channel to list of recognized spice channels.
-
-RHBZ: 819498
-
-Signed-off-by: Alon Levy <alevy@redhat.com>
-(cherry picked from commit 4e78ffb63489071c4100678ed88d3111284555e8)
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
- docs/formatdomain.html.in                          |    8 ++-
- docs/schemas/domaincommon.rng                      |    1 +
- src/conf/domain_conf.c                             |    3 +-
- src/conf/domain_conf.h                             |    1 +
- .../qemuxml2argv-graphics-spice-usb-redir.args     |   16 ++++++
- .../qemuxml2argv-graphics-spice-usb-redir.xml      |   53 ++++++++++++++++++++
- tests/qemuxml2argvtest.c                           |    6 ++
- 7 files changed, 84 insertions(+), 4 deletions(-)
- create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args
- create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.xml
-
-diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
-index 801e1ec..e33913f 100644
--- a/docs/formatdomain.html.in
-+++ b/docs/formatdomain.html.in
-@@ -2922,9 +2922,11 @@ qemu-kvm -net nic,model=? /dev/null
-               main &lt;graphics&gt; element. Valid channel names
-               include <code>main</code>, <code>display</code>,
-               <code>inputs</code>, <code>cursor</code>,
-              <code>playback</code>, <code>record</code>;
-              and <span class="since">since
-              0.8.8</span>: <code>smartcard</code>.
-+              <code>playback</code>, <code>record</code>
-+              (all <span class="since"> since 0.8.6</span>);
-+              <code>smartcard</code> (<span class="since">since
-+              0.8.8</span>); and <code>usbredir</code>
-+              (<span class="since">since 0.9.12</span>).
-             </p>
-             <pre>
-   &lt;graphics type='spice' port='-1' tlsPort='-1' autoport='yes'&gt;
-diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
-index 0cc04af..5bcf1b9 100644
--- a/docs/schemas/domaincommon.rng
-+++ b/docs/schemas/domaincommon.rng
-@@ -1792,6 +1792,7 @@
-                     <value>playback</value>
-                     <value>record</value>
-                     <value>smartcard</value>
-+                    <value>usbredir</value>
-                   </choice>
-                 </attribute>
-                 <attribute name="mode">
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index d886b60..d017ea4 100644
--- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -428,7 +428,8 @@ VIR_ENUM_IMPL(virDomainGraphicsSpiceChannelName,
-               "cursor",
-               "playback",
-               "record",
-              "smartcard");
-+              "smartcard",
-+              "usbredir");
- 
- VIR_ENUM_IMPL(virDomainGraphicsSpiceChannelMode,
-               VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_LAST,
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 1b8741e..a2fea00 100644
--- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -1097,6 +1097,7 @@ enum virDomainGraphicsSpiceChannelName {
-     VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_PLAYBACK,
-     VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_RECORD,
-     VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_SMARTCARD,
-+    VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_USBREDIR,
- 
-     VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST
- };
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args
-new file mode 100644
-index 0000000..35e51a7
--- /dev/null
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args
-@@ -0,0 +1,16 @@
-+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice /usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \
-+-device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x4.0x7 \
-+-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
-+-device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
-+-device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
-+-spice port=5903,tls-port=5904,addr=127.0.0.1,\
-+x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,\
-+tls-channel=usbredir,\
-+image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,\
-+playback-compression=on,streaming-video=filter,disable-copy-paste \
-+-vga cirrus \
-+-chardev socket,id=charredir0,host=localhost,port=4000 \
-+-device usb-redir,chardev=charredir0,id=redir0 \
-+-chardev spicevmc,id=charredir1,name=usbredir \
-+-device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=4 \
-+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.xml
-new file mode 100644
-index 0000000..1dc23bd
--- /dev/null
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.xml
-@@ -0,0 +1,53 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory unit='KiB'>219136</memory>
-+  <currentMemory unit='KiB'>219136</currentMemory>
-+  <vcpu>1</vcpu>
-+  <os>
-+    <type arch='i686' machine='pc'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu</emulator>
-+    <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1'>
-+      <listen type='address' address='127.0.0.1'/>
-+      <channel name='main' mode='secure'/>
-+      <channel name='inputs' mode='insecure'/>
-+      <channel name='usbredir' mode='secure'/>
-+      <image compression='auto_glz'/>
-+      <jpeg compression='auto'/>
-+      <zlib compression='auto'/>
-+      <playback compression='on'/>
-+      <streaming mode='filter'/>
-+      <clipboard copypaste='no'/>
-+    </graphics>
-+    <controller type='usb' index='0' model='ich9-ehci1'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x7'/>
-+    </controller>
-+    <controller type='usb' index='0' model='ich9-uhci1'>
-+      <master startport='0'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0' multifunction='on'/>
-+    </controller>
-+    <controller type='usb' index='0' model='ich9-uhci2'>
-+      <master startport='2'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x1'/>
-+    </controller>
-+    <controller type='usb' index='0' model='ich9-uhci3'>
-+      <master startport='4'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x2'/>
-+    </controller>
-+    <redirdev bus='usb' type='tcp'>
-+      <source mode='connect' host='localhost' service='4000'/>
-+      <protocol type='raw'/>
-+    </redirdev>
-+    <redirdev bus='usb' type='spicevmc'>
-+      <address type='usb' bus='0' port='4'/>
-+    </redirdev>
-+    <memballoon model='virtio'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index a32d4f8..b128c07 100644
--- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -540,6 +540,12 @@ mymain(void)
-             QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
-             QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
-             QEMU_CAPS_DEVICE_QXL_VGA);
-+    DO_TEST("graphics-spice-usb-redir", false,
-+            QEMU_CAPS_VGA, QEMU_CAPS_SPICE,
-+            QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
-+            QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB,
-+            QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR,
-+            QEMU_CAPS_CHARDEV_SPICEVMC);
- 
-     DO_TEST("input-usbmouse", false, NONE);
-     DO_TEST("input-usbtablet", false, NONE);
-- 
-1.7.7.6
-
@@ -1,22 +0,0 @@
--- libvirt-0.9.11.5.orig/src/lxc/lxc_container.c	2012-08-12 18:03:58.000000000 -0500
-+++ libvirt-0.9.11.5.orig/src/lxc/lxc_container.c	2012-09-21 07:38:19.000000000 -0500
-@@ -506,7 +506,7 @@ 
-     if (pivotRoot) {
- #if HAVE_SELINUX
-         if (getfilecon("/", &con) < 0 &&
-            errno != ENOTSUP) {
-+            errno != ENOTSUP && errno != ENODATA) {
-             virReportSystemError(errno, "%s",
-                                  _("Failed to query file context on /"));
-             goto cleanup;
--- libvirt-0.9.11.5.orig/src/lxc/lxc_controller.c	2012-08-12 18:03:58.000000000 -0500
-+++ libvirt-0.9.11.5.orig/src/lxc/lxc_controller.c	2012-09-21 07:20:41.000000000 -0500
-@@ -1480,7 +1480,7 @@ 
- 
- #if HAVE_SELINUX
-         if (getfilecon(root->src, &con) < 0 &&
-            errno != ENOTSUP) {
-+            errno != ENOTSUP && errno != ENODATA) {
-             virReportSystemError(errno,
-                                  _("Failed to query file context on %s"),
-                                  root->src);
@@ -1,155 +0,0 @@
-From 7c96ce960b84ba19b9cc8e090615f54206e44ff0 Mon Sep 17 00:00:00 2001
-From: Laine Stump <laine@laine.org>
-Date: Tue, 6 Dec 2011 12:47:28 -0500
-Subject: [PATCH] qemu: replace deprecated fedora-13 machine type with pc-0.14
-
-This addresses https://bugzilla.redhat.com/show_bug.cgi?id=754772 .
-It should only be applied to Fedora builds of libvirt, F15 and
-later, so there is no upstream equivalent patch.
-
-Background:
-
-During the lifetime of Fedora 13, some features were backported into
-the F13 build of qemu-kvm from upstream. These features were part of
-the functionality of machine type "pc-0.13" in upstream qemu-kvm, so a
-special "fedora-13" machine type was created for the F13 qemu-kvm.
-Since "fedora-13" became the new "canonical machine type", all new
-domains created with F13 libvirt tools by default contained that
-machine type in their configuration file.
-
-In Fedora 14, a patch was made to qemu to treat the fedora-13 machine
-type as equivalent to "pc-0.13". When Fedora 15 was released, this was
-inadvertently changed to make it equivalent to "pc-0.14".
-
-With the release of Fedora 16, qemu-kvm initially removed support for
-this machine type, which caused failure of many guest configurations
-to start. qemu-kvm subsequently re-added the patch to support
-fedora-13 (as equivalent to pc-0.14), but with the promise that they
-could remove it with the release of Fedora 17. (see
-https://bugzilla.redhat.com/show_bug.cgi?id=748218 ).
-
-Solution:
-
-In order to create a repeat of the recent problems, prior to F17
-existing guest configurations need to be updated to change fedora-13
-to pc-0.14 (which has been determined to be equivalent for all
-practical purposes in both F15 and F16). That's what this patch does:
-
-1) Each time libvirtd is started, it calls virDomainLoadAllConfigs()
-which calls virDomainLoadConfig(); this function has been modified to
-check for os.machine == "fedora-13", and change it to "pc-0.14" then
-write the updated config back to disk.
-
-2) Also, any other time a domain definition is parsed, the parsed
-version in memory is changed to turn "fedora-13" into "pc-0.14". This
-handles domains that had been saved to disk prior to the upgrade, and
-are subsequently restarted.
-
-3) Finally, whenever a domain definition is formatted into a string,
-any occurrence of fedora-13 is replaced with pc-0.14 *directly in the
-virDomainDef* (to avoid multiple warning messages for the same object
-when it's formatted multiple times). This should deal with those cases
-where a domain was running at the time of upgrade, and is later
-saved/snapshotted.
-
-I had considered doing this with some sed commands in the specfile,
-but that wouldn't do anything to help the xml saved in image files.
-
-(Also, one of the xml tests was using the machine type "fedora-13",
-and since that machine type is treated specially by the rest of this
-patch, it was failing. That has been changed in a separate patch,
-which must be applied with this patch, and which *is* also upstream).
---
- src/conf/domain_conf.c |   62 +++++++++++++++++++++++++++++++++++++++++++++--
- 1 files changed, 59 insertions(+), 3 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index f8d0a4c..c79014b 100644
--- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -8394,7 +8394,25 @@ virDomainDefPtr virDomainDefParseString(virCapsPtr caps,
-                                         unsigned int expectedVirtTypes,
-                                         unsigned int flags)
- {
-    return virDomainDefParse(xmlStr, NULL, caps, expectedVirtTypes, flags);
-+    virDomainDefPtr def
-+        = virDomainDefParse(xmlStr, NULL, caps, expectedVirtTypes, flags);
-+
-+    /* Fedora-specific HACK - treat fedora-13 and pc-0.14 as equivalent.
-+     * This handles the case of domains that had been saved to an image file
-+     * prior to upgrade (save or snapshot), then restarted/reverted.
-+     */
-+    if (def && STREQ_NULLABLE(def->os.machine, "fedora-13")) {
-+        VIR_FREE(def->os.machine);
-+        if (!(def->os.machine = strdup("pc-0.14"))) {
-+            virReportOOMError();
-+            virDomainDefFree(def);
-+            def = NULL;
-+        } else {
-+            VIR_WARN("Replacing deprecated 'fedora-13' machine type "
-+                     "with equivalent 'pc-0.14' in domain %s xml", def->name);
-+        }
-+   }
-+    return def;
- }
- 
- virDomainDefPtr virDomainDefParseFile(virCapsPtr caps,
-@@ -11737,8 +11755,30 @@ virDomainDefFormatInternal(virDomainDefPtr def,
-     virBufferAddLit(buf, "    <type");
-     if (def->os.arch)
-         virBufferAsprintf(buf, " arch='%s'", def->os.arch);
-    if (def->os.machine)
-        virBufferAsprintf(buf, " machine='%s'", def->os.machine);
-+    if (def->os.machine) {
-+        /* Fedora-specific HACK - replace "fedora-13" with "pc-0.14"
-+         * (in the original DomainDef as well as in the xml output).
-+         * This will catch XML being written to save/migration images
-+         * of domains that were running when libvirtd was restarted at
-+         * the time of upgrade.
-+         */
-+        if (STREQ_NULLABLE(def->os.machine, "fedora-13")) {
-+            virBufferAddLit(buf, " machine='pc-0.14'");
-+            VIR_WARN("substituting machine type 'fedora-13' with 'pc-0.14' "
-+                     "in domain %s", def->name);
-+            /* It's not exactly nice to modify the source object,
-+             * but sometimes virDomainFormat is called > 100 times for the
-+             * same object, which would result in far too many warning logs.
-+             */
-+            VIR_FREE(def->os.machine);
-+            if (!(def->os.machine = strdup("pc-0.14"))) {
-+                virReportOOMError();
-+                goto cleanup;
-+            }
-+        } else {
-+            virBufferAsprintf(buf, " machine='%s'", def->os.machine);
-+        }
-+    }
-     /*
-      * HACK: For xen driver we previously used bogus 'linux' as the
-      * os type for paravirt, whereas capabilities declare it to
-@@ -12149,6 +12189,22 @@ static virDomainObjPtr virDomainLoadConfig(virCapsPtr caps,
-                                       VIR_DOMAIN_XML_INACTIVE)))
-         goto error;
- 
-+    /* Fedora-specific HACK - replace "fedora-13" with "pc-0.14".
-+     * This updates all config files at the first restart of libvirt
-+     * after upgrade.
-+     */
-+    if (STREQ_NULLABLE(def->os.machine, "fedora-13")) {
-+        VIR_FREE(def->os.machine);
-+        if (!(def->os.machine = strdup("pc-0.14"))) {
-+            virReportOOMError();
-+            goto error;
-+        }
-+        VIR_WARN("Replacing deprecated 'fedora-13' machine type "
-+                 "with equivalent 'pc-0.14' in domain %s configuration file", name);
-+        if (virDomainSaveConfig(configDir, def) < 0)
-+            goto error;
-+    }
-+
-     if ((autostartLink = virDomainConfigFile(autostartDir, name)) == NULL)
-         goto error;
- 
-- 
-1.7.7.6
-
@@ -1,218 +0,0 @@
-commit b8012ce9312f00947c5ca7250a7a96534c85835f
-Author: David Weber <wb@munzinger.de>
-Date:   Mon May 14 09:53:02 2012 +0000
-
-    sanlock: fix locking for readonly devices
-    
-    Add ignore param for readonly and shared disk in sanlock
-
-diff --git a/src/locking/libvirt_sanlock.aug b/src/locking/libvirt_sanlock.aug
-index 5f5f8a1..d65b002 100644
--- a/src/locking/libvirt_sanlock.aug
-+++ b/src/locking/libvirt_sanlock.aug
-@@ -21,6 +21,7 @@ module Libvirt_sanlock =
-              | bool_entry "auto_disk_leases"
-              | int_entry "host_id"
-              | bool_entry "require_lease_for_disks"
-+             | bool_entry "ignore_readonly_and_shared_disks"
-    let comment = [ label "#comment" . del /#[ \t]*/ "# " .  store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ]
-    let empty = [ label "#empty" . eol ]
- 
-diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
-index d344d6a..146aefd 100644
--- a/src/locking/lock_driver_sanlock.c
-+++ b/src/locking/lock_driver_sanlock.c
-@@ -1,7 +1,7 @@
- /*
-  * lock_driver_sanlock.c: A lock driver for Sanlock
-  *
- * Copyright (C) 2010-2011 Red Hat, Inc.
-+ * Copyright (C) 2010-2012 Red Hat, Inc.
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -65,6 +65,7 @@ struct _virLockManagerSanlockDriver {
-     bool requireLeaseForDisks;
-     int hostID;
-     bool autoDiskLease;
-+    bool ignoreReadonlyShared;
-     char *autoDiskLeasePath;
- };
- 
-@@ -114,6 +115,10 @@ static int virLockManagerSanlockLoadConfig(const char *configFile)
-     CHECK_TYPE("auto_disk_leases", VIR_CONF_LONG);
-     if (p) driver->autoDiskLease = p->l;
- 
-+    p = virConfGetValue(conf, "ignore_readonly_and_shared_disks");
-+    CHECK_TYPE("ignore_readonly_and_shared_disks", VIR_CONF_LONG);
-+    if (p) driver->ignoreReadonlyShared = p->l;
-+
-     p = virConfGetValue(conf, "disk_lease_dir");
-     CHECK_TYPE("disk_lease_dir", VIR_CONF_STRING);
-     if (p && p->str) {
-@@ -625,6 +630,12 @@ static int virLockManagerSanlockAddResource(virLockManagerPtr lock,
-         return -1;
-     }
- 
-+    if ((flags & (VIR_LOCK_MANAGER_RESOURCE_READONLY |
-+                  VIR_LOCK_MANAGER_RESOURCE_SHARED)) &&
-+        driver->ignoreReadonlyShared) {
-+            return 0;
-+    }
-+
-     if (flags & VIR_LOCK_MANAGER_RESOURCE_READONLY) {
-         virLockError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                      _("Readonly leases are not supported"));
-diff --git a/src/locking/sanlock.conf b/src/locking/sanlock.conf
-index efc35ee..19ab2b3 100644
--- a/src/locking/sanlock.conf
-+++ b/src/locking/sanlock.conf
-@@ -52,3 +52,10 @@
- # to enabled, otherwise it defaults to disabled.
- #
- #require_lease_for_disks = 1
-+
-+#
-+# Enable this flag to have sanlock ignore readonly and shared disks.
-+# If disabled, then this rejects attempts to share resources until
-+# sanlock gains support for shared locks.
-+#
-+#ignore_readonly_and_shared_disks = 1
-commit acbd4965c44c4dbc676dfe89aff970052e376073
-Author: Daniel P. Berrange <berrange@redhat.com>
-Date:   Thu Jun 21 15:34:46 2012 +0100
-
-    Add support for shared sanlock leases
-    
-    A sanlock lease can be marked as shared (rather
-    than exclusive)  using SANLK_RES_SHARED flag. This
-    adds support for that flag and ensures that in auto
-    disk mode, any shared disks use shared leases. This
-    also makes any read-only disks be completely
-    ignored.
-    
-    These changes remove the need for the option
-    
-      ignore_readonly_and_shared_disks
-    
-    so that is removed
-    
-    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-
-diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
-index 146aefd..16941c9 100644
--- a/src/locking/lock_driver_sanlock.c
-+++ b/src/locking/lock_driver_sanlock.c
-@@ -65,7 +65,6 @@ struct _virLockManagerSanlockDriver {
-     bool requireLeaseForDisks;
-     int hostID;
-     bool autoDiskLease;
-    bool ignoreReadonlyShared;
-     char *autoDiskLeasePath;
- };
- 
-@@ -115,10 +114,6 @@ static int virLockManagerSanlockLoadConfig(const char *configFile)
-     CHECK_TYPE("auto_disk_leases", VIR_CONF_LONG);
-     if (p) driver->autoDiskLease = p->l;
- 
-    p = virConfGetValue(conf, "ignore_readonly_and_shared_disks");
-    CHECK_TYPE("ignore_readonly_and_shared_disks", VIR_CONF_LONG);
-    if (p) driver->ignoreReadonlyShared = p->l;
-
-     p = virConfGetValue(conf, "disk_lease_dir");
-     CHECK_TYPE("disk_lease_dir", VIR_CONF_STRING);
-     if (p && p->str) {
-@@ -428,7 +423,8 @@ static int virLockManagerSanlockDiskLeaseName(const char *path,
- static int virLockManagerSanlockAddLease(virLockManagerPtr lock,
-                                          const char *name,
-                                          size_t nparams,
-                                         virLockManagerParamPtr params)
-+                                         virLockManagerParamPtr params,
-+                                         bool shared)
- {
-     virLockManagerSanlockPrivatePtr priv = lock->privateData;
-     int ret = -1;
-@@ -440,6 +436,7 @@ static int virLockManagerSanlockAddLease(virLockManagerPtr lock,
-         goto cleanup;
-     }
- 
-+    res->flags = shared ? SANLK_RES_SHARED : 0;
-     res->num_disks = 1;
-     if (!virStrcpy(res->name, name, SANLK_NAME_LEN)) {
-         virLockError(VIR_ERR_INTERNAL_ERROR,
-@@ -485,7 +482,8 @@ cleanup:
- static int virLockManagerSanlockAddDisk(virLockManagerPtr lock,
-                                         const char *name,
-                                         size_t nparams,
-                                        virLockManagerParamPtr params ATTRIBUTE_UNUSED)
-+                                        virLockManagerParamPtr params ATTRIBUTE_UNUSED,
-+                                        bool shared)
- {
-     virLockManagerSanlockPrivatePtr priv = lock->privateData;
-     int ret = -1;
-@@ -503,6 +501,7 @@ static int virLockManagerSanlockAddDisk(virLockManagerPtr lock,
-         goto cleanup;
-     }
- 
-+    res->flags = shared ? SANLK_RES_SHARED : 0;
-     res->num_disks = 1;
-     if (virLockManagerSanlockDiskLeaseName(name, res->name, SANLK_NAME_LEN) < 0)
-         goto cleanup;
-@@ -630,27 +629,15 @@ static int virLockManagerSanlockAddResource(virLockManagerPtr lock,
-         return -1;
-     }
- 
-    if ((flags & (VIR_LOCK_MANAGER_RESOURCE_READONLY |
-                  VIR_LOCK_MANAGER_RESOURCE_SHARED)) &&
-        driver->ignoreReadonlyShared) {
-            return 0;
-    }
-
-    if (flags & VIR_LOCK_MANAGER_RESOURCE_READONLY) {
-        virLockError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                     _("Readonly leases are not supported"));
-        return -1;
-    }
-    if (flags & VIR_LOCK_MANAGER_RESOURCE_SHARED) {
-        virLockError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                     _("Shareable leases are not supported"));
-        return -1;
-    }
-+    /* Treat R/O resources as a no-op lock request */
-+    if (flags & VIR_LOCK_MANAGER_RESOURCE_READONLY)
-+        return 0;
- 
-     switch (type) {
-     case VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK:
-         if (driver->autoDiskLease) {
-            if (virLockManagerSanlockAddDisk(lock, name, nparams, params) < 0)
-+            if (virLockManagerSanlockAddDisk(lock, name, nparams, params,
-+                                             !!(flags & VIR_LOCK_MANAGER_RESOURCE_SHARED)) < 0)
-                 return -1;
- 
-             if (virLockManagerSanlockCreateLease(priv->res_args[priv->res_count-1]) < 0)
-@@ -664,7 +651,8 @@ static int virLockManagerSanlockAddResource(virLockManagerPtr lock,
-         break;
- 
-     case VIR_LOCK_MANAGER_RESOURCE_TYPE_LEASE:
-        if (virLockManagerSanlockAddLease(lock, name, nparams, params) < 0)
-+        if (virLockManagerSanlockAddLease(lock, name, nparams, params,
-+                                          !!(flags & VIR_LOCK_MANAGER_RESOURCE_SHARED)) < 0)
-             return -1;
-         break;
- 
-diff --git a/src/locking/sanlock.conf b/src/locking/sanlock.conf
-index 19ab2b3..efc35ee 100644
--- a/src/locking/sanlock.conf
-+++ b/src/locking/sanlock.conf
-@@ -52,10 +52,3 @@
- # to enabled, otherwise it defaults to disabled.
- #
- #require_lease_for_disks = 1
-
-#
-# Enable this flag to have sanlock ignore readonly and shared disks.
-# If disabled, then this rejects attempts to share resources until
-# sanlock gains support for shared locks.
-#
-#ignore_readonly_and_shared_disks = 1
@@ -1 +1 @@
-2d4eafc04fe52a8503acb6d42888a618  libvirt-0.9.11.10.tar.gz
+SHA512 (libvirt-1.3.3.3.tar.gz) = 63f68b100ee73cd44ec983c24cc441f6b0361ebbf0c05b8ab4638f4819d6ec372823e5b66c65ddfac0539717a202253d9ee23456235aff963acb83d2e64f8ae2