Breaks hotplug: Running tests/device-add.sh Using RANDOM seed 24922 Formatting '.tmp-28149/disk.img', fmt=qcow2 size=10737418240 encryption=off cluster_size=65536 lazy_refcounts=off /home/aliguori/build/qemu/x86_64-softmmu/qemu-system-x86_64 -kernel /usr/local/share/qemu-jeos/kernel-x86_64-pc -initrd .tmp-28149/initramfs-28149.img.gz -device isa-debug-exit -append console=ttyS0 seed=24922 -nographic -enable-kvm -pidfile .tmp-28149/pidfile-28149.pid -qmp unix:.tmp-28149/qmpsock-28149.sock,server,nowait [ 0.000000] Initializing cgroup subsys cpuset [ 0.000000] Initializing cgroup subsys cpu [ 0.000000] Linux version 3.4.0 (root@ccnode4) (gcc version 4.6.4 20120830 (prerelease) (GCC) ) #2 SMP Mon Dec 3 19:40:41 CST 2012 [ 0.000000] Command line: console=ttyS0 seed=24922 [ 0.000000] BIOS-provided physical RAM map: [ 0.000000] BIOS-e820: 0000000000000000 - 000000000009fc00 (usable) [ 0.000000] BIOS-e820: 000000000009fc00 - 00000000000a0000 (reserved) [ 0.000000] BIOS-e820: 00000000000f0000 - 0000000000100000 (reserved) [ 0.000000] BIOS-e820: 0000000000100000 - 0000000007ffe000 (usable) [ 0.000000] BIOS-e820: 0000000007ffe000 - 0000000008000000 (reserved) [ 0.000000] BIOS-e820: 00000000feffc000 - 00000000ff000000 (reserved) [ 0.000000] BIOS-e820: 00000000fffc0000 - 0000000100000000 (reserved) [ 0.000000] NX (Execute Disable) protection: active [ 0.000000] DMI 2.4 present. [ 0.000000] No AGP bridge found [ 0.000000] last_pfn = 0x7ffe max_arch_pfn = 0x400000000 [ 0.000000] PAT not supported by CPU. [ 0.000000] found SMP MP-table at [ffff8800000fda40] fda40 [ 0.000000] init_memory_mapping: 0000000000000000-0000000007ffe000 [ 0.000000] RAMDISK: 07f58000 - 07ff0000 [ 0.000000] ACPI: RSDP 00000000000fd8e0 00014 (v00 BOCHS ) [ 0.000000] ACPI: RSDT 0000000007ffe4a0 00034 (v01 BOCHS BXPCRSDT 00000001 BXPC 00000001) [ 0.000000] ACPI: FACP 0000000007ffff80 00074 (v01 BOCHS BXPCFACP 00000001 BXPC 00000001) [ 0.000000] ACPI: DSDT 0000000007ffe4e0 011BC (v01 BXPC BXDSDT 00000001 INTL 20120913) [ 0.000000] ACPI: FACS 0000000007ffff40 00040 [ 0.000000] ACPI: SSDT 0000000007fff800 00735 (v01 BOCHS BXPCSSDT 00000001 BXPC 00000001) [ 0.000000] ACPI: APIC 0000000007fff6e0 00078 (v01 BOCHS BXPCAPIC 00000001 BXPC 00000001) [ 0.000000] ACPI: HPET 0000000007fff6a0 00038 (v01 BOCHS BXPCHPET 00000001 BXPC 00000001) [ 0.000000] No NUMA configuration found [ 0.000000] Faking a node at 0000000000000000-0000000007ffe000 [ 0.000000] Initmem setup node 0 0000000000000000-0000000007ffe000 [ 0.000000] NODE_DATA [0000000007ff7000 - 0000000007ffafff] [ 0.000000] Zone PFN ranges: [ 0.000000] DMA 0x00000010 -> 0x00001000 [ 0.000000] DMA32 0x00001000 -> 0x00100000 [ 0.000000] Normal empty [ 0.000000] Movable zone start PFN for each node [ 0.000000] Early memory PFN ranges [ 0.000000] 0: 0x00000010 -> 0x0000009f [ 0.000000] 0: 0x00000100 -> 0x00007ffe [ 0.000000] ACPI: PM-Timer IO Port: 0xb008 [ 0.000000] ACPI: LAPIC (acpi_id[0x00] lapic_id[0x00] enabled) [ 0.000000] ACPI: LAPIC_NMI (acpi_id[0xff] dfl dfl lint[0x1]) [ 0.000000] ACPI: IOAPIC (id[0x00] address[0xfec00000] gsi_base[0]) [ 0.000000] IOAPIC[0]: apic_id 0, version 17, address 0xfec00000, GSI 0-23 [ 0.000000] ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 2 dfl dfl) [ 0.000000] ACPI: INT_SRC_OVR (bus 0 bus_irq 5 global_irq 5 high level) [ 0.000000] ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 9 high level) [ 0.000000] ACPI: INT_SRC_OVR (bus 0 bus_irq 10 global_irq 10 high level) [ 0.000000] ACPI: INT_SRC_OVR (bus 0 bus_irq 11 global_irq 11 high level) [ 0.000000] Using ACPI (MADT) for SMP configuration information [ 0.000000] ACPI: HPET id: 0x8086a201 base: 0xfed00000 [ 0.000000] SMP: Allowing 1 CPUs, 0 hotplug CPUs [ 0.000000] PM: Registered nosave memory: 000000000009f000 - 00000000000a0000 [ 0.000000] PM: Registered nosave memory: 00000000000a0000 - 00000000000f0000 [ 0.000000] PM: Registered nosave memory: 00000000000f0000 - 0000000000100000 [ 0.000000] Allocating PCI resources starting at 8000000 (gap: 8000000:f6ffc000) [ 0.000000] setup_percpu: NR_CPUS:64 nr_cpumask_bits:64 nr_cpu_ids:1 nr_node_ids:1 [ 0.000000] PERCPU: Embedded 26 pages/cpu @ffff880007c00000 s77056 r8192 d21248 u2097152 [ 0.000000] Built 1 zonelists in Node order, mobility grouping on. Total pages: 32136 [ 0.000000] Policy zone: DMA32 [ 0.000000] Kernel command line: console=ttyS0 seed=24922 [ 0.000000] PID hash table entries: 512 (order: 0, 4096 bytes) [ 0.000000] Checking aperture... [ 0.000000] No AGP bridge found [ 0.000000] Memory: 113188k/131064k available (7532k kernel code, 452k absent, 17424k reserved, 5454k data, 584k init) [ 0.000000] SLUB: Genslabs=15, HWalign=64, Order=0-3, MinObjects=0, CPUs=1, Nodes=1 [ 0.000000] Hierarchical RCU implementation. [ 0.000000] NR_IRQS:4352 nr_irqs:256 16 [ 0.000000] Console: colour VGA+ 80x25 [ 0.000000] console [ttyS0] enabled [ 0.000000] Fast TSC calibration failed [ 0.000000] TSC: Unable to calibrate against PIT [ 0.000000] TSC: using HPET reference calibration [ 0.000000] Detected 2933.365 MHz processor. [ 0.009042] Calibrating delay loop (skipped), value calculated using timer frequency.. 5866.73 BogoMIPS (lpj=2933365) [ 0.011002] pid_max: default: 32768 minimum: 301 [ 0.012026] Security Framework initialized [ 0.012828] SELinux: Initializing. [ 0.013032] Dentry cache hash table entries: 16384 (order: 5, 131072 bytes) [ 0.014035] Inode-cache hash table entries: 8192 (order: 4, 65536 bytes) [ 0.015018] Mount-cache hash table entries: 256 [ 0.016139] Initializing cgroup subsys cpuacct [ 0.017002] Initializing cgroup subsys freezer [ 0.018057] mce: CPU supports 10 MCE banks [ 0.019201] SMP alternatives: switching to UP code [ 0.028404] Freeing SMP alternatives: 24k freed [ 0.029013] ACPI: Core revision 20120320 [ 0.031786] ..TIMER: vector=0x30 apic1=0 pin1=2 apic2=-1 pin2=-1 [ 0.042131] CPU0: Intel QEMU Virtual CPU version 1.4.50 stepping 03 [ 0.043996] Performance Events: unsupported p6 CPU model 2 no PMU driver, software events only. [ 0.044793] Brought up 1 CPUs [ 0.044999] Total of 1 processors activated (5866.73 BogoMIPS). [ 0.047225] kworker/u:0 used greatest stack depth: 6368 bytes left [ 0.048075] RTC time: 6:19:30, date: 03/15/13 [ 0.049036] NET: Registered protocol family 16 [ 0.050311] ACPI: bus type pci registered [ 0.051057] kworker/u:0 used greatest stack depth: 6304 bytes left [ 0.052082] PCI: Using configuration type 1 for base access [ 0.054299] kworker/u:0 used greatest stack depth: 5968 bytes left [ 0.055261] kworker/u:0 used greatest stack depth: 5536 bytes left [ 0.062136] bio: create slab <bio-0> at 0 [ 0.063144] ACPI: Added _OSI(Module Device) [ 0.063999] ACPI: Added _OSI(Processor Device) [ 0.064866] ACPI: Added _OSI(3.0 _SCP Extensions) [ 0.064997] ACPI: Added _OSI(Processor Aggregator Device) [ 0.068246] ACPI: Interpreter enabled [ 0.068997] ACPI: (supports S0 S3 S4 S5) [ 0.069864] ACPI: Using IOAPIC for interrupt routing [ 0.073684] ACPI: No dock devices found. [ 0.074008] PCI: Using host bridge windows from ACPI; if necessary, use "pci=nocrs" and report a bug [ 0.076080] ACPI: PCI Root Bridge [PCI0] (domain 0000 [bus 00-ff]) [ 0.077100] pci_root PNP0A03:00: host bridge window [io 0x0000-0x0cf7] [ 0.079018] pci_root PNP0A03:00: host bridge window [io 0x0d00-0xffff] [ 0.079996] pci_root PNP0A03:00: host bridge window [mem 0x000a0000-0x000bffff] [ 0.081996] pci_root PNP0A03:00: host bridge window [mem 0x80000000-0xfebfffff] [ 0.083105] PCI host bridge to bus 0000:00 [ 0.084002] pci_bus 0000:00: root bus resource [io 0x0000-0x0cf7] [ 0.084999] pci_bus 0000:00: root bus resource [io 0x0d00-0xffff] [ 0.087016] pci_bus 0000:00: root bus resource [mem 0x000a0000-0x000bffff] [ 0.088006] pci_bus 0000:00: root bus resource [mem 0x80000000-0xfebfffff] [ 0.094412] pci 0000:00:01.3: quirk: [io 0xb000-0xb03f] claimed by PIIX4 ACPI [ 0.096020] pci 0000:00:01.3: quirk: [io 0xb100-0xb10f] claimed by PIIX4 SMB [ 0.112260] pci0000:00: Unable to request _OSC control (_OSC support mask: 0x1e) [ 0.115059] ACPI: PCI Interrupt Link [LNKA] (IRQs 5 *10 11) [ 0.116307] ACPI: PCI Interrupt Link [LNKB] (IRQs 5 *10 11) [ 0.117337] ACPI: PCI Interrupt Link [LNKC] (IRQs 5 10 *11) [ 0.118369] ACPI: PCI Interrupt Link [LNKD] (IRQs 5 10 *11) [ 0.120287] vgaarb: device added: PCI:0000:00:02.0,decodes=io+mem,owns=io+mem,locks=none [ 0.121000] vgaarb: loaded [ 0.121990] vgaarb: bridge control possible 0000:00:02.0 [ 0.123150] SCSI subsystem initialized [ 0.124212] usbcore: registered new interface driver usbfs [ 0.125034] usbcore: registered new interface driver hub [ 0.127022] usbcore: registered new device driver usb [ 0.128181] Advanced Linux Sound Architecture Driver Version 1.0.25. [ 0.129002] PCI: Using ACPI for IRQ routing [ 0.130381] cfg80211: Calling CRDA to update world regulatory domain [ 0.132116] NetLabel: Initializing [ 0.133004] NetLabel: domain hash size = 128 [ 0.133871] NetLabel: protocols = UNLABELED CIPSOv4 [ 0.134012] NetLabel: unlabeled traffic allowed by default [ 0.136172] HPET: 3 timers in total, 0 timers will be used for per-cpu timer [ 0.137015] hpet0: at MMIO 0xfed00000, IRQs 2, 8, 0 [ 0.138221] hpet0: 3 comparators, 64-bit 100.000000 MHz counter [ 0.145047] Switching to clocksource hpet [ 0.147997] pnp: PnP ACPI init [ 0.148713] ACPI: bus type pnp registered [ 0.150598] pnp: PnP ACPI: found 8 devices [ 0.151490] ACPI: ACPI bus type pnp unregistered [ 0.160313] NET: Registered protocol family 2 [ 0.161401] IP route cache hash table entries: 1024 (order: 1, 8192 bytes) [ 0.162941] TCP established hash table entries: 4096 (order: 4, 65536 bytes) [ 0.164388] TCP bind hash table entries: 4096 (order: 4, 65536 bytes) [ 0.165709] TCP: Hash tables configured (established 4096 bind 4096) [ 0.167036] TCP: reno registered [ 0.167686] UDP hash table entries: 128 (order: 0, 4096 bytes) [ 0.168904] UDP-Lite hash table entries: 128 (order: 0, 4096 bytes) [ 0.170301] NET: Registered protocol family 1 [ 0.171317] RPC: Registered named UNIX socket transport module. [ 0.172537] RPC: Registered udp transport module. [ 0.173504] RPC: Registered tcp transport module. [ 0.174477] RPC: Registered tcp NFSv4.1 backchannel transport module. [ 0.175832] pci 0000:00:00.0: Limiting direct PCI/PCI transfers [ 0.177103] pci 0000:00:01.0: PIIX3: Enabling Passive Release [ 0.178301] pci 0000:00:01.0: Activating ISA DMA hang workarounds [ 0.179685] Trying to unpack rootfs image as initramfs... [ 0.188701] Freeing initrd memory: 608k freed [ 0.190487] microcode: CPU0 sig=0x623, pf=0x0, revision=0x1 [ 0.191743] microcode: Microcode Update Driver: v2.00 <tig...@aivazian.fsnet.co.uk>, Peter Oruba [ 0.193851] audit: initializing netlink socket (disabled) [ 0.195041] type=2000 audit(1363328370.194:1): initialized [ 0.212495] HugeTLB registered 2 MB page size, pre-allocated 0 pages [ 0.217219] VFS: Disk quotas dquot_6.5.2 [ 0.218158] Dquot-cache hash table entries: 512 (order 0, 4096 bytes) [ 0.220139] NFS: Registering the id_resolver key type [ 0.221442] msgmni has been set to 222 [ 0.222648] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 253) [ 0.224167] io scheduler noop registered [ 0.224945] io scheduler deadline registered [ 0.225939] io scheduler cfq registered (default) [ 0.227137] pci_hotplug: PCI Hot Plug PCI Core version: 0.5 [ 0.228291] acpiphp: ACPI Hot Plug PCI Controller Driver version: 0.5 [ 0.229802] acpiphp: Slot [3] registered [ 0.230703] acpiphp: Slot [4] registered [ 0.231574] acpiphp: Slot [5] registered [ 0.232448] acpiphp: Slot [6] registered [ 0.233302] acpiphp: Slot [7] registered [ 0.234159] acpiphp: Slot [8] registered [ 0.234991] acpiphp: Slot [9] registered [ 0.235860] acpiphp: Slot [10] registered [ 0.236758] acpiphp: Slot [11] registered [ 0.237648] acpiphp: Slot [12] registered [ 0.238522] acpiphp: Slot [13] registered [ 0.239440] acpiphp: Slot [14] registered [ 0.240386] acpiphp: Slot [15] registered [ 0.241321] acpiphp: Slot [16] registered [ 0.242236] acpiphp: Slot [17] registered [ 0.243163] acpiphp: Slot [18] registered [ 0.244069] acpiphp: Slot [19] registered [ 0.244913] acpiphp: Slot [20] registered [ 0.245799] acpiphp: Slot [21] registered [ 0.246703] acpiphp: Slot [22] registered [ 0.247596] acpiphp: Slot [23] registered [ 0.248476] acpiphp: Slot [24] registered [ 0.249414] acpiphp: Slot [25] registered [ 0.250307] acpiphp: Slot [26] registered [ 0.251187] acpiphp: Slot [27] registered [ 0.252064] acpiphp: Slot [28] registered [ 0.252929] acpiphp: Slot [29] registered [ 0.253825] acpiphp: Slot [30] registered [ 0.254730] acpiphp: Slot [31] registered [ 0.255811] input: Power Button as /devices/LNXSYSTM:00/LNXPWRBN:00/input/input0 [ 0.257308] ACPI: Power Button [PWRF] [ 0.259627] Serial: 8250/16550 driver, 4 ports, IRQ sharing enabled �[ 0.526468] serial8250: ttyS0 at I/O 0x3f8 (irq = 4) is a 16550A [ 0.550220] 00:06: ttyS0 at I/O 0x3f8 (irq = 4) is a 16550A [ 0.551852] Non-volatile memory driver v1.3 [ 0.552741] Linux agpgart interface v0.103 [ 0.553794] [drm] Initialized drm 1.1.0 20060810 [ 0.554764] [drm:i915_init] *ERROR* drm/i915 can't work without intel_agp module! [ 0.557955] brd: module loaded [ 0.560661] loop: module loaded [ 0.561549] DC390: clustering now enabled by default. If you get problems load [ 0.563075] with "disable_clustering=1" and report to maintainers [ 0.564550] megasas: 00.00.06.14-rc1 Fri. Jan. 6 17:00:00 PDT 2012 [ 0.567136] scsi0 : ata_piix [ 0.567826] scsi1 : ata_piix [ 0.568542] ata1: PATA max MWDMA2 cmd 0x1f0 ctl 0x3f6 bmdma 0xc040 irq 14 [ 0.571991] ata2: PATA max MWDMA2 cmd 0x170 ctl 0x376 bmdma 0xc048 irq 15 [ 0.574573] pcnet32: pcnet32.c:v1.35 21.Apr.2008 tsbog...@alpha.franken.de [ 0.576116] e100: Intel(R) PRO/100 Network Driver, 3.5.24-k2-NAPI [ 0.577393] e100: Copyright(c) 1999-2006 Intel Corporation [ 0.578596] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI [ 0.580074] e1000: Copyright (c) 1999-2006 Intel Corporation. [ 0.581406] ACPI: PCI Interrupt Link [LNKC] enabled at IRQ 11 [ 0.894611] ata2.00: ATAPI: QEMU DVD-ROM, 1.4.50, max UDMA/100 [ 0.896172] ata2.00: configured for MWDMA2 [ 0.897425] scsi 1:0:0:0: CD-ROM QEMU QEMU DVD-ROM 1.4. PQ: 0 ANSI: 5 [ 0.899749] sr0: scsi3-mmc drive: 4x/4x cd/rw xa/form2 tray [ 0.900848] cdrom: Uniform CD-ROM driver Revision: 3.20 [ 0.902363] sr 1:0:0:0: Attached scsi generic sg0 type 5 [ 0.921771] e1000 0000:00:03.0: eth0: (PCI:33MHz:32-bit) 52:54:00:12:34:56 [ 0.924243] e1000 0000:00:03.0: eth0: Intel(R) PRO/1000 Network Connection [ 0.925660] sky2: driver version 1.30 [ 0.926693] ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver [ 0.928087] ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver [ 0.929371] uhci_hcd: USB Universal Host Controller Interface driver [ 0.930690] usbcore: registered new interface driver usblp [ 0.931810] Initializing USB Mass Storage driver... [ 0.932819] usbcore: registered new interface driver usb-storage [ 0.934044] USB Mass Storage support registered. [ 0.934965] usbcore: registered new interface driver libusual [ 0.936220] i8042: PNP: PS/2 Controller [PNP0303:KBD,PNP0f13:MOU] at 0x60,0x64 irq 1,12 [ 0.938361] serio: i8042 KBD port at 0x60,0x64 irq 1 [ 0.939374] serio: i8042 AUX port at 0x60,0x64 irq 12 [ 0.940591] mousedev: PS/2 mouse device common for all mice [ 0.942105] input: AT Translated Set 2 keyboard as /devices/platform/i8042/serio0/input/input1 [ 0.943908] rtc_cmos 00:01: RTC can wake from S4 [ 0.947061] rtc_cmos 00:01: rtc core: registered rtc_cmos as rtc0 [ 0.948402] rtc0: alarms up to one day, 114 bytes nvram, hpet irqs [ 0.950186] device-mapper: ioctl: 4.22.0-ioctl (2011-10-19) initialised: dm-de...@redhat.com [ 0.951939] cpuidle: using governor ladder [ 0.952765] cpuidle: using governor menu [ 0.953552] EFI Variables Facility v0.08 2004-May-17 [ 0.955506] usbcore: registered new interface driver usbhid [ 0.956660] usbhid: USB HID core driver [ 0.957927] Netfilter messages via NETLINK v0.30. [ 0.959973] nf_conntrack version 0.5.0 (889 buckets, 3556 max) [ 0.961288] ctnetlink v0.93: registering with nfnetlink. [ 0.962486] ip_tables: (C) 2000-2006 Netfilter Core Team [ 0.963590] TCP: cubic registered [ 0.964353] Initializing XFRM netlink socket [ 0.965435] NET: Registered protocol family 10 [ 0.966549] ip6_tables: (C) 2000-2006 Netfilter Core Team [ 0.967655] IPv6 over IPv4 tunneling driver [ 0.968700] NET: Registered protocol family 17 [ 0.969628] Registering the dns_resolver key type [ 0.970760] registered taskstats version 1 [ 0.971722] Magic number: 5:14:317 [ 0.972477] tty tty42: hash matches [ 0.973210] console [netcon0] enabled [ 0.973911] netconsole: network logging started [ 0.974870] ALSA device list: [ 0.975486] No soundcards found. [ 0.978762] Freeing unused kernel memory: 584k freed [ 0.980040] Write protecting the kernel read-only data: 12288k [ 0.982620] Freeing unused kernel memory: 640k freed [ 0.987540] Freeing unused kernel memory: 1724k freed Setting guest RANDOM seed to 24922 *** Running tests *** /tests/device-add.sh Running test /tests/device-add.sh... ** waiting for hotplug ** qemu-system-x86_64: /home/aliguori/git/qemu/hw/qdev.c:84: bus_add_child: Assertion `bus->allow_hotplug' failed. Traceback (most recent call last): File "../..//QMP/qmp", line 126, in <module> sys.exit(main(sys.argv[1:])) File "../..//QMP/qmp", line 122, in main rsp = do_command(srv, command, **arguments) File "../..//QMP/qmp", line 81, in do_command if rsp.has_key('error'): AttributeError: 'NoneType' object has no attribute 'has_key' ./qemu-test: line 99: 28224 Aborted "$@" ** waiting for guest to see device **
Regards, Anthony Liguori fred.kon...@greensocs.com writes: > From: KONRAD Frederic <fred.kon...@greensocs.com> > > This is the next part of virtio-refactoring. > > Basically it creates virtio-blk device which extends virtio-device. > Then a virtio-blk can be connected on a virtio-bus. > virtio-blk-pci, virtio-blk-s390x, virtio-blk-ccw are created too, they extend > respectively virtio-pci, virtio-s390-device, virtio-ccw-device and have a > virtio-blk. > > It is on top of "virtio: make virtio device's structures public" (V4) I posted > before, but you can checkout my branch here: > > git://project.greensocs.com/qemu-virtio.git virtio-blk-v7 > > I made basic tests (with linux guests) on: > * qemu-system-i386 > * qemu-system-s390x > > Cornelia made virtio-ccw test, and Stefan tried dataplane. > > Changes v6 -> v7: > * Fix the DEFINE_VIRTIO_BLK_PROPERTIES macro issue spotted by Peter. > > Thanks. > > Fred > > KONRAD Frederic (8): > virtio-blk: don't use pointer for configuration. > virtio-blk: add the virtio-blk device. > virtio-blk-pci: switch to new API. > virtio-blk-s390: switch to the new API. > virtio-blk-ccw switch to new API. > virtio-blk: cleanup: init and exit functions. > virtio-blk: cleanup: QOM cast > virtio-blk: cleanup: remove qdev field. > > hw/s390x/s390-virtio-bus.c | 30 +++++++---- > hw/s390x/s390-virtio-bus.h | 13 ++++- > hw/s390x/virtio-ccw.c | 37 ++++++++----- > hw/s390x/virtio-ccw.h | 14 ++++- > hw/virtio-blk.c | 131 > +++++++++++++++++++++++++++++---------------- > hw/virtio-blk.h | 26 +++++++-- > hw/virtio-pci.c | 127 ++++++++++++++++++++----------------------- > hw/virtio-pci.h | 15 +++++- > hw/virtio.h | 2 - > 9 files changed, 246 insertions(+), 149 deletions(-) > > -- > 1.7.11.7