virt-xml: Actually update the INACTIVE xml

46 files changed, 143 insertions, 88 deletions

diff --git a/tests/cli-test-xml/compare/virtxml-add-disk-basic.xml b/tests/cli-test-xml/compare/virtxml-add-disk-basic.xml
index d5d7558f..7810872b 100644
--- a/tests/cli-test-xml/compare/virtxml-add-disk-basic.xml
+++ b/tests/cli-test-xml/compare/virtxml-add-disk-basic.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -302,5 +302,9 @@
+@@ -301,5 +301,9 @@
          <protocol type="raw"/>
        </backend>
      </rng>
@@ -11,4 +11,5 @@
    </devices>
  </domain>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-add-host-device.xml b/tests/cli-test-xml/compare/virtxml-add-host-device.xml
index 4085a864..09450d93 100644
--- a/tests/cli-test-xml/compare/virtxml-add-host-device.xml
+++ b/tests/cli-test-xml/compare/virtxml-add-host-device.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -302,5 +302,10 @@
+@@ -301,5 +301,10 @@
          <protocol type="raw"/>
        </backend>
      </rng>
@@ -12,4 +12,5 @@
    </devices>
  </domain>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-add-sound.xml b/tests/cli-test-xml/compare/virtxml-add-sound.xml
index 627ba39c..ba5d2261 100644
--- a/tests/cli-test-xml/compare/virtxml-add-sound.xml
+++ b/tests/cli-test-xml/compare/virtxml-add-sound.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -302,5 +302,6 @@
+@@ -301,5 +301,6 @@
          <protocol type="raw"/>
        </backend>
      </rng>
@@ -8,4 +8,5 @@
    </devices>
  </domain>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-all.xml b/tests/cli-test-xml/compare/virtxml-edit-all.xml
index 111ae7f9..7754a766 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-all.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-all.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -266,21 +266,25 @@
+@@ -265,21 +265,25 @@
          <vendor id="0x04b3"/>
          <product id="0x4485"/>
        </source>
@@ -27,4 +27,5 @@
      <redirdev bus="usb" type="tcp">
        <source mode="connect" host="localhost" service="4000"/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-clear-clock.xml b/tests/cli-test-xml/compare/virtxml-edit-clear-clock.xml
index 1e7f5adb..8afd1696 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-clear-clock.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-clear-clock.xml
@@ -12,11 +12,12 @@
    <on_poweroff>destroy</on_poweroff>
    <on_reboot>restart</on_reboot>
    <on_crash>restart</on_crash>
-@@ -303,4 +298,5 @@
+@@ -302,4 +297,5 @@
        </backend>
      </rng>
    </devices>
 +  <clock offset="utc"/>
  </domain>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-clear-cpu.xml b/tests/cli-test-xml/compare/virtxml-edit-clear-cpu.xml
index e871c731..bb81b152 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-clear-cpu.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-clear-cpu.xml
@@ -24,7 +24,7 @@
    <clock offset="utc">
      <timer name="rtc" tickpolicy="catchup"/>
      <timer name="pit" tickpolicy="delay"/>
-@@ -303,4 +286,7 @@
+@@ -302,4 +285,7 @@
        </backend>
      </rng>
    </devices>
@@ -33,4 +33,5 @@
 +  </cpu>
  </domain>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-clear-disk.xml b/tests/cli-test-xml/compare/virtxml-edit-clear-disk.xml
index 08c84ad7..ccbca7fb 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-clear-disk.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-clear-disk.xml
@@ -14,4 +14,5 @@
      <disk type="dir" device="floppy">
        <source dir="/tmp"/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-neg-num.xml b/tests/cli-test-xml/compare/virtxml-edit-neg-num.xml
index 250e4cb7..6428b0bb 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-neg-num.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-neg-num.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -259,7 +259,7 @@
+@@ -258,7 +258,7 @@
        <model type="vmvga" vram="9216" heads="1"/>
      </video>
      <video>
@@ -10,4 +10,5 @@
      <hostdev mode="subsystem" type="usb" managed="yes">
        <source>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-pos-num.xml b/tests/cli-test-xml/compare/virtxml-edit-pos-num.xml
index a8dae71d..433b34b1 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-pos-num.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-pos-num.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -254,7 +254,7 @@
+@@ -253,7 +253,7 @@
      </graphics>
      <sound model="sb16"/>
      <sound model="es1370"/>
