| Submitter | Jan Kiszka |
|---|---|
| Date | Feb. 3, 2010, 8:53 a.m. |
| Message ID | <4dd0881b79972ce0434b5ed69093110ab99a7e78.1265187223.git.jan.kiszka@siemens.com> |
| Download | mbox | patch |
| Permalink | /patch/44350/ |
| State | New |
| Headers | show |
Comments
On 02/03/2010 10:53 AM, Jan Kiszka wrote: > This attempt to make vmport KVM compatible is half-broken and is > scheduled to be replaced by proper upstream support. > Does "scheduled" mean you have patches for adding cpu_synchronize_state() to vmport?
Avi Kivity wrote: > On 02/03/2010 10:53 AM, Jan Kiszka wrote: >> This attempt to make vmport KVM compatible is half-broken and is >> scheduled to be replaced by proper upstream support. >> > > Does "scheduled" mean you have patches for adding > cpu_synchronize_state() to vmport? See patch 2 in this series, and Marcelo already queued that one for upstream. Jan
Patch
diff --git a/hw/vmport.c b/hw/vmport.c index 648861b..884af3f 100644 --- a/hw/vmport.c +++ b/hw/vmport.c @@ -21,12 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ - #include "hw.h" #include "isa.h" #include "pc.h" #include "sysemu.h" -#include "qemu-kvm.h" //#define VMPORT_DEBUG @@ -59,10 +57,6 @@ static uint32_t vmport_ioport_read(void *opaque, uint32_t addr) CPUState *env = cpu_single_env; unsigned char command; uint32_t eax; - uint32_t ret; - - if (kvm_enabled()) - kvm_save_registers(env); eax = env->regs[R_EAX]; if (eax != VMPORT_MAGIC) @@ -79,12 +73,7 @@ static uint32_t vmport_ioport_read(void *opaque, uint32_t addr) return eax; } - ret = s->func[command](s->opaque[command], addr); - - if (kvm_enabled()) - kvm_load_registers(env); - - return ret; + return s->func[command](s->opaque[command], addr); } static void vmport_ioport_write(void *opaque, uint32_t addr, uint32_t val)
This attempt to make vmport KVM compatible is half-broken and is scheduled to be replaced by proper upstream support. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> --- hw/vmport.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-)