[libvirt] [PATCH 0/2] fix issues in vbox found by make check on RHEL6
Pavel Hrdina (2): tests: fix vbox snapshot xmls vbox_snapshot_conf: fix wrong use of 'xmlSaveFormatFileEnc' src/vbox/vbox_snapshot_conf.c | 2 +- tests/vboxsnapshotxmldata/2disks-1snap.vbox | 292 +++---- tests/vboxsnapshotxmldata/2disks-2snap.vbox | 584 +++++++------- .../vboxsnapshotxmldata/2disks-3snap-brother.vbox | 292 +++---- tests/vboxsnapshotxmldata/2disks-3snap.vbox | 876 ++++++++++----------- 5 files changed, 1023 insertions(+), 1023 deletions(-) -- 1.8.5.5
On RHEL6 the vboxsnapshotxmltest fails because of wrong xml that is generated by libvirt. However the core issue is in the xml data itself with the wrong indentation. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- tests/vboxsnapshotxmldata/2disks-1snap.vbox | 292 +++---- tests/vboxsnapshotxmldata/2disks-2snap.vbox | 584 +++++++------- .../vboxsnapshotxmldata/2disks-3snap-brother.vbox | 292 +++---- tests/vboxsnapshotxmldata/2disks-3snap.vbox | 876 ++++++++++----------- 4 files changed, 1022 insertions(+), 1022 deletions(-) diff --git a/tests/vboxsnapshotxmldata/2disks-1snap.vbox b/tests/vboxsnapshotxmldata/2disks-1snap.vbox index f80c5af..d990255 100644 --- a/tests/vboxsnapshotxmldata/2disks-1snap.vbox +++ b/tests/vboxsnapshotxmldata/2disks-1snap.vbox @@ -170,153 +170,153 @@ or other application using the libvirt API--> </StorageControllers> <Snapshot uuid="{364c7314-b2d9-4fcf-b786-47b987449ef7}" name="15052014-115228" timeStamp="2014-05-15T09:52:29Z"> <Hardware version="2"> - <CPU count="1" hotplug="false"> - <HardwareVirtEx enabled="true"/> - <HardwareVirtExNestedPaging enabled="true"/> - <HardwareVirtExVPID enabled="true"/> - <HardwareVirtExUX enabled="true"/> - <PAE enabled="false"/> - <LongMode enabled="true"/> - <HardwareVirtExLargePages enabled="false"/> - <HardwareVirtForce enabled="false"/> - </CPU> - <Memory RAMSize="192" PageFusion="false"/> - <HID Pointing="PS2Mouse" Keyboard="PS2Keyboard"/> - <HPET enabled="false"/> - <Chipset type="PIIX3"/> - <Boot> - <Order position="1" device="HardDisk"/> - <Order position="2" device="None"/> - <Order position="3" device="None"/> - <Order position="4" device="None"/> - </Boot> - <Display VRAMSize="8" monitorCount="1" accelerate3D="false" accelerate2DVideo="false"/> - <VideoCapture enabled="false" screens="18446744073709551615" horzRes="1024" vertRes="768" rate="512" fps="25"/> - <RemoteDisplay enabled="true" authType="Null" allowMultiConnection="true"> - <VRDEProperties> - <Property name="TCP/Ports" value="5900"/> - </VRDEProperties> - </RemoteDisplay> - <BIOS> - <ACPI enabled="true"/> - <IOAPIC enabled="true"/> - <Logo fadeIn="true" fadeOut="true" displayTime="0"/> - <BootMenu mode="MessageAndMenu"/> - <TimeOffset value="0"/> - <PXEDebug enabled="false"/> - </BIOS> - <USB> - <Controllers/> - <DeviceFilters/> - </USB> - <Network> - <Adapter slot="0" enabled="true" MACAddress="0800272A589D" cable="true" speed="0" type="82540EM"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - <InternalNetwork name="intnet"/> - <NATNetwork name="NatNetwork"/> - </DisabledModes> - <BridgedInterface name="hns0000000v"/> - </Adapter> - <Adapter slot="1" enabled="false" MACAddress="0800276B5197" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="2" enabled="false" MACAddress="080027A346C9" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="3" enabled="false" MACAddress="08002749A665" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="4" enabled="false" MACAddress="0800273246C6" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="5" enabled="false" MACAddress="080027B0B358" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="6" enabled="false" MACAddress="080027BF23E5" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="7" enabled="false" MACAddress="080027BEE078" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - </Network> - <UART> - <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> - <Port slot="1" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> - </UART> - <LPT> - <Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/> - <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/> - </LPT> - <AudioAdapter controller="AC97" driver="Pulse" enabled="false"/> - <RTC localOrUTC="local"/> - <SharedFolders/> - <Clipboard mode="Disabled"/> - <DragAndDrop mode="Disabled"/> - <IO> - <IoCache enabled="true" size="5"/> - <BandwidthGroups/> - </IO> - <HostPci> - <Devices/> - </HostPci> - <EmulatedUSB> - <CardReader enabled="false"/> - </EmulatedUSB> - <Guest memoryBalloonSize="0"/> - <GuestProperties/> - </Hardware> + <CPU count="1" hotplug="false"> + <HardwareVirtEx enabled="true"/> + <HardwareVirtExNestedPaging enabled="true"/> + <HardwareVirtExVPID enabled="true"/> + <HardwareVirtExUX enabled="true"/> + <PAE enabled="false"/> + <LongMode enabled="true"/> + <HardwareVirtExLargePages enabled="false"/> + <HardwareVirtForce enabled="false"/> + </CPU> + <Memory RAMSize="192" PageFusion="false"/> + <HID Pointing="PS2Mouse" Keyboard="PS2Keyboard"/> + <HPET enabled="false"/> + <Chipset type="PIIX3"/> + <Boot> + <Order position="1" device="HardDisk"/> + <Order position="2" device="None"/> + <Order position="3" device="None"/> + <Order position="4" device="None"/> + </Boot> + <Display VRAMSize="8" monitorCount="1" accelerate3D="false" accelerate2DVideo="false"/> + <VideoCapture enabled="false" screens="18446744073709551615" horzRes="1024" vertRes="768" rate="512" fps="25"/> + <RemoteDisplay enabled="true" authType="Null" allowMultiConnection="true"> + <VRDEProperties> + <Property name="TCP/Ports" value="5900"/> + </VRDEProperties> + </RemoteDisplay> + <BIOS> + <ACPI enabled="true"/> + <IOAPIC enabled="true"/> + <Logo fadeIn="true" fadeOut="true" displayTime="0"/> + <BootMenu mode="MessageAndMenu"/> + <TimeOffset value="0"/> + <PXEDebug enabled="false"/> + </BIOS> + <USB> + <Controllers/> + <DeviceFilters/> + </USB> + <Network> + <Adapter slot="0" enabled="true" MACAddress="0800272A589D" cable="true" speed="0" type="82540EM"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + <InternalNetwork name="intnet"/> + <NATNetwork name="NatNetwork"/> + </DisabledModes> + <BridgedInterface name="hns0000000v"/> + </Adapter> + <Adapter slot="1" enabled="false" MACAddress="0800276B5197" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="2" enabled="false" MACAddress="080027A346C9" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="3" enabled="false" MACAddress="08002749A665" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="4" enabled="false" MACAddress="0800273246C6" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="5" enabled="false" MACAddress="080027B0B358" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="6" enabled="false" MACAddress="080027BF23E5" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="7" enabled="false" MACAddress="080027BEE078" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + </Network> + <UART> + <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> + <Port slot="1" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> + </UART> + <LPT> + <Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/> + <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/> + </LPT> + <AudioAdapter controller="AC97" driver="Pulse" enabled="false"/> + <RTC localOrUTC="local"/> + <SharedFolders/> + <Clipboard mode="Disabled"/> + <DragAndDrop mode="Disabled"/> + <IO> + <IoCache enabled="true" size="5"/> + <BandwidthGroups/> + </IO> + <HostPci> + <Devices/> + </HostPci> + <EmulatedUSB> + <CardReader enabled="false"/> + </EmulatedUSB> + <Guest memoryBalloonSize="0"/> + <GuestProperties/> + </Hardware> <StorageControllers> - <StorageController name="IDE Controller" type="PIIX4" PortCount="2" useHostIOCache="true" Bootable="true"> - <AttachedDevice type="HardDisk" port="0" device="0"> - <Image uuid="{105122e9-f6d2-42c1-9c11-c01699c79517}"/> - </AttachedDevice> - <AttachedDevice type="HardDisk" port="0" device="1"> - <Image uuid="{f113fdf8-9750-4557-a8be-87fd02319071}"/> - </AttachedDevice> - </StorageController> - <StorageController name="SATA Controller" type="AHCI" PortCount="30" useHostIOCache="false" Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3"/> - <StorageController name="SCSI Controller" type="LsiLogic" PortCount="16" useHostIOCache="false" Bootable="true"/> - <StorageController name="Floppy Controller" type="I82078" PortCount="1" useHostIOCache="true" Bootable="true"/> - </StorageControllers> + <StorageController name="IDE Controller" type="PIIX4" PortCount="2" useHostIOCache="true" Bootable="true"> + <AttachedDevice type="HardDisk" port="0" device="0"> + <Image uuid="{105122e9-f6d2-42c1-9c11-c01699c79517}"/> + </AttachedDevice> + <AttachedDevice type="HardDisk" port="0" device="1"> + <Image uuid="{f113fdf8-9750-4557-a8be-87fd02319071}"/> + </AttachedDevice> + </StorageController> + <StorageController name="SATA Controller" type="AHCI" PortCount="30" useHostIOCache="false" Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3"/> + <StorageController name="SCSI Controller" type="LsiLogic" PortCount="16" useHostIOCache="false" Bootable="true"/> + <StorageController name="Floppy Controller" type="I82078" PortCount="1" useHostIOCache="true" Bootable="true"/> + </StorageControllers> </Snapshot> </Machine> </VirtualBox> diff --git a/tests/vboxsnapshotxmldata/2disks-2snap.vbox b/tests/vboxsnapshotxmldata/2disks-2snap.vbox index 8277937..adea505 100644 --- a/tests/vboxsnapshotxmldata/2disks-2snap.vbox +++ b/tests/vboxsnapshotxmldata/2disks-2snap.vbox @@ -174,303 +174,303 @@ or other application using the libvirt API--> </StorageControllers> <Snapshot uuid="{364c7314-b2d9-4fcf-b786-47b987449ef7}" name="15052014-115228" timeStamp="2014-05-15T09:52:29Z"> <Hardware version="2"> - <CPU count="1" hotplug="false"> - <HardwareVirtEx enabled="true"/> - <HardwareVirtExNestedPaging enabled="true"/> - <HardwareVirtExVPID enabled="true"/> - <HardwareVirtExUX enabled="true"/> - <PAE enabled="false"/> - <LongMode enabled="true"/> - <HardwareVirtExLargePages enabled="false"/> - <HardwareVirtForce enabled="false"/> - </CPU> - <Memory RAMSize="192" PageFusion="false"/> - <HID Pointing="PS2Mouse" Keyboard="PS2Keyboard"/> - <HPET enabled="false"/> - <Chipset type="PIIX3"/> - <Boot> - <Order position="1" device="HardDisk"/> - <Order position="2" device="None"/> - <Order position="3" device="None"/> - <Order position="4" device="None"/> - </Boot> - <Display VRAMSize="8" monitorCount="1" accelerate3D="false" accelerate2DVideo="false"/> - <VideoCapture enabled="false" screens="18446744073709551615" horzRes="1024" vertRes="768" rate="512" fps="25"/> - <RemoteDisplay enabled="true" authType="Null" allowMultiConnection="true"> - <VRDEProperties> - <Property name="TCP/Ports" value="5900"/> - </VRDEProperties> - </RemoteDisplay> - <BIOS> - <ACPI enabled="true"/> - <IOAPIC enabled="true"/> - <Logo fadeIn="true" fadeOut="true" displayTime="0"/> - <BootMenu mode="MessageAndMenu"/> - <TimeOffset value="0"/> - <PXEDebug enabled="false"/> - </BIOS> - <USB> - <Controllers/> - <DeviceFilters/> - </USB> - <Network> - <Adapter slot="0" enabled="true" MACAddress="0800272A589D" cable="true" speed="0" type="82540EM"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - <InternalNetwork name="intnet"/> - <NATNetwork name="NatNetwork"/> - </DisabledModes> - <BridgedInterface name="hns0000000v"/> - </Adapter> - <Adapter slot="1" enabled="false" MACAddress="0800276B5197" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="2" enabled="false" MACAddress="080027A346C9" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="3" enabled="false" MACAddress="08002749A665" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="4" enabled="false" MACAddress="0800273246C6" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="5" enabled="false" MACAddress="080027B0B358" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="6" enabled="false" MACAddress="080027BF23E5" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="7" enabled="false" MACAddress="080027BEE078" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - </Network> - <UART> - <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> - <Port slot="1" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> - </UART> - <LPT> - <Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/> - <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/> - </LPT> - <AudioAdapter controller="AC97" driver="Pulse" enabled="false"/> - <RTC localOrUTC="local"/> - <SharedFolders/> - <Clipboard mode="Disabled"/> - <DragAndDrop mode="Disabled"/> - <IO> - <IoCache enabled="true" size="5"/> - <BandwidthGroups/> - </IO> - <HostPci> - <Devices/> - </HostPci> - <EmulatedUSB> - <CardReader enabled="false"/> - </EmulatedUSB> - <Guest memoryBalloonSize="0"/> - <GuestProperties/> - </Hardware> + <CPU count="1" hotplug="false"> + <HardwareVirtEx enabled="true"/> + <HardwareVirtExNestedPaging enabled="true"/> + <HardwareVirtExVPID enabled="true"/> + <HardwareVirtExUX enabled="true"/> + <PAE enabled="false"/> + <LongMode enabled="true"/> + <HardwareVirtExLargePages enabled="false"/> + <HardwareVirtForce enabled="false"/> + </CPU> + <Memory RAMSize="192" PageFusion="false"/> + <HID Pointing="PS2Mouse" Keyboard="PS2Keyboard"/> + <HPET enabled="false"/> + <Chipset type="PIIX3"/> + <Boot> + <Order position="1" device="HardDisk"/> + <Order position="2" device="None"/> + <Order position="3" device="None"/> + <Order position="4" device="None"/> + </Boot> + <Display VRAMSize="8" monitorCount="1" accelerate3D="false" accelerate2DVideo="false"/> + <VideoCapture enabled="false" screens="18446744073709551615" horzRes="1024" vertRes="768" rate="512" fps="25"/> + <RemoteDisplay enabled="true" authType="Null" allowMultiConnection="true"> + <VRDEProperties> + <Property name="TCP/Ports" value="5900"/> + </VRDEProperties> + </RemoteDisplay> + <BIOS> + <ACPI enabled="true"/> + <IOAPIC enabled="true"/> + <Logo fadeIn="true" fadeOut="true" displayTime="0"/> + <BootMenu mode="MessageAndMenu"/> + <TimeOffset value="0"/> + <PXEDebug enabled="false"/> + </BIOS> + <USB> + <Controllers/> + <DeviceFilters/> + </USB> + <Network> + <Adapter slot="0" enabled="true" MACAddress="0800272A589D" cable="true" speed="0" type="82540EM"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + <InternalNetwork name="intnet"/> + <NATNetwork name="NatNetwork"/> + </DisabledModes> + <BridgedInterface name="hns0000000v"/> + </Adapter> + <Adapter slot="1" enabled="false" MACAddress="0800276B5197" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="2" enabled="false" MACAddress="080027A346C9" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="3" enabled="false" MACAddress="08002749A665" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="4" enabled="false" MACAddress="0800273246C6" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="5" enabled="false" MACAddress="080027B0B358" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="6" enabled="false" MACAddress="080027BF23E5" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="7" enabled="false" MACAddress="080027BEE078" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + </Network> + <UART> + <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> + <Port slot="1" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> + </UART> + <LPT> + <Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/> + <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/> + </LPT> + <AudioAdapter controller="AC97" driver="Pulse" enabled="false"/> + <RTC localOrUTC="local"/> + <SharedFolders/> + <Clipboard mode="Disabled"/> + <DragAndDrop mode="Disabled"/> + <IO> + <IoCache enabled="true" size="5"/> + <BandwidthGroups/> + </IO> + <HostPci> + <Devices/> + </HostPci> + <EmulatedUSB> + <CardReader enabled="false"/> + </EmulatedUSB> + <Guest memoryBalloonSize="0"/> + <GuestProperties/> + </Hardware> <StorageControllers> - <StorageController name="IDE Controller" type="PIIX4" PortCount="2" useHostIOCache="true" Bootable="true"> - <AttachedDevice type="HardDisk" port="0" device="0"> - <Image uuid="{105122e9-f6d2-42c1-9c11-c01699c79517}"/> - </AttachedDevice> - <AttachedDevice type="HardDisk" port="0" device="1"> - <Image uuid="{f113fdf8-9750-4557-a8be-87fd02319071}"/> - </AttachedDevice> - </StorageController> - <StorageController name="SATA Controller" type="AHCI" PortCount="30" useHostIOCache="false" Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3"/> - <StorageController name="SCSI Controller" type="LsiLogic" PortCount="16" useHostIOCache="false" Bootable="true"/> - <StorageController name="Floppy Controller" type="I82078" PortCount="1" useHostIOCache="true" Bootable="true"/> - </StorageControllers> + <StorageController name="IDE Controller" type="PIIX4" PortCount="2" useHostIOCache="true" Bootable="true"> + <AttachedDevice type="HardDisk" port="0" device="0"> + <Image uuid="{105122e9-f6d2-42c1-9c11-c01699c79517}"/> + </AttachedDevice> + <AttachedDevice type="HardDisk" port="0" device="1"> + <Image uuid="{f113fdf8-9750-4557-a8be-87fd02319071}"/> + </AttachedDevice> + </StorageController> + <StorageController name="SATA Controller" type="AHCI" PortCount="30" useHostIOCache="false" Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3"/> + <StorageController name="SCSI Controller" type="LsiLogic" PortCount="16" useHostIOCache="false" Bootable="true"/> + <StorageController name="Floppy Controller" type="I82078" PortCount="1" useHostIOCache="true" Bootable="true"/> + </StorageControllers> <Snapshots> <Snapshot uuid="{94afa063-9281-4e15-b586-a5e1fc5e17bf}" name="15052014-115248" timeStamp="2014-05-15T09:52:49Z"> <Hardware version="2"> - <CPU count="1" hotplug="false"> - <HardwareVirtEx enabled="true"/> - <HardwareVirtExNestedPaging enabled="true"/> - <HardwareVirtExVPID enabled="true"/> - <HardwareVirtExUX enabled="true"/> - <PAE enabled="false"/> - <LongMode enabled="true"/> - <HardwareVirtExLargePages enabled="false"/> - <HardwareVirtForce enabled="false"/> - </CPU> - <Memory RAMSize="192" PageFusion="false"/> - <HID Pointing="PS2Mouse" Keyboard="PS2Keyboard"/> - <HPET enabled="false"/> - <Chipset type="PIIX3"/> - <Boot> - <Order position="1" device="HardDisk"/> - <Order position="2" device="None"/> - <Order position="3" device="None"/> - <Order position="4" device="None"/> - </Boot> - <Display VRAMSize="8" monitorCount="1" accelerate3D="false" accelerate2DVideo="false"/> - <VideoCapture enabled="false" screens="18446744073709551615" horzRes="1024" vertRes="768" rate="512" fps="25"/> - <RemoteDisplay enabled="true" authType="Null" allowMultiConnection="true"> - <VRDEProperties> - <Property name="TCP/Ports" value="5900"/> - </VRDEProperties> - </RemoteDisplay> - <BIOS> - <ACPI enabled="true"/> - <IOAPIC enabled="true"/> - <Logo fadeIn="true" fadeOut="true" displayTime="0"/> - <BootMenu mode="MessageAndMenu"/> - <TimeOffset value="0"/> - <PXEDebug enabled="false"/> - </BIOS> - <USB> - <Controllers/> - <DeviceFilters/> - </USB> - <Network> - <Adapter slot="0" enabled="true" MACAddress="0800272A589D" cable="true" speed="0" type="82540EM"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - <InternalNetwork name="intnet"/> - <NATNetwork name="NatNetwork"/> - </DisabledModes> - <BridgedInterface name="hns0000000v"/> - </Adapter> - <Adapter slot="1" enabled="false" MACAddress="0800276B5197" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="2" enabled="false" MACAddress="080027A346C9" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="3" enabled="false" MACAddress="08002749A665" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="4" enabled="false" MACAddress="0800273246C6" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="5" enabled="false" MACAddress="080027B0B358" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="6" enabled="false" MACAddress="080027BF23E5" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="7" enabled="false" MACAddress="080027BEE078" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - </Network> - <UART> - <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> - <Port slot="1" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> - </UART> - <LPT> - <Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/> - <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/> - </LPT> - <AudioAdapter controller="AC97" driver="Pulse" enabled="false"/> - <RTC localOrUTC="local"/> - <SharedFolders/> - <Clipboard mode="Disabled"/> - <DragAndDrop mode="Disabled"/> - <IO> - <IoCache enabled="true" size="5"/> - <BandwidthGroups/> - </IO> - <HostPci> - <Devices/> - </HostPci> - <EmulatedUSB> - <CardReader enabled="false"/> - </EmulatedUSB> - <Guest memoryBalloonSize="0"/> - <GuestProperties/> - </Hardware> + <CPU count="1" hotplug="false"> + <HardwareVirtEx enabled="true"/> + <HardwareVirtExNestedPaging enabled="true"/> + <HardwareVirtExVPID enabled="true"/> + <HardwareVirtExUX enabled="true"/> + <PAE enabled="false"/> + <LongMode enabled="true"/> + <HardwareVirtExLargePages enabled="false"/> + <HardwareVirtForce enabled="false"/> + </CPU> + <Memory RAMSize="192" PageFusion="false"/> + <HID Pointing="PS2Mouse" Keyboard="PS2Keyboard"/> + <HPET enabled="false"/> + <Chipset type="PIIX3"/> + <Boot> + <Order position="1" device="HardDisk"/> + <Order position="2" device="None"/> + <Order position="3" device="None"/> + <Order position="4" device="None"/> + </Boot> + <Display VRAMSize="8" monitorCount="1" accelerate3D="false" accelerate2DVideo="false"/> + <VideoCapture enabled="false" screens="18446744073709551615" horzRes="1024" vertRes="768" rate="512" fps="25"/> + <RemoteDisplay enabled="true" authType="Null" allowMultiConnection="true"> + <VRDEProperties> + <Property name="TCP/Ports" value="5900"/> + </VRDEProperties> + </RemoteDisplay> + <BIOS> + <ACPI enabled="true"/> + <IOAPIC enabled="true"/> + <Logo fadeIn="true" fadeOut="true" displayTime="0"/> + <BootMenu mode="MessageAndMenu"/> + <TimeOffset value="0"/> + <PXEDebug enabled="false"/> + </BIOS> + <USB> + <Controllers/> + <DeviceFilters/> + </USB> + <Network> + <Adapter slot="0" enabled="true" MACAddress="0800272A589D" cable="true" speed="0" type="82540EM"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + <InternalNetwork name="intnet"/> + <NATNetwork name="NatNetwork"/> + </DisabledModes> + <BridgedInterface name="hns0000000v"/> + </Adapter> + <Adapter slot="1" enabled="false" MACAddress="0800276B5197" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="2" enabled="false" MACAddress="080027A346C9" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="3" enabled="false" MACAddress="08002749A665" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="4" enabled="false" MACAddress="0800273246C6" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="5" enabled="false" MACAddress="080027B0B358" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="6" enabled="false" MACAddress="080027BF23E5" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="7" enabled="false" MACAddress="080027BEE078" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + </Network> + <UART> + <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> + <Port slot="1" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> + </UART> + <LPT> + <Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/> + <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/> + </LPT> + <AudioAdapter controller="AC97" driver="Pulse" enabled="false"/> + <RTC localOrUTC="local"/> + <SharedFolders/> + <Clipboard mode="Disabled"/> + <DragAndDrop mode="Disabled"/> + <IO> + <IoCache enabled="true" size="5"/> + <BandwidthGroups/> + </IO> + <HostPci> + <Devices/> + </HostPci> + <EmulatedUSB> + <CardReader enabled="false"/> + </EmulatedUSB> + <Guest memoryBalloonSize="0"/> + <GuestProperties/> + </Hardware> <StorageControllers> - <StorageController name="IDE Controller" type="PIIX4" PortCount="2" useHostIOCache="true" Bootable="true"> - <AttachedDevice type="HardDisk" port="0" device="0"> - <Image uuid="{de551924-a484-4f88-9897-c3c4986b8f75}"/> - </AttachedDevice> - <AttachedDevice type="HardDisk" port="0" device="1"> - <Image uuid="{72638d05-918a-43e8-9994-dcc9a3e2f2fe}"/> - </AttachedDevice> - </StorageController> - <StorageController name="SATA Controller" type="AHCI" PortCount="30" useHostIOCache="false" Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3"/> - <StorageController name="SCSI Controller" type="LsiLogic" PortCount="16" useHostIOCache="false" Bootable="true"/> - <StorageController name="Floppy Controller" type="I82078" PortCount="1" useHostIOCache="true" Bootable="true"/> - </StorageControllers> + <StorageController name="IDE Controller" type="PIIX4" PortCount="2" useHostIOCache="true" Bootable="true"> + <AttachedDevice type="HardDisk" port="0" device="0"> + <Image uuid="{de551924-a484-4f88-9897-c3c4986b8f75}"/> + </AttachedDevice> + <AttachedDevice type="HardDisk" port="0" device="1"> + <Image uuid="{72638d05-918a-43e8-9994-dcc9a3e2f2fe}"/> + </AttachedDevice> + </StorageController> + <StorageController name="SATA Controller" type="AHCI" PortCount="30" useHostIOCache="false" Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3"/> + <StorageController name="SCSI Controller" type="LsiLogic" PortCount="16" useHostIOCache="false" Bootable="true"/> + <StorageController name="Floppy Controller" type="I82078" PortCount="1" useHostIOCache="true" Bootable="true"/> + </StorageControllers> </Snapshot> </Snapshots> </Snapshot> diff --git a/tests/vboxsnapshotxmldata/2disks-3snap-brother.vbox b/tests/vboxsnapshotxmldata/2disks-3snap-brother.vbox index b5472f9..c5c43b6 100644 --- a/tests/vboxsnapshotxmldata/2disks-3snap-brother.vbox +++ b/tests/vboxsnapshotxmldata/2disks-3snap-brother.vbox @@ -630,153 +630,153 @@ or other application using the libvirt API--> </Snapshot> <Snapshot uuid="{5d8b609b-f5af-4025-8aca-220480fa6394}" name="15052014-115334" timeStamp="2014-05-15T09:53:35Z"> <Hardware version="2"> - <CPU count="1" hotplug="false"> - <HardwareVirtEx enabled="true"/> - <HardwareVirtExNestedPaging enabled="true"/> - <HardwareVirtExVPID enabled="true"/> - <HardwareVirtExUX enabled="true"/> - <PAE enabled="false"/> - <LongMode enabled="true"/> - <HardwareVirtExLargePages enabled="false"/> - <HardwareVirtForce enabled="false"/> - </CPU> - <Memory RAMSize="192" PageFusion="false"/> - <HID Pointing="PS2Mouse" Keyboard="PS2Keyboard"/> - <HPET enabled="false"/> - <Chipset type="PIIX3"/> - <Boot> - <Order position="1" device="HardDisk"/> - <Order position="2" device="None"/> - <Order position="3" device="None"/> - <Order position="4" device="None"/> - </Boot> - <Display VRAMSize="8" monitorCount="1" accelerate3D="false" accelerate2DVideo="false"/> - <VideoCapture enabled="false" screens="18446744073709551615" horzRes="1024" vertRes="768" rate="512" fps="25"/> - <RemoteDisplay enabled="true" authType="Null" authTimeout="5000" allowMultiConnection="true"> - <VRDEProperties> - <Property name="TCP/Ports" value="5900"/> - </VRDEProperties> - </RemoteDisplay> - <BIOS> - <ACPI enabled="true"/> - <IOAPIC enabled="true"/> - <Logo fadeIn="true" fadeOut="true" displayTime="0"/> - <BootMenu mode="MessageAndMenu"/> - <TimeOffset value="0"/> - <PXEDebug enabled="false"/> - </BIOS> - <USB> - <Controllers/> - <DeviceFilters/> - </USB> - <Network> - <Adapter slot="0" enabled="true" MACAddress="0800272A589D" cable="true" speed="0" type="82540EM"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - <InternalNetwork name="intnet"/> - <NATNetwork name="NatNetwork"/> - </DisabledModes> - <BridgedInterface name="hns0000000v"/> - </Adapter> - <Adapter slot="1" enabled="false" MACAddress="0800276B5197" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="2" enabled="false" MACAddress="080027A346C9" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="3" enabled="false" MACAddress="08002749A665" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="4" enabled="false" MACAddress="0800273246C6" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="5" enabled="false" MACAddress="080027B0B358" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="6" enabled="false" MACAddress="080027BF23E5" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="7" enabled="false" MACAddress="080027BEE078" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - </Network> - <UART> - <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> - <Port slot="1" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> - </UART> - <LPT> - <Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/> - <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/> - </LPT> - <AudioAdapter controller="AC97" driver="Pulse" enabled="false"/> - <RTC localOrUTC="local"/> - <SharedFolders/> - <Clipboard mode="Disabled"/> - <DragAndDrop mode="Disabled"/> - <IO> - <IoCache enabled="true" size="5"/> - <BandwidthGroups/> - </IO> - <HostPci> - <Devices/> - </HostPci> - <EmulatedUSB> - <CardReader enabled="false"/> - </EmulatedUSB> - <Guest memoryBalloonSize="0"/> - <GuestProperties/> - </Hardware> + <CPU count="1" hotplug="false"> + <HardwareVirtEx enabled="true"/> + <HardwareVirtExNestedPaging enabled="true"/> + <HardwareVirtExVPID enabled="true"/> + <HardwareVirtExUX enabled="true"/> + <PAE enabled="false"/> + <LongMode enabled="true"/> + <HardwareVirtExLargePages enabled="false"/> + <HardwareVirtForce enabled="false"/> + </CPU> + <Memory RAMSize="192" PageFusion="false"/> + <HID Pointing="PS2Mouse" Keyboard="PS2Keyboard"/> + <HPET enabled="false"/> + <Chipset type="PIIX3"/> + <Boot> + <Order position="1" device="HardDisk"/> + <Order position="2" device="None"/> + <Order position="3" device="None"/> + <Order position="4" device="None"/> + </Boot> + <Display VRAMSize="8" monitorCount="1" accelerate3D="false" accelerate2DVideo="false"/> + <VideoCapture enabled="false" screens="18446744073709551615" horzRes="1024" vertRes="768" rate="512" fps="25"/> + <RemoteDisplay enabled="true" authType="Null" authTimeout="5000" allowMultiConnection="true"> + <VRDEProperties> + <Property name="TCP/Ports" value="5900"/> + </VRDEProperties> + </RemoteDisplay> + <BIOS> + <ACPI enabled="true"/> + <IOAPIC enabled="true"/> + <Logo fadeIn="true" fadeOut="true" displayTime="0"/> + <BootMenu mode="MessageAndMenu"/> + <TimeOffset value="0"/> + <PXEDebug enabled="false"/> + </BIOS> + <USB> + <Controllers/> + <DeviceFilters/> + </USB> + <Network> + <Adapter slot="0" enabled="true" MACAddress="0800272A589D" cable="true" speed="0" type="82540EM"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + <InternalNetwork name="intnet"/> + <NATNetwork name="NatNetwork"/> + </DisabledModes> + <BridgedInterface name="hns0000000v"/> + </Adapter> + <Adapter slot="1" enabled="false" MACAddress="0800276B5197" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="2" enabled="false" MACAddress="080027A346C9" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="3" enabled="false" MACAddress="08002749A665" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="4" enabled="false" MACAddress="0800273246C6" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="5" enabled="false" MACAddress="080027B0B358" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="6" enabled="false" MACAddress="080027BF23E5" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="7" enabled="false" MACAddress="080027BEE078" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + </Network> + <UART> + <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> + <Port slot="1" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> + </UART> + <LPT> + <Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/> + <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/> + </LPT> + <AudioAdapter controller="AC97" driver="Pulse" enabled="false"/> + <RTC localOrUTC="local"/> + <SharedFolders/> + <Clipboard mode="Disabled"/> + <DragAndDrop mode="Disabled"/> + <IO> + <IoCache enabled="true" size="5"/> + <BandwidthGroups/> + </IO> + <HostPci> + <Devices/> + </HostPci> + <EmulatedUSB> + <CardReader enabled="false"/> + </EmulatedUSB> + <Guest memoryBalloonSize="0"/> + <GuestProperties/> + </Hardware> <StorageControllers> - <StorageController name="IDE Controller" type="PIIX4" PortCount="2" useHostIOCache="true" Bootable="true"> - <AttachedDevice type="HardDisk" port="0" device="0"> - <Image uuid="{bf3ea5d4-fcb3-4cfe-b289-9d605fc94c3b}"/> - </AttachedDevice> - <AttachedDevice type="HardDisk" port="0" device="1"> - <Image uuid="{18394ad4-fad9-4cb7-9de9-7477a93aab08}"/> - </AttachedDevice> - </StorageController> - <StorageController name="SATA Controller" type="AHCI" PortCount="30" useHostIOCache="false" Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3"/> - <StorageController name="SCSI Controller" type="LsiLogic" PortCount="16" useHostIOCache="false" Bootable="true"/> - <StorageController name="Floppy Controller" type="I82078" PortCount="1" useHostIOCache="true" Bootable="true"/> - </StorageControllers> + <StorageController name="IDE Controller" type="PIIX4" PortCount="2" useHostIOCache="true" Bootable="true"> + <AttachedDevice type="HardDisk" port="0" device="0"> + <Image uuid="{bf3ea5d4-fcb3-4cfe-b289-9d605fc94c3b}"/> + </AttachedDevice> + <AttachedDevice type="HardDisk" port="0" device="1"> + <Image uuid="{18394ad4-fad9-4cb7-9de9-7477a93aab08}"/> + </AttachedDevice> + </StorageController> + <StorageController name="SATA Controller" type="AHCI" PortCount="30" useHostIOCache="false" Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3"/> + <StorageController name="SCSI Controller" type="LsiLogic" PortCount="16" useHostIOCache="false" Bootable="true"/> + <StorageController name="Floppy Controller" type="I82078" PortCount="1" useHostIOCache="true" Bootable="true"/> + </StorageControllers> </Snapshot> </Snapshots> </Snapshot> diff --git a/tests/vboxsnapshotxmldata/2disks-3snap.vbox b/tests/vboxsnapshotxmldata/2disks-3snap.vbox index 2fb6fe7..4dd2ebd 100644 --- a/tests/vboxsnapshotxmldata/2disks-3snap.vbox +++ b/tests/vboxsnapshotxmldata/2disks-3snap.vbox @@ -180,453 +180,453 @@ or other application using the libvirt API--> </StorageControllers> <Snapshot uuid="{364c7314-b2d9-4fcf-b786-47b987449ef7}" name="15052014-115228" timeStamp="2014-05-15T09:52:29Z"> <Hardware version="2"> - <CPU count="1" hotplug="false"> - <HardwareVirtEx enabled="true"/> - <HardwareVirtExNestedPaging enabled="true"/> - <HardwareVirtExVPID enabled="true"/> - <HardwareVirtExUX enabled="true"/> - <PAE enabled="false"/> - <LongMode enabled="true"/> - <HardwareVirtExLargePages enabled="false"/> - <HardwareVirtForce enabled="false"/> - </CPU> - <Memory RAMSize="192" PageFusion="false"/> - <HID Pointing="PS2Mouse" Keyboard="PS2Keyboard"/> - <HPET enabled="false"/> - <Chipset type="PIIX3"/> - <Boot> - <Order position="1" device="HardDisk"/> - <Order position="2" device="None"/> - <Order position="3" device="None"/> - <Order position="4" device="None"/> - </Boot> - <Display VRAMSize="8" monitorCount="1" accelerate3D="false" accelerate2DVideo="false"/> - <VideoCapture enabled="false" screens="18446744073709551615" horzRes="1024" vertRes="768" rate="512" fps="25"/> - <RemoteDisplay enabled="true" authType="Null" allowMultiConnection="true"> - <VRDEProperties> - <Property name="TCP/Ports" value="5900"/> - </VRDEProperties> - </RemoteDisplay> - <BIOS> - <ACPI enabled="true"/> - <IOAPIC enabled="true"/> - <Logo fadeIn="true" fadeOut="true" displayTime="0"/> - <BootMenu mode="MessageAndMenu"/> - <TimeOffset value="0"/> - <PXEDebug enabled="false"/> - </BIOS> - <USB> - <Controllers/> - <DeviceFilters/> - </USB> - <Network> - <Adapter slot="0" enabled="true" MACAddress="0800272A589D" cable="true" speed="0" type="82540EM"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - <InternalNetwork name="intnet"/> - <NATNetwork name="NatNetwork"/> - </DisabledModes> - <BridgedInterface name="hns0000000v"/> - </Adapter> - <Adapter slot="1" enabled="false" MACAddress="0800276B5197" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="2" enabled="false" MACAddress="080027A346C9" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="3" enabled="false" MACAddress="08002749A665" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="4" enabled="false" MACAddress="0800273246C6" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="5" enabled="false" MACAddress="080027B0B358" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="6" enabled="false" MACAddress="080027BF23E5" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="7" enabled="false" MACAddress="080027BEE078" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - </Network> - <UART> - <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> - <Port slot="1" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> - </UART> - <LPT> - <Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/> - <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/> - </LPT> - <AudioAdapter controller="AC97" driver="Pulse" enabled="false"/> - <RTC localOrUTC="local"/> - <SharedFolders/> - <Clipboard mode="Disabled"/> - <DragAndDrop mode="Disabled"/> - <IO> - <IoCache enabled="true" size="5"/> - <BandwidthGroups/> - </IO> - <HostPci> - <Devices/> - </HostPci> - <EmulatedUSB> - <CardReader enabled="false"/> - </EmulatedUSB> - <Guest memoryBalloonSize="0"/> - <GuestProperties/> - </Hardware> + <CPU count="1" hotplug="false"> + <HardwareVirtEx enabled="true"/> + <HardwareVirtExNestedPaging enabled="true"/> + <HardwareVirtExVPID enabled="true"/> + <HardwareVirtExUX enabled="true"/> + <PAE enabled="false"/> + <LongMode enabled="true"/> + <HardwareVirtExLargePages enabled="false"/> + <HardwareVirtForce enabled="false"/> + </CPU> + <Memory RAMSize="192" PageFusion="false"/> + <HID Pointing="PS2Mouse" Keyboard="PS2Keyboard"/> + <HPET enabled="false"/> + <Chipset type="PIIX3"/> + <Boot> + <Order position="1" device="HardDisk"/> + <Order position="2" device="None"/> + <Order position="3" device="None"/> + <Order position="4" device="None"/> + </Boot> + <Display VRAMSize="8" monitorCount="1" accelerate3D="false" accelerate2DVideo="false"/> + <VideoCapture enabled="false" screens="18446744073709551615" horzRes="1024" vertRes="768" rate="512" fps="25"/> + <RemoteDisplay enabled="true" authType="Null" allowMultiConnection="true"> + <VRDEProperties> + <Property name="TCP/Ports" value="5900"/> + </VRDEProperties> + </RemoteDisplay> + <BIOS> + <ACPI enabled="true"/> + <IOAPIC enabled="true"/> + <Logo fadeIn="true" fadeOut="true" displayTime="0"/> + <BootMenu mode="MessageAndMenu"/> + <TimeOffset value="0"/> + <PXEDebug enabled="false"/> + </BIOS> + <USB> + <Controllers/> + <DeviceFilters/> + </USB> + <Network> + <Adapter slot="0" enabled="true" MACAddress="0800272A589D" cable="true" speed="0" type="82540EM"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + <InternalNetwork name="intnet"/> + <NATNetwork name="NatNetwork"/> + </DisabledModes> + <BridgedInterface name="hns0000000v"/> + </Adapter> + <Adapter slot="1" enabled="false" MACAddress="0800276B5197" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="2" enabled="false" MACAddress="080027A346C9" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="3" enabled="false" MACAddress="08002749A665" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="4" enabled="false" MACAddress="0800273246C6" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="5" enabled="false" MACAddress="080027B0B358" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="6" enabled="false" MACAddress="080027BF23E5" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="7" enabled="false" MACAddress="080027BEE078" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + </Network> + <UART> + <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> + <Port slot="1" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> + </UART> + <LPT> + <Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/> + <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/> + </LPT> + <AudioAdapter controller="AC97" driver="Pulse" enabled="false"/> + <RTC localOrUTC="local"/> + <SharedFolders/> + <Clipboard mode="Disabled"/> + <DragAndDrop mode="Disabled"/> + <IO> + <IoCache enabled="true" size="5"/> + <BandwidthGroups/> + </IO> + <HostPci> + <Devices/> + </HostPci> + <EmulatedUSB> + <CardReader enabled="false"/> + </EmulatedUSB> + <Guest memoryBalloonSize="0"/> + <GuestProperties/> + </Hardware> <StorageControllers> - <StorageController name="IDE Controller" type="PIIX4" PortCount="2" useHostIOCache="true" Bootable="true"> - <AttachedDevice type="HardDisk" port="0" device="0"> - <Image uuid="{105122e9-f6d2-42c1-9c11-c01699c79517}"/> - </AttachedDevice> - <AttachedDevice type="HardDisk" port="0" device="1"> - <Image uuid="{f113fdf8-9750-4557-a8be-87fd02319071}"/> - </AttachedDevice> - </StorageController> - <StorageController name="SATA Controller" type="AHCI" PortCount="30" useHostIOCache="false" Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3"/> - <StorageController name="SCSI Controller" type="LsiLogic" PortCount="16" useHostIOCache="false" Bootable="true"/> - <StorageController name="Floppy Controller" type="I82078" PortCount="1" useHostIOCache="true" Bootable="true"/> - </StorageControllers> + <StorageController name="IDE Controller" type="PIIX4" PortCount="2" useHostIOCache="true" Bootable="true"> + <AttachedDevice type="HardDisk" port="0" device="0"> + <Image uuid="{105122e9-f6d2-42c1-9c11-c01699c79517}"/> + </AttachedDevice> + <AttachedDevice type="HardDisk" port="0" device="1"> + <Image uuid="{f113fdf8-9750-4557-a8be-87fd02319071}"/> + </AttachedDevice> + </StorageController> + <StorageController name="SATA Controller" type="AHCI" PortCount="30" useHostIOCache="false" Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3"/> + <StorageController name="SCSI Controller" type="LsiLogic" PortCount="16" useHostIOCache="false" Bootable="true"/> + <StorageController name="Floppy Controller" type="I82078" PortCount="1" useHostIOCache="true" Bootable="true"/> + </StorageControllers> <Snapshots> <Snapshot uuid="{94afa063-9281-4e15-b586-a5e1fc5e17bf}" name="15052014-115248" timeStamp="2014-05-15T09:52:49Z"> <Hardware version="2"> - <CPU count="1" hotplug="false"> - <HardwareVirtEx enabled="true"/> - <HardwareVirtExNestedPaging enabled="true"/> - <HardwareVirtExVPID enabled="true"/> - <HardwareVirtExUX enabled="true"/> - <PAE enabled="false"/> - <LongMode enabled="true"/> - <HardwareVirtExLargePages enabled="false"/> - <HardwareVirtForce enabled="false"/> - </CPU> - <Memory RAMSize="192" PageFusion="false"/> - <HID Pointing="PS2Mouse" Keyboard="PS2Keyboard"/> - <HPET enabled="false"/> - <Chipset type="PIIX3"/> - <Boot> - <Order position="1" device="HardDisk"/> - <Order position="2" device="None"/> - <Order position="3" device="None"/> - <Order position="4" device="None"/> - </Boot> - <Display VRAMSize="8" monitorCount="1" accelerate3D="false" accelerate2DVideo="false"/> - <VideoCapture enabled="false" screens="18446744073709551615" horzRes="1024" vertRes="768" rate="512" fps="25"/> - <RemoteDisplay enabled="true" authType="Null" allowMultiConnection="true"> - <VRDEProperties> - <Property name="TCP/Ports" value="5900"/> - </VRDEProperties> - </RemoteDisplay> - <BIOS> - <ACPI enabled="true"/> - <IOAPIC enabled="true"/> - <Logo fadeIn="true" fadeOut="true" displayTime="0"/> - <BootMenu mode="MessageAndMenu"/> - <TimeOffset value="0"/> - <PXEDebug enabled="false"/> - </BIOS> - <USB> - <Controllers/> - <DeviceFilters/> - </USB> - <Network> - <Adapter slot="0" enabled="true" MACAddress="0800272A589D" cable="true" speed="0" type="82540EM"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - <InternalNetwork name="intnet"/> - <NATNetwork name="NatNetwork"/> - </DisabledModes> - <BridgedInterface name="hns0000000v"/> - </Adapter> - <Adapter slot="1" enabled="false" MACAddress="0800276B5197" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="2" enabled="false" MACAddress="080027A346C9" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="3" enabled="false" MACAddress="08002749A665" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="4" enabled="false" MACAddress="0800273246C6" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="5" enabled="false" MACAddress="080027B0B358" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="6" enabled="false" MACAddress="080027BF23E5" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="7" enabled="false" MACAddress="080027BEE078" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - </Network> - <UART> - <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> - <Port slot="1" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> - </UART> - <LPT> - <Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/> - <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/> - </LPT> - <AudioAdapter controller="AC97" driver="Pulse" enabled="false"/> - <RTC localOrUTC="local"/> - <SharedFolders/> - <Clipboard mode="Disabled"/> - <DragAndDrop mode="Disabled"/> - <IO> - <IoCache enabled="true" size="5"/> - <BandwidthGroups/> - </IO> - <HostPci> - <Devices/> - </HostPci> - <EmulatedUSB> - <CardReader enabled="false"/> - </EmulatedUSB> - <Guest memoryBalloonSize="0"/> - <GuestProperties/> - </Hardware> + <CPU count="1" hotplug="false"> + <HardwareVirtEx enabled="true"/> + <HardwareVirtExNestedPaging enabled="true"/> + <HardwareVirtExVPID enabled="true"/> + <HardwareVirtExUX enabled="true"/> + <PAE enabled="false"/> + <LongMode enabled="true"/> + <HardwareVirtExLargePages enabled="false"/> + <HardwareVirtForce enabled="false"/> + </CPU> + <Memory RAMSize="192" PageFusion="false"/> + <HID Pointing="PS2Mouse" Keyboard="PS2Keyboard"/> + <HPET enabled="false"/> + <Chipset type="PIIX3"/> + <Boot> + <Order position="1" device="HardDisk"/> + <Order position="2" device="None"/> + <Order position="3" device="None"/> + <Order position="4" device="None"/> + </Boot> + <Display VRAMSize="8" monitorCount="1" accelerate3D="false" accelerate2DVideo="false"/> + <VideoCapture enabled="false" screens="18446744073709551615" horzRes="1024" vertRes="768" rate="512" fps="25"/> + <RemoteDisplay enabled="true" authType="Null" allowMultiConnection="true"> + <VRDEProperties> + <Property name="TCP/Ports" value="5900"/> + </VRDEProperties> + </RemoteDisplay> + <BIOS> + <ACPI enabled="true"/> + <IOAPIC enabled="true"/> + <Logo fadeIn="true" fadeOut="true" displayTime="0"/> + <BootMenu mode="MessageAndMenu"/> + <TimeOffset value="0"/> + <PXEDebug enabled="false"/> + </BIOS> + <USB> + <Controllers/> + <DeviceFilters/> + </USB> + <Network> + <Adapter slot="0" enabled="true" MACAddress="0800272A589D" cable="true" speed="0" type="82540EM"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + <InternalNetwork name="intnet"/> + <NATNetwork name="NatNetwork"/> + </DisabledModes> + <BridgedInterface name="hns0000000v"/> + </Adapter> + <Adapter slot="1" enabled="false" MACAddress="0800276B5197" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="2" enabled="false" MACAddress="080027A346C9" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="3" enabled="false" MACAddress="08002749A665" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="4" enabled="false" MACAddress="0800273246C6" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="5" enabled="false" MACAddress="080027B0B358" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="6" enabled="false" MACAddress="080027BF23E5" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="7" enabled="false" MACAddress="080027BEE078" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + </Network> + <UART> + <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> + <Port slot="1" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> + </UART> + <LPT> + <Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/> + <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/> + </LPT> + <AudioAdapter controller="AC97" driver="Pulse" enabled="false"/> + <RTC localOrUTC="local"/> + <SharedFolders/> + <Clipboard mode="Disabled"/> + <DragAndDrop mode="Disabled"/> + <IO> + <IoCache enabled="true" size="5"/> + <BandwidthGroups/> + </IO> + <HostPci> + <Devices/> + </HostPci> + <EmulatedUSB> + <CardReader enabled="false"/> + </EmulatedUSB> + <Guest memoryBalloonSize="0"/> + <GuestProperties/> + </Hardware> <StorageControllers> - <StorageController name="IDE Controller" type="PIIX4" PortCount="2" useHostIOCache="true" Bootable="true"> - <AttachedDevice type="HardDisk" port="0" device="0"> - <Image uuid="{de551924-a484-4f88-9897-c3c4986b8f75}"/> - </AttachedDevice> - <AttachedDevice type="HardDisk" port="0" device="1"> - <Image uuid="{72638d05-918a-43e8-9994-dcc9a3e2f2fe}"/> - </AttachedDevice> - </StorageController> - <StorageController name="SATA Controller" type="AHCI" PortCount="30" useHostIOCache="false" Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3"/> - <StorageController name="SCSI Controller" type="LsiLogic" PortCount="16" useHostIOCache="false" Bootable="true"/> - <StorageController name="Floppy Controller" type="I82078" PortCount="1" useHostIOCache="true" Bootable="true"/> - </StorageControllers> + <StorageController name="IDE Controller" type="PIIX4" PortCount="2" useHostIOCache="true" Bootable="true"> + <AttachedDevice type="HardDisk" port="0" device="0"> + <Image uuid="{de551924-a484-4f88-9897-c3c4986b8f75}"/> + </AttachedDevice> + <AttachedDevice type="HardDisk" port="0" device="1"> + <Image uuid="{72638d05-918a-43e8-9994-dcc9a3e2f2fe}"/> + </AttachedDevice> + </StorageController> + <StorageController name="SATA Controller" type="AHCI" PortCount="30" useHostIOCache="false" Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3"/> + <StorageController name="SCSI Controller" type="LsiLogic" PortCount="16" useHostIOCache="false" Bootable="true"/> + <StorageController name="Floppy Controller" type="I82078" PortCount="1" useHostIOCache="true" Bootable="true"/> + </StorageControllers> <Snapshots> <Snapshot uuid="{574d0edf-0f9d-47ef-82e3-1b6d2d54a537}" name="15052014-115306" timeStamp="2014-05-15T09:53:06Z"> <Hardware version="2"> - <CPU count="1" hotplug="false"> - <HardwareVirtEx enabled="true"/> - <HardwareVirtExNestedPaging enabled="true"/> - <HardwareVirtExVPID enabled="true"/> - <HardwareVirtExUX enabled="true"/> - <PAE enabled="false"/> - <LongMode enabled="true"/> - <HardwareVirtExLargePages enabled="false"/> - <HardwareVirtForce enabled="false"/> - </CPU> - <Memory RAMSize="192" PageFusion="false"/> - <HID Pointing="PS2Mouse" Keyboard="PS2Keyboard"/> - <HPET enabled="false"/> - <Chipset type="PIIX3"/> - <Boot> - <Order position="1" device="HardDisk"/> - <Order position="2" device="None"/> - <Order position="3" device="None"/> - <Order position="4" device="None"/> - </Boot> - <Display VRAMSize="8" monitorCount="1" accelerate3D="false" accelerate2DVideo="false"/> - <VideoCapture enabled="false" screens="18446744073709551615" horzRes="1024" vertRes="768" rate="512" fps="25"/> - <RemoteDisplay enabled="true" authType="Null" allowMultiConnection="true"> - <VRDEProperties> - <Property name="TCP/Ports" value="5900"/> - </VRDEProperties> - </RemoteDisplay> - <BIOS> - <ACPI enabled="true"/> - <IOAPIC enabled="true"/> - <Logo fadeIn="true" fadeOut="true" displayTime="0"/> - <BootMenu mode="MessageAndMenu"/> - <TimeOffset value="0"/> - <PXEDebug enabled="false"/> - </BIOS> - <USB> - <Controllers/> - <DeviceFilters/> - </USB> - <Network> - <Adapter slot="0" enabled="true" MACAddress="0800272A589D" cable="true" speed="0" type="82540EM"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - <InternalNetwork name="intnet"/> - <NATNetwork name="NatNetwork"/> - </DisabledModes> - <BridgedInterface name="hns0000000v"/> - </Adapter> - <Adapter slot="1" enabled="false" MACAddress="0800276B5197" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="2" enabled="false" MACAddress="080027A346C9" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="3" enabled="false" MACAddress="08002749A665" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="4" enabled="false" MACAddress="0800273246C6" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="5" enabled="false" MACAddress="080027B0B358" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="6" enabled="false" MACAddress="080027BF23E5" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - <Adapter slot="7" enabled="false" MACAddress="080027BEE078" cable="true" speed="0" type="Am79C973"> - <DisabledModes> - <NAT> - <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> - <Alias logging="false" proxy-only="false" use-same-ports="false"/> - </NAT> - </DisabledModes> - </Adapter> - </Network> - <UART> - <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> - <Port slot="1" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> - </UART> - <LPT> - <Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/> - <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/> - </LPT> - <AudioAdapter controller="AC97" driver="Pulse" enabled="false"/> - <RTC localOrUTC="local"/> - <SharedFolders/> - <Clipboard mode="Disabled"/> - <DragAndDrop mode="Disabled"/> - <IO> - <IoCache enabled="true" size="5"/> - <BandwidthGroups/> - </IO> - <HostPci> - <Devices/> - </HostPci> - <EmulatedUSB> - <CardReader enabled="false"/> - </EmulatedUSB> - <Guest memoryBalloonSize="0"/> - <GuestProperties/> - </Hardware> + <CPU count="1" hotplug="false"> + <HardwareVirtEx enabled="true"/> + <HardwareVirtExNestedPaging enabled="true"/> + <HardwareVirtExVPID enabled="true"/> + <HardwareVirtExUX enabled="true"/> + <PAE enabled="false"/> + <LongMode enabled="true"/> + <HardwareVirtExLargePages enabled="false"/> + <HardwareVirtForce enabled="false"/> + </CPU> + <Memory RAMSize="192" PageFusion="false"/> + <HID Pointing="PS2Mouse" Keyboard="PS2Keyboard"/> + <HPET enabled="false"/> + <Chipset type="PIIX3"/> + <Boot> + <Order position="1" device="HardDisk"/> + <Order position="2" device="None"/> + <Order position="3" device="None"/> + <Order position="4" device="None"/> + </Boot> + <Display VRAMSize="8" monitorCount="1" accelerate3D="false" accelerate2DVideo="false"/> + <VideoCapture enabled="false" screens="18446744073709551615" horzRes="1024" vertRes="768" rate="512" fps="25"/> + <RemoteDisplay enabled="true" authType="Null" allowMultiConnection="true"> + <VRDEProperties> + <Property name="TCP/Ports" value="5900"/> + </VRDEProperties> + </RemoteDisplay> + <BIOS> + <ACPI enabled="true"/> + <IOAPIC enabled="true"/> + <Logo fadeIn="true" fadeOut="true" displayTime="0"/> + <BootMenu mode="MessageAndMenu"/> + <TimeOffset value="0"/> + <PXEDebug enabled="false"/> + </BIOS> + <USB> + <Controllers/> + <DeviceFilters/> + </USB> + <Network> + <Adapter slot="0" enabled="true" MACAddress="0800272A589D" cable="true" speed="0" type="82540EM"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + <InternalNetwork name="intnet"/> + <NATNetwork name="NatNetwork"/> + </DisabledModes> + <BridgedInterface name="hns0000000v"/> + </Adapter> + <Adapter slot="1" enabled="false" MACAddress="0800276B5197" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="2" enabled="false" MACAddress="080027A346C9" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="3" enabled="false" MACAddress="08002749A665" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="4" enabled="false" MACAddress="0800273246C6" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="5" enabled="false" MACAddress="080027B0B358" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="6" enabled="false" MACAddress="080027BF23E5" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + <Adapter slot="7" enabled="false" MACAddress="080027BEE078" cable="true" speed="0" type="Am79C973"> + <DisabledModes> + <NAT> + <DNS pass-domain="true" use-proxy="false" use-host-resolver="false"/> + <Alias logging="false" proxy-only="false" use-same-ports="false"/> + </NAT> + </DisabledModes> + </Adapter> + </Network> + <UART> + <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> + <Port slot="1" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/> + </UART> + <LPT> + <Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/> + <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/> + </LPT> + <AudioAdapter controller="AC97" driver="Pulse" enabled="false"/> + <RTC localOrUTC="local"/> + <SharedFolders/> + <Clipboard mode="Disabled"/> + <DragAndDrop mode="Disabled"/> + <IO> + <IoCache enabled="true" size="5"/> + <BandwidthGroups/> + </IO> + <HostPci> + <Devices/> + </HostPci> + <EmulatedUSB> + <CardReader enabled="false"/> + </EmulatedUSB> + <Guest memoryBalloonSize="0"/> + <GuestProperties/> + </Hardware> <StorageControllers> - <StorageController name="IDE Controller" type="PIIX4" PortCount="2" useHostIOCache="true" Bootable="true"> - <AttachedDevice type="HardDisk" port="0" device="0"> - <Image uuid="{55c4d273-380b-43c6-b394-b2636051cfc7}"/> - </AttachedDevice> - <AttachedDevice type="HardDisk" port="0" device="1"> - <Image uuid="{f9f1a347-e9b0-4ba3-bf5d-cfbccccf8c27}"/> - </AttachedDevice> - </StorageController> - <StorageController name="SATA Controller" type="AHCI" PortCount="30" useHostIOCache="false" Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3"/> - <StorageController name="SCSI Controller" type="LsiLogic" PortCount="16" useHostIOCache="false" Bootable="true"/> - <StorageController name="Floppy Controller" type="I82078" PortCount="1" useHostIOCache="true" Bootable="true"/> - </StorageControllers> + <StorageController name="IDE Controller" type="PIIX4" PortCount="2" useHostIOCache="true" Bootable="true"> + <AttachedDevice type="HardDisk" port="0" device="0"> + <Image uuid="{55c4d273-380b-43c6-b394-b2636051cfc7}"/> + </AttachedDevice> + <AttachedDevice type="HardDisk" port="0" device="1"> + <Image uuid="{f9f1a347-e9b0-4ba3-bf5d-cfbccccf8c27}"/> + </AttachedDevice> + </StorageController> + <StorageController name="SATA Controller" type="AHCI" PortCount="30" useHostIOCache="false" Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3"/> + <StorageController name="SCSI Controller" type="LsiLogic" PortCount="16" useHostIOCache="false" Bootable="true"/> + <StorageController name="Floppy Controller" type="I82078" PortCount="1" useHostIOCache="true" Bootable="true"/> + </StorageControllers> </Snapshot> </Snapshots> </Snapshot> -- 1.8.5.5
On 06/18/14 14:29, Pavel Hrdina wrote:
On RHEL6 the vboxsnapshotxmltest fails because of wrong xml that is generated by libvirt. However the core issue is in the xml data itself with the wrong indentation.
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- tests/vboxsnapshotxmldata/2disks-1snap.vbox | 292 +++---- tests/vboxsnapshotxmldata/2disks-2snap.vbox | 584 +++++++------- .../vboxsnapshotxmldata/2disks-3snap-brother.vbox | 292 +++---- tests/vboxsnapshotxmldata/2disks-3snap.vbox | 876 ++++++++++----------- 4 files changed, 1022 insertions(+), 1022 deletions(-)
ACK, git show -b verifies that it's a whitespace only change Peter
The function 'xmlSaveFormatFileEnc' has a last option to set if you want to format dumped xml with whitespaces or not. Older libxml2, the one used in RHEL6, take this option as it is but newer libxml2 check this option if it's true or not. This small difference somehow makes things messy on RHEL6 and generated xml had extra new line and extra whitespaces. We should pass 1 instead if -1 because the -1 confuses the libxml2. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/vbox/vbox_snapshot_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 3f7ad78..7af1231 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -1211,7 +1211,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMachinePtr machine, } } - if (xmlSaveFormatFileEnc(filePath, xml, "ISO-8859-1", -1) < 0) { + if (xmlSaveFormatFileEnc(filePath, xml, "ISO-8859-1", 1) < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Unable to save the xml")); goto cleanup; -- 1.8.5.5
On 06/18/14 14:29, Pavel Hrdina wrote:
The function 'xmlSaveFormatFileEnc' has a last option to set if you want to format dumped xml with whitespaces or not.
Older libxml2, the one used in RHEL6, take this option as it is but newer libxml2 check this option if it's true or not. This small difference somehow makes things messy on RHEL6 and generated xml had extra new line and extra whitespaces.
We should pass 1 instead if -1 because the -1 confuses the libxml2.
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/vbox/vbox_snapshot_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
ACK, Peter
On 18.6.2014 15:11, Peter Krempa wrote:
On 06/18/14 14:29, Pavel Hrdina wrote:
The function 'xmlSaveFormatFileEnc' has a last option to set if you want to format dumped xml with whitespaces or not.
Older libxml2, the one used in RHEL6, take this option as it is but newer libxml2 check this option if it's true or not. This small difference somehow makes things messy on RHEL6 and generated xml had extra new line and extra whitespaces.
We should pass 1 instead if -1 because the -1 confuses the libxml2.
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/vbox/vbox_snapshot_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
ACK,
Peter
Thanks, pushed Pavel
participants (2)
-
Pavel Hrdina -
Peter Krempa