@@ -10,4 +10,5 @@
        <model type="vmvga" vram="9216" heads="1"/>
      </video>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-select-disk-path.xml b/tests/cli-test-xml/compare/virtxml-edit-select-disk-path.xml
index 88f7b138..33b85ead 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-select-disk-path.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-select-disk-path.xml
@@ -10,4 +10,5 @@
      <disk type="block" device="disk">
        <source dev="/dev/default-pool/overlay.img"/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-select-disk-target.xml b/tests/cli-test-xml/compare/virtxml-edit-select-disk-target.xml
index 27b4b341..aa79d279 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-select-disk-target.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-select-disk-target.xml
@@ -10,4 +10,5 @@
        <iotune>
          <read_bytes_sec>5242880</read_bytes_sec>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-select-network-mac.xml b/tests/cli-test-xml/compare/virtxml-edit-select-network-mac.xml
index fc884b59..19f523ca 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-select-network-mac.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-select-network-mac.xml
@@ -10,4 +10,5 @@
      <interface type="direct">
        <mac address="f0:11:22:33:44:5f"/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-select-sound-model.xml b/tests/cli-test-xml/compare/virtxml-edit-select-sound-model.xml
index a8dae71d..433b34b1 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-select-sound-model.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-select-sound-model.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -254,7 +254,7 @@
+@@ -253,7 +253,7 @@
      </graphics>
      <sound model="sb16"/>
      <sound model="es1370"/>
@@ -10,4 +10,5 @@
        <model type="vmvga" vram="9216" heads="1"/>
      </video>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-boot.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-boot.xml
index 76858bae..4fc8ccc3 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-boot.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-boot.xml
@@ -14,4 +14,5 @@
    <features>
      <acpi/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-channel.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-channel.xml
index f92912d6..5168f2e3 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-channel.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-channel.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -215,7 +215,7 @@
+@@ -214,7 +214,7 @@
      <console type="pty">
        <target type="uml" port="1"/>
      </console>
@@ -10,4 +10,5 @@
        <target type="guestfwd" address="10.0.2.1" port="4600"/>
      </channel>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-clock.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-clock.xml
index 21a00dda..d5fc7ec3 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-clock.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-clock.xml
@@ -16,4 +16,5 @@
    <on_poweroff>destroy</on_poweroff>
    <on_reboot>restart</on_reboot>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-console.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-console.xml
index 8adc1d9c..906e2e9e 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-console.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-console.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -210,7 +210,7 @@
+@@ -209,7 +209,7 @@
        <target port="2"/>
      </parallel>
      <console type="pty">
@@ -10,4 +10,5 @@
      <console type="pty">
        <target type="uml" port="1"/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-controller.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-controller.xml
index fba22d62..1f3ca6b1 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-controller.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-controller.xml
@@ -10,4 +10,5 @@
      <controller type="fdc" index="0"/>
      <controller type="ide" index="0"/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-cpu.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-cpu.xml
index 532ce286..f983a174 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-cpu.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-cpu.xml
@@ -21,4 +21,5 @@
    <clock offset="utc">
      <timer name="rtc" tickpolicy="catchup"/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-disk.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-disk.xml
index fad2b8b8..c053968f 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-disk.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-disk.xml
@@ -13,4 +13,5 @@
      <disk type="dir" device="floppy">
        <source dir="/tmp"/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-features.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-features.xml
index 36fb2e0e..b561b3a2 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-features.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-features.xml
@@ -14,4 +14,5 @@
        <spinlocks state="on" retries="12287"/>
      </hyperv>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-filesystem.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-filesystem.xml
index f92fb0a8..38e03904 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-filesystem.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-filesystem.xml
@@ -1,8 +1,8 @@
 --- Original XML
 +++ Altered XML
 @@ -106,10 +106,10 @@
-     <controller type="virtio-serial" index="1"/>
      <controller type="virtio-serial" index="0"/>
+     <controller type="virtio-serial" index="1"/>
      <controller type="ccid" index="0"/>
 -    <filesystem type="mount" accessmode="passthrough">
 +    <filesystem type="mount" accessmode="mapped">
@@ -15,4 +15,5 @@
      <filesystem type="template" accessmode="passthrough">
        <source name="template_fedora"/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-graphics.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-graphics.xml
