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

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

r600.diff (text/plain), 14.93 KB, created by Eduardo Habkost on 2013-01-10 13:54:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eduardo Habkost

Created: 2013-01-10 13:54:15 UTC

Size: 14.93 KB

patch

obsolete

>--- r600host.txt	2012-12-26 14:47:56.789810536 -0200
>+++ r640host-r600machine.txt	2012-12-26 14:47:56.801810554 -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  -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 AC97,id=sound0,bus=pci.0,addr=0x6 -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 -k en-us -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 -device usb-tablet,id=input0  -device usb-kbd,id=kbd -device usb-mouse,id=mouse  -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/1
>+#  /usr/libexec/qemu-kvm -S -M rhel6.0.0 -enable-kvm -m 1024 -smp 1,sockets=1,cores=1,threads=1 -name rhel6.1-64 -uuid 69f4aa4b-a575-348e-934b-0c27f138c735  -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 AC97,id=sound0,bus=pci.0,addr=0x6 -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 -k en-us -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 -device usb-tablet,id=input0  -device usb-kbd,id=kbd -device usb-mouse,id=mouse  -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 capture failed
> pulseaudio: Reason: Connection refused
> pulseaudio: pa_simple_new for capture failed
>@@ -43,6 +43,7 @@
>         bus-prop: addr = 09.0
>         bus-prop: romfile = <null>
>         bus-prop: rombar = 1
>+        bus-prop: multifunction = off
>         class Class 0880, addr 00:09.0, pci id 8086:25ab (sub 1af4:1100)
>         bar 0: mem at 0xffffffffffffffff [0xe]
>       dev: virtio-blk-pci, id "virtio0"
>@@ -52,95 +53,126 @@
>         dev-prop: physical_block_size = 512
>         dev-prop: min_io_size = 0
>         dev-prop: opt_io_size = 0
>+        dev-prop: bootindex = -1
>+        dev-prop: discard_granularity = 0
>+        dev-prop: ioeventfd = off
>         dev-prop: vectors = 2
>-        dev-prop: indirect_desc = off
>+        dev-prop: indirect_desc = on
>+        dev-prop: event_idx = off
>         dev-prop: scsi = on
>         bus-prop: addr = 0a.0
>         bus-prop: romfile = <null>
>         bus-prop: rombar = 1
>+        bus-prop: multifunction = off
>         class SCSI controller, addr 00:0a.0, pci id 1af4:1001 (sub 1af4:0002)
>         bar 0: i/o at 0xffffffffffffffff [0x3e]
>         bar 1: mem at 0xffffffffffffffff [0xffe]
>       dev: piix3-usb-uhci, id "usb"
>+        dev-prop: masterbus = <null>
>+        dev-prop: firstport = 0
>         bus-prop: addr = 01.2
>         bus-prop: romfile = <null>
>         bus-prop: rombar = 1
>+        bus-prop: multifunction = off
>         class USB controller, addr 00:01.2, pci id 8086:7020 (sub 1af4:1100)
>         bar 4: i/o at 0xffffffffffffffff [0x1e]
>         bus: usb.0
>           type USB
>           dev: usb-mouse, id "mouse"
>-            addr 0.0, speed 12, name QEMU USB Mouse, attached
>+            dev-prop: migrate = 0
>+            bus-prop: port = <null>
>+            bus-prop: create_unique_serial = 0
>+            addr 0.0, port 2.2, speed 12, name QEMU USB Mouse, attached
>           dev: usb-hub, id ""
>-            addr 0.0, speed 12, name QEMU USB Hub, attached
>+            bus-prop: port = <null>
>+            bus-prop: create_unique_serial = 0
>+            addr 0.0, port 2, speed 12, name QEMU USB Hub, attached
>           dev: usb-kbd, id "kbd"
>-            addr 0.0, speed 12, name QEMU USB Keyboard, attached
>+            dev-prop: migrate = 0
>+            bus-prop: port = <null>
>+            bus-prop: create_unique_serial = 0
>+            addr 0.0, port 2.1, speed 12, name QEMU USB Keyboard, attached
>           dev: usb-tablet, id "input0"
>-            addr 0.0, speed 12, name QEMU USB Tablet, attached
>+            dev-prop: migrate = 0
>+            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
>         dev-prop: class = 0x780
>-        dev-prop: indirect_desc = off
>+        dev-prop: indirect_desc = on
>+        dev-prop: event_idx = off
>         dev-prop: max_ports = 16
>+        dev-prop: flow_control = 0
>         bus-prop: addr = 08.0
>         bus-prop: romfile = <null>
>         bus-prop: rombar = 1
>+        bus-prop: multifunction = off
>         class Class 0780, addr 00:08.0, pci id 1af4:1003 (sub 1af4:0003)
>         bar 0: i/o at 0xffffffffffffffff [0x1e]
>         bar 1: mem at 0xffffffffffffffff [0xffe]
>         bus: virtio-serial0.0
>           type virtio-serial-bus
>           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"
>-        dev-prop: indirect_desc = off
>+        dev-prop: indirect_desc = on
>+        dev-prop: event_idx = on
>         bus-prop: addr = 07.0
>         bus-prop: romfile = <null>
>         bus-prop: rombar = 1
>+        bus-prop: multifunction = off
>         class RAM controller, addr 00:07.0, pci id 1af4:1002 (sub 1af4:0005)
>         bar 0: i/o at 0xffffffffffffffff [0x1e]
>       dev: AC97, id "sound0"
>         bus-prop: addr = 06.0
>         bus-prop: romfile = <null>
>         bus-prop: rombar = 1
>+        bus-prop: multifunction = off
>         class Audio controller, addr 00:06.0, pci id 8086:2415 (sub 8086:0000)
>         bar 0: i/o at 0xffffffffffffffff [0x3fe]
>         bar 1: i/o at 0xffffffffffffffff [0xfe]
>       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 = off
>+        dev-prop: indirect_desc = on
>+        dev-prop: event_idx = off
>         dev-prop: csum = on
>         dev-prop: guest_csum = on
>         dev-prop: gso = on
>         dev-prop: guest_tso4 = on
>-        dev-prop: guest_tso6 = off
>-        dev-prop: guest_ecn = off
>-        dev-prop: guest_ufo = off
>-        dev-prop: host_tso4 = off
>-        dev-prop: host_tso6 = off
>-        dev-prop: host_ecn = off
>-        dev-prop: host_ufo = off
>-        dev-prop: mrg_rxbuf = off
>-        dev-prop: status = off
>-        dev-prop: ctrl_vq = off
>-        dev-prop: ctrl_rx = off
>-        dev-prop: ctrl_vlan = off
>-        dev-prop: ctrl_rx_extra = off
>+        dev-prop: guest_tso6 = on
>+        dev-prop: guest_ecn = on
>+        dev-prop: guest_ufo = on
>+        dev-prop: host_tso4 = on
>+        dev-prop: host_tso6 = on
>+        dev-prop: host_ecn = on
>+        dev-prop: host_ufo = on
>+        dev-prop: mrg_rxbuf = on
>+        dev-prop: status = on
>+        dev-prop: ctrl_vq = on
>+        dev-prop: ctrl_rx = on
>+        dev-prop: ctrl_vlan = on
>+        dev-prop: ctrl_rx_extra = on
>         dev-prop: mac = 52:54:00:8a:36:20
>         dev-prop: vlan = <null>
>         dev-prop: netdev = hostnet2
>+        dev-prop: bootindex = -1
>         dev-prop: x-txtimer = 150000
>         dev-prop: x-txburst = 256
>         dev-prop: tx = <null>
>         bus-prop: addr = 05.0
>         bus-prop: romfile = "pxe-virtio.bin"
>         bus-prop: rombar = 1
>+        bus-prop: multifunction = off
>         class Ethernet controller, addr 00:05.0, pci id 1af4:1000 (sub 1af4:0001)
>         bar 0: i/o at 0xffffffffffffffff [0x1e]
>         bar 1: mem at 0xffffffffffffffff [0xffe]
>@@ -149,9 +181,12 @@
>         dev-prop: mac = 52:54:00:8a:36:20
>         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
>+        bus-prop: multifunction = off
>         class Ethernet controller, addr 00:04.0, pci id 8086:100e (sub 1af4:1100)
>         bar 0: mem at 0xffffffffffffffff [0x1fffe]
>         bar 1: i/o at 0xffffffffffffffff [0x3e]
>@@ -160,17 +195,30 @@
>         dev-prop: mac = 52:54:00:8a:36:ae
>         dev-prop: vlan = <null>
>         dev-prop: netdev = hostnet0
>+        dev-prop: bootindex = -1
>         bus-prop: addr = 03.0
>         bus-prop: romfile = "pxe-rtl8139.bin"
>         bus-prop: rombar = 1
>+        bus-prop: multifunction = off
>         class Ethernet controller, addr 00:03.0, pci id 10ec:8139 (sub 1af4:1100)
>         bar 0: i/o at 0xffffffffffffffff [0xfe]
>         bar 1: mem at 0xffffffffffffffff [0xfe]
>         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
>+        bus-prop: multifunction = off
>+        class Bridge, addr 00:01.3, pci id 8086:7113 (sub 1af4:1100)
>       dev: piix3-ide, id ""
>         bus-prop: addr = 01.1
>         bus-prop: romfile = <null>
>         bus-prop: rombar = 1
>+        bus-prop: multifunction = off
>         class IDE controller, addr 00:01.1, pci id 8086:7010 (sub 1af4:1100)
>         bar 4: i/o at 0xffffffffffffffff [0xe]
>         bus: ide.1
>@@ -182,7 +230,10 @@
>             dev-prop: physical_block_size = 512
>             dev-prop: min_io_size = 0
>             dev-prop: opt_io_size = 0
>+            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"
>@@ -192,19 +243,24 @@
>             dev-prop: physical_block_size = 512
>             dev-prop: min_io_size = 0
>             dev-prop: opt_io_size = 0
>+            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
>         bus-prop: addr = 02.0
>-        bus-prop: romfile = <null>
>-        bus-prop: rombar = 1
>+        bus-prop: romfile = "vgabios-stdvga.bin"
>+        bus-prop: rombar = 0
>+        bus-prop: multifunction = off
>         class VGA controller, addr 00:02.0, pci id 1234:1111 (sub 1af4:1100)
>         bar 0: mem at 0xffffffffffffffff [0xfffffe]
>       dev: PIIX3, id ""
>         bus-prop: addr = 01.0
>         bus-prop: romfile = <null>
>         bus-prop: rombar = 1
>+        bus-prop: multifunction = on
>         class ISA bridge, addr 00:01.0, pci id 8086:7000 (sub 1af4:1100)
>         bus: isa.0
>           type ISA
>@@ -213,10 +269,14 @@
>             dev-prop: iobase = 0x3f8
>             dev-prop: irq = 4
>             dev-prop: chardev = charserial0
>+            dev-prop: wakeup = 0
>             isa irq 4
>           dev: isa-fdc, id ""
>             dev-prop: driveA = drive-fdc0-0-0
>             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
>@@ -233,22 +293,30 @@
>         bus-prop: addr = 00.0
>         bus-prop: romfile = <null>
>         bus-prop: rombar = 1
>+        bus-prop: multifunction = off
>         class Host bridge, addr 00:00.0, pci id 8086:1237 (sub 1af4:1100)
> (qemu)
> 
> 
>+
> -vga qxl frontend:
> 
>--spice port=5930,disable-ticketing -vga qxl  (can not boot with vnc+qxl, segment fault.)
>+-spice port=5930,disable-ticketing -vga qxl
> 
>-      dev: qxl, id ""
>+     dev: qxl-vga, id ""
>         dev-prop: ram_size = 67108864
>+        dev-prop: vram_size = 67108864
>+        dev-prop: revision = 2
>+        dev-prop: debug = 0
>+        dev-prop: guestdebug = 0
>+        dev-prop: cmdlog = 0
>         bus-prop: addr = 02.0
>         bus-prop: romfile = "vgabios-qxl.bin"
>         bus-prop: rombar = 1
>-        class VGA controller, addr 20:02.0, pci id 1b36:0100 (sub 1af4:1100)
>+        bus-prop: multifunction = off
>+        class VGA controller, addr 00:02.0, pci id 1b36:0100 (sub 1af4:1100)
>         bar 0: mem at 0xf0000000 [0xf3ffffff]
>-        bar 1: mem at 0xf4000000 [0xf4000fff]
>-        bar 2: mem at 0xf4002000 [0xf4003fff]
>-        bar 3: i/o at 0xc010 [0xc017]
>+        bar 1: mem at 0xffffffffffffffff [0x3fffffe]
>+        bar 2: mem at 0xf4000000 [0xf4003fff]
>+        bar 3: i/o at 0xc010 [0xc01f]
>         bar 6: mem at 0xffffffffffffffff [0xfffe]

Actions: View

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