From nobody Mon Feb 9 00:07:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1571916278; cv=none; d=zoho.com; s=zohoarc; b=m5VlWxYtT5I/uUDWSzaf0tYINBuZx1eMdTyEgllH5IMLwJsR2Zg3MbIQMIqsCqq9Ga7CSw5gkOrRH/n7FhPAK+wTBLZLlEG40PA9AsoAhcaAA42+dKZwgYGpJO8tHuJdqbWPAYK0+d+5B7qmQyDml4L6+mXHzR0ifI7U3UiiXxA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571916278; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=djhRt41UYigUdh6RTBGKKZ8WWVHBf3mQ1k4IXTUECqQ=; b=PNWcN/GNFLMvso9GFimMCY5w6U/5SOLen856ammkp+G7hXAMXfqBqelUbczN3YsErxKi09Wm8fefua4+XlgCKIWMpUpVIvzyVGTcGeMo6ZaSTdZfnwR27wtVQqGOAkGCWbJ/kl6SrtmCwmlsmBx6slZ2mg+wbsUotV6G1UFqybs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571916278296216.30181978344706; Thu, 24 Oct 2019 04:24:38 -0700 (PDT) Received: from localhost ([::1]:36414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNZDR-0001So-8R for importer@patchew.org; Thu, 24 Oct 2019 05:15:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43592) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNZ8D-00054L-4M for qemu-devel@nongnu.org; Thu, 24 Oct 2019 05:10:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNZ8A-0003nN-T6 for qemu-devel@nongnu.org; Thu, 24 Oct 2019 05:10:08 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:60118) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNZ8A-0003mr-L6 for qemu-devel@nongnu.org; Thu, 24 Oct 2019 05:10:06 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x9O94LIE094836; Thu, 24 Oct 2019 09:10:01 GMT Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by userp2120.oracle.com with ESMTP id 2vqu4r24kg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 24 Oct 2019 09:10:01 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x9O98Lt5047136; Thu, 24 Oct 2019 09:10:00 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserp3020.oracle.com with ESMTP id 2vu0fnu665-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 24 Oct 2019 09:10:00 +0000 Received: from abhmp0008.oracle.com (abhmp0008.oracle.com [141.146.116.14]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x9O99x0K001696; Thu, 24 Oct 2019 09:10:00 GMT Received: from jaraman-bur-1.us.oracle.com (/10.152.33.39) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 24 Oct 2019 02:09:59 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : in-reply-to : references; s=corp-2019-08-05; bh=djhRt41UYigUdh6RTBGKKZ8WWVHBf3mQ1k4IXTUECqQ=; b=Rq7eSZnfkK3mjNEcQxJ8tnmS/4auZNnd2qFKUVYCxqYpJvWT7ZdOWPC8931psR84BzJB zeofXBVSn8XktLRg8CPozkqnhV7hgIvQZlpXg6pfmsF9qtM1sX2lTYF5ynXdi+McCFN1 6CsgKwhIhDSJXgoczyg+B8fq2WE3lkgI3pfl4IaOsvQAsWDMoDTH2KuQIrbjF1Okbpyu 5t0zlqrjZmvnekfo0yHMm5p5oQSov7wGHIkOsc8cleJTrb5fo/KOwNOJA42EP1lIfenh M1MFhNSrMVRi3C07vh3fxbHYCiM8wAdEvZsQXnbRp0wKsBLOFVxaJ5KswkFPpt4eiS7e jw== From: Jagannathan Raman To: qemu-devel@nongnu.org Subject: [RFC v4 PATCH 06/49] multi-process: build system for remote device process Date: Thu, 24 Oct 2019 05:08:47 -0400 Message-Id: X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: In-Reply-To: References: X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9419 signatures=668684 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1910240089 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9419 signatures=668684 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1910240089 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 156.151.31.85 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: elena.ufimtseva@oracle.com, fam@euphon.net, john.g.johnson@oracle.com, kraxel@redhat.com, jag.raman@oracle.com, quintela@redhat.com, mst@redhat.com, armbru@redhat.com, kanth.ghatraju@oracle.com, thuth@redhat.com, ehabkost@redhat.com, konrad.wilk@oracle.com, dgilbert@redhat.com, liran.alon@oracle.com, stefanha@redhat.com, rth@twiddle.net, kwolf@redhat.com, berrange@redhat.com, mreitz@redhat.com, ross.lagerwall@citrix.com, marcandre.lureau@gmail.com, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @oracle.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Modify Makefile to support the building of the remote device process. Implements main() function of remote device process. Signed-off-by: John G Johnson Signed-off-by: Jagannathan Raman Signed-off-by: Elena Ufimtseva --- Makefile | 2 ++ Makefile.objs | 22 ++++++++++++++++++++ Makefile.target | 53 +++++++++++++++++++++++++++++++++++++++++++++= ++-- backends/Makefile.objs | 2 ++ block/Makefile.objs | 2 ++ hw/Makefile.objs | 7 +++++++ hw/block/Makefile.objs | 2 ++ hw/core/Makefile.objs | 16 +++++++++++++++ hw/nvram/Makefile.objs | 2 ++ hw/pci/Makefile.objs | 4 ++++ hw/scsi/Makefile.objs | 2 ++ migration/Makefile.objs | 2 ++ qom/Makefile.objs | 3 +++ remote/Makefile.objs | 1 + remote/remote-main.c | 37 ++++++++++++++++++++++++++++++++++ stubs/replay.c | 4 ++++ 16 files changed, 159 insertions(+), 2 deletions(-) create mode 100644 remote/Makefile.objs create mode 100644 remote/remote-main.c diff --git a/Makefile b/Makefile index d20e7ff..c4d5048 100644 --- a/Makefile +++ b/Makefile @@ -437,6 +437,8 @@ dummy :=3D $(call unnest-vars,, \ qom-obj-y \ io-obj-y \ common-obj-y \ + remote-pci-obj-y \ + remote-lsi-obj-y \ common-obj-m \ ui-obj-y \ ui-obj-m \ diff --git a/Makefile.objs b/Makefile.objs index abcbd89..c2ac261 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -21,6 +21,28 @@ block-obj-$(CONFIG_REPLICATION) +=3D replication.o =20 block-obj-m =3D block/ =20 +######################################################### +# remote-pci-obj-y is common code used by remote devices + +remote-pci-obj-$(CONFIG_MPQEMU) +=3D hw/ +remote-pci-obj-$(CONFIG_MPQEMU) +=3D qom/ +remote-pci-obj-$(CONFIG_MPQEMU) +=3D backends/ +remote-pci-obj-$(CONFIG_MPQEMU) +=3D block/ +remote-pci-obj-$(CONFIG_MPQEMU) +=3D migration/ +remote-pci-obj-$(CONFIG_MPQEMU) +=3D remote/ + +remote-pci-obj-$(CONFIG_MPQEMU) +=3D cpus-common.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D dma-helpers.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D blockdev.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D qdev-monitor.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D bootdevice.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D iothread.o + +############################################################## +# remote-lsi-obj-y is code used to implement remote LSI device + +remote-lsi-obj-$(CONFIG_MPQEMU) +=3D hw/ + ####################################################################### # crypto-obj-y is code used by both qemu system emulation and qemu-img =20 diff --git a/Makefile.target b/Makefile.target index 5e91623..e454aae 100644 --- a/Makefile.target +++ b/Makefile.target @@ -36,7 +36,12 @@ QEMU_PROG_BUILD =3D $(QEMU_PROG) endif endif =20 -PROGS=3D$(QEMU_PROG) $(QEMU_PROGW) +ifdef CONFIG_MPQEMU +SCSI_DEV_PROG=3Dqemu-scsi-dev +SCSI_DEV_BUILD =3D $(SCSI_DEV_PROG) +endif + +PROGS=3D$(QEMU_PROG) $(QEMU_PROGW) $(SCSI_DEV_PROG) STPFILES=3D =20 config-target.h: config-target.h-timestamp @@ -119,6 +124,18 @@ obj-y +=3D disas.o obj-$(call notempty,$(TARGET_XML_FILES)) +=3D gdbstub-xml.o LIBS :=3D $(libs_cpu) $(LIBS) =20 +remote-pci-tgt-obj-$(CONFIG_MPQEMU) +=3D accel/stubs/kvm-stub.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) +=3D accel/stubs/tcg-stub.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) +=3D accel/stubs/hax-stub.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) +=3D accel/stubs/whpx-stub.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) +=3D stubs/vl-stub.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) +=3D stubs/net-stub.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) +=3D stubs/monitor.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) +=3D stubs/replay.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) +=3D stubs/xen-mapcache.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) +=3D stubs/audio.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) +=3D stubs/monitor.o + ######################################################### # Linux user emulator target =20 @@ -175,6 +192,17 @@ endif # CONFIG_SOFTMMU dummy :=3D $(call unnest-vars,,obj-y) all-obj-y :=3D $(obj-y) =20 +dummy :=3D $(call unnest-vars,..,remote-pci-tgt-obj-y) +all-remote-pci-obj-y :=3D $(remote-pci-tgt-obj-y) + +all-remote-pci-obj-y +=3D memory.o +all-remote-pci-obj-y +=3D exec.o +all-remote-pci-obj-y +=3D ioport.o +all-remote-pci-obj-y +=3D cpus.o + +remote-pci-obj-y :=3D +remote-lsi-obj-y :=3D + include $(SRC_PATH)/Makefile.objs dummy :=3D $(call unnest-vars,.., \ authz-obj-y \ @@ -186,7 +214,10 @@ dummy :=3D $(call unnest-vars,.., \ qom-obj-y \ io-obj-y \ common-obj-y \ - common-obj-m) + common-obj-m \ + remote-pci-obj-y \ + remote-lsi-obj-y) + all-obj-y +=3D $(common-obj-y) all-obj-y +=3D $(qom-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(authz-obj-y) @@ -195,8 +226,19 @@ all-obj-$(CONFIG_USER_ONLY) +=3D $(crypto-user-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(crypto-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(io-obj-y) =20 +all-remote-pci-obj-y +=3D $(authz-obj-y) +all-remote-pci-obj-y +=3D $(block-obj-y) +all-remote-pci-obj-y +=3D $(crypto-obj-y) +all-remote-pci-obj-y +=3D $(io-obj-y) +all-remote-pci-obj-y +=3D $(chardev-obj-y) +all-remote-pci-obj-y +=3D $(remote-pci-obj-y) + + +all-remote-lsi-obj-y +=3D $(all-remote-pci-obj-y) $(remote-lsi-obj-y) + ifdef CONFIG_SOFTMMU $(QEMU_PROG_BUILD): config-devices.mak +$(SCSI_DEV_BUILD): config-devices.mak endif =20 COMMON_LDADDS =3D ../libqemuutil.a @@ -209,6 +251,13 @@ ifdef CONFIG_DARWIN $(call quiet-command,SetFile -a C $@,"SETFILE","$(TARGET_DIR)$@") endif =20 +$(SCSI_DEV_BUILD): $(all-remote-lsi-obj-y) $(COMMON_LDADDS) + $(call LINK, $(filter-out %.mak, $^)) +ifdef CONFIG_DARWIN + $(call quiet-command,Rez -append $(SRC_PATH)/pc-bios/qemu.rsrc -o $@,"REZ= ","$(TARGET_DIR)$@") + $(call quiet-command,SetFile -a C $@,"SETFILE","$(TARGET_DIR)$@") +endif + gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_= c.sh $@ $(TARGET_XML_FILES),"GEN","$(TARGET_DIR)$@") =20 diff --git a/backends/Makefile.objs b/backends/Makefile.objs index f069111..bd52cbc 100644 --- a/backends/Makefile.objs +++ b/backends/Makefile.objs @@ -17,3 +17,5 @@ endif common-obj-$(call land,$(CONFIG_VHOST_USER),$(CONFIG_VIRTIO)) +=3D vhost-u= ser.o =20 common-obj-$(CONFIG_LINUX) +=3D hostmem-memfd.o + +remote-pci-obj-$(CONFIG_MPQEMU) +=3D hostmem.o diff --git a/block/Makefile.objs b/block/Makefile.objs index e394fe0..adcc1b0 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -67,3 +67,5 @@ qcow.o-libs :=3D -lz linux-aio.o-libs :=3D -laio parallels.o-cflags :=3D $(LIBXML2_CFLAGS) parallels.o-libs :=3D $(LIBXML2_LIBS) + +remote-pci-obj-$(CONFIG_MPQEMU) +=3D stream.o diff --git a/hw/Makefile.objs b/hw/Makefile.objs index ece6cc3..4e28053 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -43,3 +43,10 @@ endif =20 common-obj-y +=3D $(devices-dirs-y) obj-y +=3D $(devices-dirs-y) + +remote-pci-obj-$(CONFIG_MPQEMU) +=3D core/ +remote-pci-obj-$(CONFIG_MPQEMU) +=3D block/ +remote-pci-obj-$(CONFIG_MPQEMU) +=3D pci/ +remote-pci-obj-$(CONFIG_MPQEMU) +=3D nvram/ + +remote-lsi-obj-$(CONFIG_MPQEMU) +=3D scsi/ diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs index f5f643f..7286fbd 100644 --- a/hw/block/Makefile.objs +++ b/hw/block/Makefile.objs @@ -15,3 +15,5 @@ obj-$(CONFIG_VIRTIO_BLK) +=3D virtio-blk.o obj-$(CONFIG_VHOST_USER_BLK) +=3D vhost-user-blk.o =20 obj-y +=3D dataplane/ + +remote-pci-obj-$(CONFIG_MPQEMU) +=3D block.o cdrom.o hd-geometry.o diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index fd0550d..9ef6b42 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -28,3 +28,19 @@ common-obj-$(CONFIG_SOFTMMU) +=3D null-machine.o obj-$(CONFIG_SOFTMMU) +=3D machine-qmp-cmds.o obj-$(CONFIG_SOFTMMU) +=3D numa.o common-obj-$(CONFIG_SOFTMMU) +=3D machine-hmp-cmds.o + +remote-pci-obj-$(CONFIG_MPQEMU) +=3D qdev-properties.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D qdev.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D bus.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D irq.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D hotplug.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D machine.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D fw-path-provider.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D reset.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D sysbus.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D loader.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D nmi.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D qdev-properties-system.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D qdev-fw.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D numa.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D cpu.o diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs index 26f7b4c..9802a31 100644 --- a/hw/nvram/Makefile.objs +++ b/hw/nvram/Makefile.objs @@ -6,3 +6,5 @@ common-obj-y +=3D chrp_nvram.o common-obj-$(CONFIG_MAC_NVRAM) +=3D mac_nvram.o obj-$(CONFIG_PSERIES) +=3D spapr_nvram.o obj-$(CONFIG_NRF51_SOC) +=3D nrf51_nvm.o + +remote-pci-obj-$(CONFIG_MPQEMU) +=3D fw_cfg.o diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs index c78f2fb..955be54 100644 --- a/hw/pci/Makefile.objs +++ b/hw/pci/Makefile.objs @@ -12,3 +12,7 @@ common-obj-$(CONFIG_PCI_EXPRESS) +=3D pcie_port.o pcie_ho= st.o =20 common-obj-$(call lnot,$(CONFIG_PCI)) +=3D pci-stub.o common-obj-$(CONFIG_ALL) +=3D pci-stub.o + +remote-pci-obj-$(CONFIG_MPQEMU) +=3D pci.o pci_bridge.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D msi.o msix.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D pcie.o diff --git a/hw/scsi/Makefile.objs b/hw/scsi/Makefile.objs index 54b36ed..ef97770 100644 --- a/hw/scsi/Makefile.objs +++ b/hw/scsi/Makefile.objs @@ -13,3 +13,5 @@ obj-y +=3D virtio-scsi.o virtio-scsi-dataplane.o obj-$(CONFIG_VHOST_SCSI) +=3D vhost-scsi-common.o vhost-scsi.o obj-$(CONFIG_VHOST_USER_SCSI) +=3D vhost-scsi-common.o vhost-user-scsi.o endif + +remote-lsi-obj-$(CONFIG_MPQEMU) +=3D scsi-generic.o scsi-bus.o lsi53c895a.= o scsi-disk.o emulation.o diff --git a/migration/Makefile.objs b/migration/Makefile.objs index a4f3baf..016b6ab 100644 --- a/migration/Makefile.objs +++ b/migration/Makefile.objs @@ -13,3 +13,5 @@ common-obj-$(CONFIG_RDMA) +=3D rdma.o common-obj-$(CONFIG_LIVE_BLOCK_MIGRATION) +=3D block.o =20 rdma.o-libs :=3D $(RDMA_LIBS) + +remote-pci-obj-$(CONFIG_MPQEMU) +=3D qemu-file.o vmstate.o qjson.o vmstate= -types.o diff --git a/qom/Makefile.objs b/qom/Makefile.objs index f9d7735..07e50e5 100644 --- a/qom/Makefile.objs +++ b/qom/Makefile.objs @@ -2,3 +2,6 @@ qom-obj-y =3D object.o container.o qom-qobject.o qom-obj-y +=3D object_interfaces.o =20 common-obj-$(CONFIG_SOFTMMU) +=3D qom-hmp-cmds.o qom-qmp-cmds.o + +remote-pci-obj-$(CONFIG_MPQEMU) +=3D object.o qom-qobject.o container.o +remote-pci-obj-$(CONFIG_MPQEMU) +=3D object_interfaces.o diff --git a/remote/Makefile.objs b/remote/Makefile.objs new file mode 100644 index 0000000..a9b2256 --- /dev/null +++ b/remote/Makefile.objs @@ -0,0 +1 @@ +remote-pci-obj-$(CONFIG_MPQEMU) +=3D remote-main.o diff --git a/remote/remote-main.c b/remote/remote-main.c new file mode 100644 index 0000000..cccad12 --- /dev/null +++ b/remote/remote-main.c @@ -0,0 +1,37 @@ +/* + * Remote device initialization + * + * Copyright 2019, Oracle and/or its affiliates. + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" +#include "qemu-common.h" + +#include + +#include "qemu/module.h" + +int main(int argc, char *argv[]) +{ + module_call_init(MODULE_INIT_QOM); + + return 0; +} diff --git a/stubs/replay.c b/stubs/replay.c index c0b51cb..4a966ff 100644 --- a/stubs/replay.c +++ b/stubs/replay.c @@ -93,3 +93,7 @@ int replay_get_instructions(void) void replay_account_executed_instructions(void) { } + +void replay_add_blocker(Error *reason) +{ +} --=20 1.8.3.1