index 792b823f..e51966bd 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-graphics.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-graphics.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -239,7 +239,7 @@
+@@ -238,7 +238,7 @@
        </backend>
      </tpm>
      <input type="mouse" bus="ps2"/>
@@ -10,4 +10,5 @@
      <graphics type="vnc" port="-1" autoport="yes" listen="1.2.3.4" keymap="fi">
        <listen type="address" address="1.2.3.4"/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-host-device.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-host-device.xml
index 65d60883..edee3f17 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-host-device.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-host-device.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -263,9 +263,10 @@
+@@ -262,9 +262,10 @@
      </video>
      <hostdev mode="subsystem" type="usb" managed="yes">
        <source>
@@ -14,4 +14,5 @@
      <hostdev mode="subsystem" type="usb" managed="yes">
        <source>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-memballoon.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-memballoon.xml
index f8c52e6d..3c3b9539 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-memballoon.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-memballoon.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -294,7 +294,7 @@
+@@ -293,7 +293,7 @@
        <usbdev allow="no"/>
      </redirfilter>
      <watchdog model="ib700" action="poweroff"/>
@@ -10,4 +10,5 @@
        <rate bytes="1234" period="2000"/>
        <backend model="egd" type="tcp">
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-memory.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-memory.xml
index 572d2718..f0500889 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-memory.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-memory.xml
@@ -14,4 +14,5 @@
    <vcpu placement="static" cpuset="1-2,5-9,11,13-14">9</vcpu>
    <numatune>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-metadata.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-metadata.xml
index 99b9cb68..6e6198ba 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-metadata.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-metadata.xml
@@ -1,7 +1,7 @@
 --- Original XML
 +++ Altered XML
 @@ -1,9 +1,9 @@
- <domain type="test" id="3">
+ <domain type="test">
 -  <name>test-many-devices</name>
 -  <uuid>12345678-12f4-1234-1234-123456789012</uuid>
 -  <description>Foo bar baz &amp;
@@ -15,11 +15,12 @@
    <memory unit="KiB">409600</memory>
    <currentMemory unit="KiB">204800</currentMemory>
    <memoryBacking>
-@@ -303,4 +303,5 @@
+@@ -302,4 +302,5 @@
        </backend>
      </rng>
    </devices>
 +  <title>This is my,funky=new title</title>
  </domain>
 
-Domain 'foo-my-new-name' defined successfully.
\ No newline at end of file
+Domain 'foo-my-new-name' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-network.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-network.xml
index 32ad6f62..c3f08a5a 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-network.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-network.xml
@@ -16,4 +16,5 @@
      <interface type="network">
        <mac address="22:11:11:11:11:11"/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-numatune.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-numatune.xml
index 3ee20e84..dd598665 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-numatune.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-numatune.xml
@@ -10,4 +10,5 @@
    <os>
      <type arch="i686">hvm</type>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-parallel.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-parallel.xml
index a1e8644e..023cf52f 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-parallel.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-parallel.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -196,8 +196,8 @@
+@@ -195,8 +195,8 @@
        <protocol type="telnet"/>
        <target port="1"/>
      </serial>
@@ -12,4 +12,5 @@
      </parallel>
      <parallel type="unix">
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-redirdev.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-redirdev.xml
index 9d1166e7..540d2f6b 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-redirdev.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-redirdev.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -282,8 +282,8 @@
+@@ -281,8 +281,8 @@
          <address domain="0x0003" bus="0x00" slot="0x19" function="0x0"/>
        </source>
      </hostdev>
@@ -12,4 +12,5 @@
      </redirdev>
      <redirdev bus="usb" type="spicevmc">
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-rng.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-rng.xml
index 14b3400e..df525718 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-rng.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-rng.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -296,7 +296,7 @@
+@@ -295,7 +295,7 @@
      <watchdog model="ib700" action="poweroff"/>
      <memballoon model="virtio"/>
      <rng model="virtio">
@@ -10,4 +10,5 @@
          <source mode="connect" host="1.2.3.4" service="1234"/>
          <protocol type="raw"/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-security.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-security.xml
index 50d7e507..e4f38f97 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-security.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-security.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -303,4 +303,7 @@
+@@ -302,4 +302,7 @@
        </backend>
      </rng>
    </devices>
@@ -9,4 +9,5 @@
 +  </seclabel>
  </domain>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-serial.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-serial.xml
