From 8304d2dc61e1fd70c9e4ed63843adf653b3d3420 Mon Sep 17 00:00:00 2001 From: Sheng Yang <sheng@linux.intel.com> Date: Thu, 21 May 2009 17:08:53 -0700 Subject: [PATCH 15/25] kvm: qemu: emulate command register for SRIOV virtual function MMIO enable byte would be checked when enabling virtual function, but in fact, the whole virtual function's command register is hard-wired to zero... So when guest read from command register it would only get 0, specially for MMIO enable bit. And this result in, if guest driver want to do a RMW to the command register, it would always get 0 and override former setting (e.g. unmap MMIO by set the correlated bit to zero)... Then we relay on QEmu to provide a reasonable command register content to guest. Signed-off-by: Sheng Yang <sheng@linux.intel.com> Signed-off-by: Avi Kivity <avi@redhat.com> (cherry picked from commit ab1ecf61d17a383c5990b25336aeca814cb3a645) Signed-off-by: Chris Wright <chrisw@redhat.com> Bugzilla: 498085 Message-Id: <1242950943-30180-16-git-send-email-chrisw@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> RH-Upstream-status: applied Acked-by: Juan Quintela <quintela@redhat.com> Acked-by: Don Dutile <ddutile@redhat.com> Acked-by: Glauber Costa <glommer@redhat.com> --- qemu/hw/device-assignment.c | 13 ++++++++++++- qemu/hw/device-assignment.h | 1 + 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/qemu/hw/device-assignment.c b/qemu/hw/device-assignment.c index 807652c..f807cc8 100644 --- a/qemu/hw/device-assignment.c +++ b/qemu/hw/device-assignment.c @@ -26,8 +26,11 @@ * Copyright (C) 2008, IBM, Muli Ben-Yehuda (muli@il.ibm.com) */ #include <stdio.h> +#include <unistd.h> #include <sys/io.h> #include <pci/pci.h> +#include <sys/types.h> +#include <sys/stat.h> #include "qemu-kvm.h" #include "hw.h" #include "pc.h" @@ -318,7 +321,7 @@ static uint32_t assigned_dev_pci_read_config(PCIDevice *d, uint32_t address, ssize_t ret; AssignedDevice *pci_dev = container_of(d, AssignedDevice, dev); - if (address < 0x4 || + if (address < 0x4 || (pci_dev->need_emulate_cmd && address == 0x4) || (address >= 0x10 && address <= 0x24) || address == 0x34 || address == 0x3c || address == 0x3d || pci_access_cap_config(d, address, len)) { @@ -432,6 +435,7 @@ static int get_real_device(AssignedDevice *pci_dev, uint8_t r_bus, FILE *f; unsigned long long start, end, size, flags; unsigned long id; + struct stat statbuf; PCIRegion *rp; PCIDevRegions *dev = &pci_dev->real_device; @@ -520,6 +524,13 @@ again: } fclose(f); + /* dealing with virtual function device */ + snprintf(name, sizeof(name), "%sphysfn/", dir); + if (!stat(name, &statbuf)) + pci_dev->need_emulate_cmd = 1; + else + pci_dev->need_emulate_cmd = 0; + dev->region_number = r; return 0; } diff --git a/qemu/hw/device-assignment.h b/qemu/hw/device-assignment.h index ecddae4..c691e11 100644 --- a/qemu/hw/device-assignment.h +++ b/qemu/hw/device-assignment.h @@ -96,6 +96,7 @@ typedef struct { void *msix_table_page; target_phys_addr_t msix_table_addr; int mmio_index; + int need_emulate_cmd; } AssignedDevice; typedef struct AssignedDevInfo AssignedDevInfo; -- 1.6.3.rc4.29.g8146