Attachment 676327 Details for Bug 890121 – rhel6.2.0 diff (generated from the data in the ODT file)

rhel6.2.0 diff (generated from the data in the ODT file)

r620.diff (text/plain), 11.95 KB, created by Eduardo Habkost on 2013-01-10 13:55:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eduardo Habkost

Created: 2013-01-10 13:55:05 UTC

Size: 11.95 KB

patch

obsolete

>--- r620host.txt	2012-12-26 14:47:56.796810547 -0200
>+++ r640host-r620machine.txt	2012-12-26 14:47:56.805810557 -0200
>@@ -1,5 +1,5 @@
>-# /usr/libexec/qemu-kvm -S -enable-kvm -m 1024 -smp 1,sockets=1,cores=1,threads=1 -name rhel6.1-64 -uuid 69f4aa4b-a575-348e-934b-0c27f138c735  -device sga -monitor stdio -rtc base=utc -no-shutdown -boot order=nc,menu=on -drive file=/home/disk.qcow2,if=none,id=drive-ide0-0-0,format=qcow2,cache=none -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0  -drive file=/home/boot.iso,id=drive-cdrom,format=raw,if=none,werror=stop,rerror=stop,media=cdrom -device ide-drive,drive=drive-cdrom,id=cdrom -netdev tap,id=hostnet0 -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8a:36:ae,bus=pci.0,addr=0x3 -netdev tap,id=hostnet1 -device e1000,netdev=hostnet1,id=net1,mac=52:54:00:8a:36:20,bus=pci.0,addr=0x4 -netdev tap,id=hostnet2 -device virtio-net-pci,netdev=hostnet2,id=net2,mac=52:54:00:8a:36:20,bus=pci.0,addr=0x5 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -device intel-hda,id=sound0,bus=pci.0,addr=0x6 -device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7 -device virtio-serial-pci,id=virtio-serial0,max_ports=16,bus=pci.0,addr=0x8 -chardev socket,id=channel0,host=127.0.0.1,port=12345,server,nowait -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=channel0,id=channel0,name=com.redhat.rhevm.vdsm -chardev spicevmc,id=charchannel1,name=vdagent -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=com.redhat.spice.0 -k en-us -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 -device usb-tablet,id=input0 -device  usb-hub,bus=usb.0,port=2,id=hub -device usb-storage,bus=usb.0,port=2.4,drive=drive-usb-2-0,id=usb-2-0,removable=on  -drive file=/home/usb.qcow2,if=none,id=drive-usb-2-0,media=disk,format=qcow2,cache=none,werror=stop,rerror=stop,aio=threads -device usb-kbd,id=kbd,port=2.1 -device usb-mouse,id=mouse,port=2.2 -device usb-ehci,id=ehci,bus=pci.0,addr=0x9 -device usb-storage,drive=drive-usb-0-0,id=usb-0-0,removable=on,bus=ehci.0,port=1  -drive  file=/home/usb-2.qcow2,if=none,id=drive-usb-0-0,media=disk,format=qcow2,cache=none,werror=stop,rerror=stop,aio=native -drive file=/home/disk-2.qcow2,if=none,id=drive-virtio0,format=qcow2,cache=none,rerror=stop,werror=stop -device virtio-blk-pci,bus=pci.0,addr=0xa,drive=drive-virtio0,id=virtio0  -drive file=/home/floppy.img,if=none,id=drive-fdc0-0-0,readonly=on,format=raw -global isa-fdc.driveA=drive-fdc0-0-0 -vnc :10 -vga std -watchdog i6300esb -watchdog-action pause
>-char device redirected to /dev/pts/2
>+# /usr/libexec/qemu-kvm -S -M rhel6.2.0 -enable-kvm -m 1024 -smp 1,sockets=1,cores=1,threads=1 -name rhel6.1-64 -uuid 69f4aa4b-a575-348e-934b-0c27f138c735  -device sga -monitor stdio -rtc base=utc -no-shutdown -boot order=nc,menu=on -drive file=/home/disk.qcow2,if=none,id=drive-ide0-0-0,format=qcow2,cache=none -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0  -drive file=/home/boot.iso,id=drive-cdrom,format=raw,if=none,werror=stop,rerror=stop,media=cdrom -device ide-drive,drive=drive-cdrom,id=cdrom -netdev tap,id=hostnet0 -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8a:36:ae,bus=pci.0,addr=0x3 -netdev tap,id=hostnet1 -device e1000,netdev=hostnet1,id=net1,mac=52:54:00:8a:36:20,bus=pci.0,addr=0x4 -netdev tap,id=hostnet2 -device virtio-net-pci,netdev=hostnet2,id=net2,mac=52:54:00:8a:36:20,bus=pci.0,addr=0x5 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -device intel-hda,id=sound0,bus=pci.0,addr=0x6 -device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7 -device virtio-serial-pci,id=virtio-serial0,max_ports=16,bus=pci.0,addr=0x8 -chardev socket,id=channel0,host=127.0.0.1,port=12345,server,nowait -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=channel0,id=channel0,name=com.redhat.rhevm.vdsm -chardev spicevmc,id=charchannel1,name=vdagent -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=com.redhat.spice.0 -k en-us -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 -device usb-tablet,id=input0 -device  usb-hub,bus=usb.0,port=2,id=hub -device usb-storage,bus=usb.0,port=2.4,drive=drive-usb-2-0,id=usb-2-0,removable=on  -drive file=/home/usb.qcow2,if=none,id=drive-usb-2-0,media=disk,format=qcow2,cache=none,werror=stop,rerror=stop,aio=threads -device usb-kbd,id=kbd,port=2.1 -device usb-mouse,id=mouse,port=2.2 -device usb-ehci,id=ehci,bus=pci.0,addr=0x9 -device usb-storage,drive=drive-usb-0-0,id=usb-0-0,removable=on,bus=ehci.0,port=1  -drive  file=/home/usb-2.qcow2,if=none,id=drive-usb-0-0,media=disk,format=qcow2,cache=none,werror=stop,rerror=stop,aio=native -drive file=/home/disk-2.qcow2,if=none,id=drive-virtio0,format=qcow2,cache=none,rerror=stop,werror=stop -device virtio-blk-pci,bus=pci.0,addr=0xa,drive=drive-virtio0,id=virtio0  -drive file=/home/floppy.img,if=none,id=drive-fdc0-0-0,readonly=on,format=raw -global isa-fdc.driveA=drive-fdc0-0-0 -vnc :10 -vga std -watchdog i6300esb -watchdog-action pause
>+char device redirected to /dev/pts/5
> pulseaudio: pa_simple_new for playback failed
> pulseaudio: Reason: Connection refused
> pulseaudio: pa_simple_new for playback failed
>@@ -10,8 +10,8 @@
> pulseaudio: pa_simple_new for capture failed
> pulseaudio: Reason: Connection refused
> audio: Failed to create voice `adc'
>-*** EHCI support is under development ***
> QEMU 0.12.1 monitor - type 'help' for more information
>+(qemu)
> (qemu) info qtree
> bus: main-system-bus
>   type System
>@@ -34,7 +34,7 @@
>         dev-prop: opt_io_size = 0
>         dev-prop: bootindex = -1
>         dev-prop: discard_granularity = 0
>-        dev-prop: ioeventfd = on
>+        dev-prop: ioeventfd = off
>         dev-prop: vectors = 2
>         dev-prop: indirect_desc = on
>         dev-prop: event_idx = on
>@@ -68,6 +68,7 @@
>             dev-prop: serial = <null>
>             dev-prop: removable = on
>             bus-prop: port = "1"
>+            bus-prop: create_unique_serial = 0
>             addr 1.0, port 1, speed 480, name QEMU USB MSD, attached
>             bus: usb-0-0.0
>               type SCSI
>@@ -81,8 +82,11 @@
>                 dev-prop: discard_granularity = 0
>                 dev-prop: ver = "0.12.1"
>                 dev-prop: serial = <null>
>+                dev-prop: wwn = 0x0
>                 dev-prop: removable = on
>+                bus-prop: channel = 0
>                 bus-prop: scsi-id = 0
>+                bus-prop: lun = 0
>       dev: piix3-usb-uhci, id "usb"
>         dev-prop: masterbus = <null>
>         dev-prop: firstport = 0
>@@ -97,10 +101,12 @@
>           dev: usb-mouse, id "mouse"
>             dev-prop: migrate = 1
>             bus-prop: port = "2.2"
>+            bus-prop: create_unique_serial = 0
>             addr 0.0, port 2.2, speed 12, name QEMU USB Mouse, attached
>           dev: usb-kbd, id "kbd"
>             dev-prop: migrate = 1
>             bus-prop: port = "2.1"
>+            bus-prop: create_unique_serial = 0
>             addr 0.0, port 2.1, speed 12, name QEMU USB Keyboard, attached
>           dev: usb-storage, id "usb-2-0"
>             dev-prop: drive = <null>
>@@ -113,6 +119,7 @@
>             dev-prop: serial = <null>
>             dev-prop: removable = on
>             bus-prop: port = "2.4"
>+            bus-prop: create_unique_serial = 0
>             addr 0.0, port 2.4, speed 12, name QEMU USB MSD, attached
>             bus: usb-2-0.0
>               type SCSI
>@@ -126,14 +133,19 @@
>                 dev-prop: discard_granularity = 0
>                 dev-prop: ver = "0.12.1"
>                 dev-prop: serial = <null>
>+                dev-prop: wwn = 0x0
>                 dev-prop: removable = on
>+                bus-prop: channel = 0
>                 bus-prop: scsi-id = 0
>+                bus-prop: lun = 0
>           dev: usb-hub, id "hub"
>             bus-prop: port = "2"
>+            bus-prop: create_unique_serial = 0
>             addr 0.0, port 2, speed 12, name QEMU USB Hub, attached
>           dev: usb-tablet, id "input0"
>             dev-prop: migrate = 1
>             bus-prop: port = <null>
>+            bus-prop: create_unique_serial = 0
>             addr 0.0, port 1, speed 12, name QEMU USB Tablet, attached
>       dev: virtio-serial-pci, id "virtio-serial0"
>         dev-prop: vectors = 17
>@@ -152,19 +164,19 @@
>         bus: virtio-serial0.0
>           type virtio-serial-bus
>           dev: virtserialport, id "channel1"
>-            dev-prop: nr = 2
>             dev-prop: chardev = charchannel1
>-            dev-prop: name = "com.redhat.spice.0"
>+            bus-prop: nr = 2
>+            bus-prop: name = "com.redhat.spice.0"
>              dev-prop-int: id: 2
>-             dev-prop-int: guest_connected: 1
>-             dev-prop-int: host_connected: 1
>+             dev-prop-int: guest_connected: 0
>+             dev-prop-int: host_connected: 0
>              dev-prop-int: throttled: 0
>           dev: virtserialport, id "channel0"
>-            dev-prop: nr = 1
>             dev-prop: chardev = channel0
>-            dev-prop: name = "com.redhat.rhevm.vdsm"
>+            bus-prop: nr = 1
>+            bus-prop: name = "com.redhat.rhevm.vdsm"
>              dev-prop-int: id: 1
>-             dev-prop-int: guest_connected: 1
>+             dev-prop-int: guest_connected: 0
>              dev-prop-int: host_connected: 0
>              dev-prop-int: throttled: 0
>       dev: virtio-balloon-pci, id "balloon0"
>@@ -188,9 +200,12 @@
>           type HDA
>           dev: hda-duplex, id "sound0-codec0"
>             dev-prop: debug = 0
>+            dev-prop: mcompat = 0
>             bus-prop: cad = 0
>       dev: virtio-net-pci, id "net2"
>         dev-prop: ioeventfd = off
>+        dev-prop: __com_redhat_macvtap_compat = off
>+        dev-prop: x-__com_redhat_rhel620_compat = on
>         dev-prop: vectors = 3
>         dev-prop: indirect_desc = on
>         dev-prop: event_idx = on
>@@ -231,6 +246,7 @@
>         dev-prop: vlan = <null>
>         dev-prop: netdev = hostnet1
>         dev-prop: bootindex = -1
>+        dev-prop: x-__com_redhat_rhel630_compat = on
>         bus-prop: addr = 04.0
>         bus-prop: romfile = "pxe-e1000.bin"
>         bus-prop: rombar = 1
>@@ -254,6 +270,9 @@
>         bar 6: mem at 0xffffffffffffffff [0xfffe]
>       dev: PIIX4_PM, id ""
>         dev-prop: smb_io_base = 45312
>+        dev-prop: disable_s3 = 1
>+        dev-prop: disable_s4 = 1
>+        dev-prop: s4_val = 2
>         bus-prop: addr = 01.3
>         bus-prop: romfile = <null>
>         bus-prop: rombar = 1
>@@ -278,6 +297,7 @@
>             dev-prop: bootindex = -1
>             dev-prop: discard_granularity = 0
>             dev-prop: ver = <null>
>+            dev-prop: wwn = 0x0
>         bus: ide.0
>           type IDE
>           dev: ide-drive, id "ide0-0-0"
>@@ -290,6 +310,7 @@
>             dev-prop: bootindex = -1
>             dev-prop: discard_granularity = 0
>             dev-prop: ver = <null>
>+            dev-prop: wwn = 0x0
>       dev: VGA, id ""
>         dev-prop: bios-offset = 0x0
>         dev-prop: bios-size = 0x0
>@@ -313,6 +334,7 @@
>             dev-prop: iobase = 0x3f8
>             dev-prop: irq = 4
>             dev-prop: chardev = charserial0
>+            dev-prop: wakeup = 0
>             isa irq 4
>           dev: sga, id ""
>           dev: isa-fdc, id ""
>@@ -320,6 +342,7 @@
>             dev-prop: driveB = <null>
>             dev-prop: bootindexA = -1
>             dev-prop: bootindexB = -1
>+            dev-prop: migrate_dir = 0
>             isa irq 6
>           dev: i8042, id ""
>             isa irqs 1,12
>@@ -341,9 +364,10 @@
> (qemu)
> 
> 
>+
> -vga qxl frontend:
> 
>- dev: qxl-vga, id ""
>+    dev: qxl-vga, id ""
>         dev-prop: ram_size = 67108864
>         dev-prop: vram_size = 67108864
>         dev-prop: revision = 3
>@@ -357,6 +381,6 @@
>         class VGA controller, addr 00:02.0, pci id 1b36:0100 (sub 1af4:1100)
>         bar 0: mem at 0xf0000000 [0xf3ffffff]
>         bar 1: mem at 0xffffffffffffffff [0x3fffffe]
>-        bar 2: mem at 0xf4000000 [0xf4001fff]
>+        bar 2: mem at 0xf4000000 [0xf4003fff]
>         bar 3: i/o at 0xc020 [0xc03f]
>         bar 6: mem at 0xffffffffffffffff [0xfffe]

Actions: View

Attachments on bug 890121: 668783 | 668784 | 676325 | 676326 | 676327 | 676328