index c0b27fa6..47a99f41 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-serial.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-serial.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -188,7 +188,7 @@
+@@ -187,7 +187,7 @@
        <protocol type="raw"/>
        <address type="ccid" controller="0" slot="3"/>
      </smartcard>
@@ -10,4 +10,5 @@
      </serial>
      <serial type="tcp">
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-smartcard.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-smartcard.xml
index 2b193db2..9995f500 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-smartcard.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-smartcard.xml
@@ -1,7 +1,7 @@
 --- Original XML
 +++ Altered XML
-@@ -171,7 +171,7 @@
-       <target dev="testnet6"/>
+@@ -170,7 +170,7 @@
+       </virtualport>
        <address type="pci" domain="0x0000" bus="0x00" slot="0x07" function="0x0"/>
      </interface>
 -    <smartcard mode="host">
@@ -10,4 +10,5 @@
      </smartcard>
      <smartcard mode="host-certificates">
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-soundhw.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-soundhw.xml
index cfa25b89..247341d9 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-soundhw.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-soundhw.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -252,7 +252,7 @@
+@@ -251,7 +251,7 @@
        <channel name="inputs" mode="secure"/>
        <channel name="record" mode="insecure"/>
      </graphics>
@@ -10,4 +10,5 @@
      <sound model="ich6"/>
      <video>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-tpm.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-tpm.xml
index 866f1b62..c5c9760b 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-tpm.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-tpm.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -235,7 +235,7 @@
+@@ -234,7 +234,7 @@
      <input type="tablet" bus="usb"/>
      <tpm model="tpm-tis">
        <backend type="passthrough">
@@ -10,4 +10,5 @@
      </tpm>
      <input type="mouse" bus="ps2"/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-vcpus.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-vcpus.xml
index 45bcafea..18b2d8b1 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-vcpus.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-vcpus.xml
@@ -18,4 +18,5 @@
    <clock offset="utc">
      <timer name="rtc" tickpolicy="catchup"/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-video.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-video.xml
index 551d3c5e..c751568d 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-video.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-video.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -256,7 +256,7 @@
+@@ -255,7 +255,7 @@
      <sound model="es1370"/>
      <sound model="ich6"/>
      <video>
@@ -10,4 +10,5 @@
      <video>
        <model type="cirrus" vram="10240" heads="3"/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-watchdog.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-watchdog.xml
index 23c050bb..a515c45e 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-watchdog.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-watchdog.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -293,7 +293,7 @@
+@@ -292,7 +292,7 @@
        <usbdev class="0x08" vendor="0x15E1" product="0x2007" version="1.10" allow="yes"/>
        <usbdev allow="no"/>
      </redirfilter>
@@ -10,4 +10,5 @@
      <rng model="virtio">
        <rate bytes="1234" period="2000"/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-print-xml.xml b/tests/cli-test-xml/compare/virtxml-print-xml.xml
index cd52f8d3..8b43832a 100644
--- a/tests/cli-test-xml/compare/virtxml-print-xml.xml
+++ b/tests/cli-test-xml/compare/virtxml-print-xml.xml
@@ -1,4 +1,4 @@
-<domain type="test" id="1">
+<domain type="test">
   <name>test</name>
   <uuid>4a64cc71-19c4-2fd0-2323-3050941ea3c3</uuid>
   <memory unit="KiB">8388608</memory>
diff --git a/tests/cli-test-xml/compare/virtxml-remove-disk-index.xml b/tests/cli-test-xml/compare/virtxml-remove-disk-index.xml
index 67a8f9c6..ad97a02f 100644
--- a/tests/cli-test-xml/compare/virtxml-remove-disk-index.xml
+++ b/tests/cli-test-xml/compare/virtxml-remove-disk-index.xml
@@ -1,17 +1,18 @@
 --- Original XML
 +++ Altered XML
-@@ -83,12 +83,6 @@
-       <target dev="sdb" bus="scsi"/>
+@@ -84,12 +84,6 @@
        <readonly/>
        <address type="drive" controller="0" bus="0" target="0" unit="1"/>
--    </disk>
+     </disk>
 -    <disk type="file" device="disk">
 -      <driver name="qemu" type="qcow2" cache="none"/>
 -      <source file="/tmp/foobar2"/>
 -      <target dev="vdc" bus="virtio"/>
 -      <shareable/>
-     </disk>
+-    </disk>
      <disk type="block" device="disk">
        <source dev="/dev/default-pool/overlay.img"/>
+       <target dev="sdd" bus="usb"/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-remove-disk-path.xml b/tests/cli-test-xml/compare/virtxml-remove-disk-path.xml
index e305e65e..c33d482d 100644
--- a/tests/cli-test-xml/compare/virtxml-remove-disk-path.xml
+++ b/tests/cli-test-xml/compare/virtxml-remove-disk-path.xml
@@ -26,4 +26,5 @@
      <disk type="block" device="cdrom">
        <target dev="sdb" bus="scsi"/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-remove-sound-model.xml b/tests/cli-test-xml/compare/virtxml-remove-sound-model.xml
index 8b75dd55..e6dd98b7 100644
--- a/tests/cli-test-xml/compare/virtxml-remove-sound-model.xml
+++ b/tests/cli-test-xml/compare/virtxml-remove-sound-model.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -254,7 +254,6 @@
+@@ -253,7 +253,6 @@
      </graphics>
      <sound model="sb16"/>
      <sound model="es1370"/>
@@ -9,4 +9,5 @@
        <model type="vmvga" vram="9216" heads="1"/>
      </video>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virtxml-remove-video-all.xml b/tests/cli-test-xml/compare/virtxml-remove-video-all.xml
index dbb2dca7..02b43fbc 100644
--- a/tests/cli-test-xml/compare/virtxml-remove-video-all.xml
+++ b/tests/cli-test-xml/compare/virtxml-remove-video-all.xml
@@ -1,6 +1,6 @@
 --- Original XML
 +++ Altered XML
-@@ -255,12 +255,6 @@
+@@ -254,12 +254,6 @@
      <sound model="sb16"/>
      <sound model="es1370"/>
      <sound model="ich6"/>
@@ -14,4 +14,5 @@
        <source>
          <vendor id="0x04b3"/>
 
-Domain 'test-many-devices' defined successfully.
\ No newline at end of file
+Domain 'test-many-devices' defined successfully.
+Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/virt-xml b/virt-xml
index 96b729ef..520c552d 100755
--- a/virt-xml
+++ b/virt-xml
@@ -91,16 +91,20 @@ def get_domain_and_guest(conn, domstr):
     except libvirt.libvirtError, e:
         fail(_("Could not find domain '%s': %s") % (domstr, e))
 
-    # XXX: Require this for first pass, but it sucks for testing
-    #if domain.info()[0] != libvirt.VIR_DOMAIN_SHUTOFF:
-    #    fail(_("Domain '%s' must be shutoff.") % domain.name())
+    def _make_guest(xml):
+        # We do this to minimize the diff, removing things like ' -> "
+        return virtinst.Guest(conn,
+            parsexml=virtinst.Guest(conn, parsexml=xml).get_xml_config())
 
-    # XXX: any flags to use here? INACTIVE prob, though not secure or cpu
-    xml = domain.XMLDesc(0)
+    state = domain.info()[0]
+    active_xmlobj = None
+    inactive_xmlobj = _make_guest(domain.XMLDesc(0))
+    if state != libvirt.VIR_DOMAIN_SHUTOFF:
+        active_xmlobj = inactive_xmlobj
+        inactive_xmlobj = _make_guest(
+            domain.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE))
 
-    # We do this to minimize the diff, removing things like ' -> "
-    xml = virtinst.Guest(conn, parsexml=xml).get_xml_config()
-    return (domain, xml, virtinst.Guest(conn, parsexml=xml))
+    return (domain, inactive_xmlobj, active_xmlobj)
 
 
 ################
@@ -291,7 +295,10 @@ def main(conn=None):
     if conn is None:
         conn = cli.getConnection(options.connect)
 
-    domain, origxml, guest = get_domain_and_guest(conn, options.domain)
+    domain, inactive_xmlobj, active_xmlobj = get_domain_and_guest(
+        conn, options.domain)
+    guest = inactive_xmlobj
+    origxml = guest.get_xml_config()
     # XXX: do we ever need the domain?
     ignore = domain
 
@@ -325,6 +332,10 @@ def main(conn=None):
 
     conn.defineXML(guest.get_xml_config())
     print_stdout(_("Domain '%s' defined successfully." % guest.name))
+    if active_xmlobj:
+        print_stdout(
+            _("Changes will take effect after the next domain shutdown."))
+
     return 0